Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/pure-cfg/src/compiler/mid-il/mid-il.sml
ViewVC logotype

Diff of /branches/pure-cfg/src/compiler/mid-il/mid-il.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 546, Thu Feb 17 14:56:58 2011 UTC revision 548, Thu Feb 17 22:41:53 2011 UTC
# Line 60  Line 60 
60        | RoundToInt of int        | RoundToInt of int
61        | CeilToInt of int        | CeilToInt of int
62        | FloorToInt of int        | FloorToInt of int
63        | VoxelAddress of int        | VoxelAddress of ImageInfo.info
64        | LoadVoxels of RawTypes.ty * int        | LoadVoxels of ImageInfo.info * int
65        | PosToImgSpace of int        | PosToImgSpace of ImageInfo.info
66        | GradToWorldSpace of int        | GradToWorldSpace of ImageInfo.info
67        | EvalKernel of int * Kernel.kernel * int        | EvalKernel of int * Kernel.kernel * int
68        | LoadImage of ImageInfo.info        | LoadImage of ImageInfo.info
69        | Inside of int * int        | Inside of ImageInfo.info * int
70        | Input of ty * string        | Input of ty * string
71        | InputWithDefault of ty * string        | InputWithDefault of ty * string
72    
# Line 144  Line 144 
144        | same (RoundToInt(a0), RoundToInt(b0)) = sameint(a0, b0)        | same (RoundToInt(a0), RoundToInt(b0)) = sameint(a0, b0)
145        | same (CeilToInt(a0), CeilToInt(b0)) = sameint(a0, b0)        | same (CeilToInt(a0), CeilToInt(b0)) = sameint(a0, b0)
146        | same (FloorToInt(a0), FloorToInt(b0)) = sameint(a0, b0)        | same (FloorToInt(a0), FloorToInt(b0)) = sameint(a0, b0)
147        | same (VoxelAddress(a0), VoxelAddress(b0)) = sameint(a0, b0)        | same (VoxelAddress(a0), VoxelAddress(b0)) = ImageInfo.same(a0, b0)
148        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = RawTypes.same(a0, b0) andalso sameint(a1, b1)        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
149        | same (PosToImgSpace(a0), PosToImgSpace(b0)) = sameint(a0, b0)        | same (PosToImgSpace(a0), PosToImgSpace(b0)) = ImageInfo.same(a0, b0)
150        | same (GradToWorldSpace(a0), GradToWorldSpace(b0)) = sameint(a0, b0)        | same (GradToWorldSpace(a0), GradToWorldSpace(b0)) = ImageInfo.same(a0, b0)
151        | same (EvalKernel(a0,a1,a2), EvalKernel(b0,b1,b2)) = sameint(a0, b0) andalso Kernel.same(a1, b1) andalso sameint(a2, b2)        | same (EvalKernel(a0,a1,a2), EvalKernel(b0,b1,b2)) = sameint(a0, b0) andalso Kernel.same(a1, b1) andalso sameint(a2, b2)
152        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)
153        | same (Inside(a0,a1), Inside(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
154        | same (Input(a0,a1), Input(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)        | same (Input(a0,a1), Input(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)
155        | same (InputWithDefault(a0,a1), InputWithDefault(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)        | same (InputWithDefault(a0,a1), InputWithDefault(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)
156        | same _ = false        | same _ = false
# Line 187  Line 187 
187        | hash (RoundToInt(a0)) = 0w127 + hashint a0        | hash (RoundToInt(a0)) = 0w127 + hashint a0
188        | hash (CeilToInt(a0)) = 0w131 + hashint a0        | hash (CeilToInt(a0)) = 0w131 + hashint a0
189        | hash (FloorToInt(a0)) = 0w137 + hashint a0        | hash (FloorToInt(a0)) = 0w137 + hashint a0
190        | hash (VoxelAddress(a0)) = 0w139 + hashint a0        | hash (VoxelAddress(a0)) = 0w139 + ImageInfo.hash a0
191        | hash (LoadVoxels(a0,a1)) = 0w149 + RawTypes.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w149 + ImageInfo.hash a0 + hashint a1
192        | hash (PosToImgSpace(a0)) = 0w151 + hashint a0        | hash (PosToImgSpace(a0)) = 0w151 + ImageInfo.hash a0
193        | hash (GradToWorldSpace(a0)) = 0w157 + hashint a0        | hash (GradToWorldSpace(a0)) = 0w157 + ImageInfo.hash a0
194        | hash (EvalKernel(a0,a1,a2)) = 0w163 + hashint a0 + Kernel.hash a1 + hashint a2        | hash (EvalKernel(a0,a1,a2)) = 0w163 + hashint a0 + Kernel.hash a1 + hashint a2
195        | hash (LoadImage(a0)) = 0w167 + ImageInfo.hash a0        | hash (LoadImage(a0)) = 0w167 + ImageInfo.hash a0
196        | hash (Inside(a0,a1)) = 0w173 + hashint a0 + hashint a1        | hash (Inside(a0,a1)) = 0w173 + ImageInfo.hash a0 + hashint a1
197        | hash (Input(a0,a1)) = 0w179 + hashty a0 + hashstring a1        | hash (Input(a0,a1)) = 0w179 + hashty a0 + hashstring a1
198        | hash (InputWithDefault(a0,a1)) = 0w181 + hashty a0 + hashstring a1        | hash (InputWithDefault(a0,a1)) = 0w181 + hashty a0 + hashstring a1
199    
# Line 229  Line 229 
229        | toString (RoundToInt(a0)) = concat["RoundToInt<", intToString a0, ">"]        | toString (RoundToInt(a0)) = concat["RoundToInt<", intToString a0, ">"]
230        | toString (CeilToInt(a0)) = concat["CeilToInt<", intToString a0, ">"]        | toString (CeilToInt(a0)) = concat["CeilToInt<", intToString a0, ">"]
231        | toString (FloorToInt(a0)) = concat["FloorToInt<", intToString a0, ">"]        | toString (FloorToInt(a0)) = concat["FloorToInt<", intToString a0, ">"]
232        | toString (VoxelAddress(a0)) = concat["VoxelAddress<", intToString a0, ">"]        | toString (VoxelAddress(a0)) = concat["VoxelAddress<", ImageInfo.toString a0, ">"]
233        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", RawTypes.toString a0, ",", intToString a1, ">"]        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]
234        | toString (PosToImgSpace(a0)) = concat["PosToImgSpace<", intToString a0, ">"]        | toString (PosToImgSpace(a0)) = concat["PosToImgSpace<", ImageInfo.toString a0, ">"]
235        | toString (GradToWorldSpace(a0)) = concat["GradToWorldSpace<", intToString a0, ">"]        | toString (GradToWorldSpace(a0)) = concat["GradToWorldSpace<", ImageInfo.toString a0, ">"]
236        | toString (EvalKernel(a0,a1,a2)) = concat["EvalKernel<", intToString a0, ",", Kernel.toString a1, ",", intToString a2, ">"]        | toString (EvalKernel(a0,a1,a2)) = concat["EvalKernel<", intToString a0, ",", Kernel.toString a1, ",", intToString a2, ">"]
237        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]
238        | toString (Inside(a0,a1)) = concat["Inside<", intToString a0, ",", intToString a1, ">"]        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]
239        | toString (Input(a0,a1)) = concat["Input<", tyToString a0, ",", stringToString a1, ">"]        | toString (Input(a0,a1)) = concat["Input<", tyToString a0, ",", stringToString a1, ">"]
240        | toString (InputWithDefault(a0,a1)) = concat["InputWithDefault<", tyToString a0, ",", stringToString a1, ">"]        | toString (InputWithDefault(a0,a1)) = concat["InputWithDefault<", tyToString a0, ",", stringToString a1, ">"]
241    

Legend:
Removed from v.546  
changed lines
  Added in v.548

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0