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

SCM Repository

[diderot] Diff of /trunk/src/compiler/mid-il/mid-il.sml
ViewVC logotype

Diff of /trunk/src/compiler/mid-il/mid-il.sml

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

revision 449, Thu Oct 21 15:46:51 2010 UTC revision 450, Thu Oct 21 15:58:26 2010 UTC
# Line 60  Line 60 
60        | FloorToInt of int        | FloorToInt of int
61        | VoxelAddress of ImageInfo.info        | VoxelAddress of ImageInfo.info
62        | LoadVoxels of RawTypes.ty * int        | LoadVoxels of RawTypes.ty * int
63        | Transform of ImageInfo.info        | PosToImgSpace of ImageInfo.info
64          | GradToWorldSpace of ImageInfo.info
65        | EvalKernel of int * Kernel.kernel * int        | EvalKernel of int * Kernel.kernel * int
66        | LoadImage of ImageInfo.info        | LoadImage of ImageInfo.info
67        | Inside of ImageInfo.info        | Inside of ImageInfo.info
# Line 101  Line 102 
102        | arity (FloorToInt _) = 1        | arity (FloorToInt _) = 1
103        | arity (VoxelAddress _) = ~1        | arity (VoxelAddress _) = ~1
104        | arity (LoadVoxels _) = 1        | arity (LoadVoxels _) = 1
105        | arity (Transform _) = 1        | arity (PosToImgSpace _) = 1
106          | arity (GradToWorldSpace _) = 1
107        | arity (EvalKernel _) = 1        | arity (EvalKernel _) = 1
108        | arity (LoadImage _) = 0        | arity (LoadImage _) = 0
109        | arity (Inside _) = 1        | arity (Inside _) = 1
# Line 142  Line 144 
144        | same (FloorToInt(a0), FloorToInt(b0)) = sameint(a0, b0)        | same (FloorToInt(a0), FloorToInt(b0)) = sameint(a0, b0)
145        | same (VoxelAddress(a0), VoxelAddress(b0)) = ImageInfo.same(a0, b0)        | same (VoxelAddress(a0), VoxelAddress(b0)) = ImageInfo.same(a0, b0)
146        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = RawTypes.same(a0, b0) andalso sameint(a1, b1)        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = RawTypes.same(a0, b0) andalso sameint(a1, b1)
147        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)        | same (PosToImgSpace(a0), PosToImgSpace(b0)) = ImageInfo.same(a0, b0)
148          | same (GradToWorldSpace(a0), GradToWorldSpace(b0)) = ImageInfo.same(a0, b0)
149        | 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)
150        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)
151        | same (Inside(a0), Inside(b0)) = ImageInfo.same(a0, b0)        | same (Inside(a0), Inside(b0)) = ImageInfo.same(a0, b0)
# Line 184  Line 187 
187        | hash (FloorToInt(a0)) = 0w137 + hashint a0        | hash (FloorToInt(a0)) = 0w137 + hashint a0
188        | hash (VoxelAddress(a0)) = 0w139 + ImageInfo.hash a0        | hash (VoxelAddress(a0)) = 0w139 + ImageInfo.hash a0
189        | hash (LoadVoxels(a0,a1)) = 0w149 + RawTypes.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w149 + RawTypes.hash a0 + hashint a1
190        | hash (Transform(a0)) = 0w151 + ImageInfo.hash a0        | hash (PosToImgSpace(a0)) = 0w151 + ImageInfo.hash a0
191        | hash (EvalKernel(a0,a1,a2)) = 0w157 + hashint a0 + Kernel.hash a1 + hashint a2        | hash (GradToWorldSpace(a0)) = 0w157 + ImageInfo.hash a0
192        | hash (LoadImage(a0)) = 0w163 + ImageInfo.hash a0        | hash (EvalKernel(a0,a1,a2)) = 0w163 + hashint a0 + Kernel.hash a1 + hashint a2
193        | hash (Inside(a0)) = 0w167 + ImageInfo.hash a0        | hash (LoadImage(a0)) = 0w167 + ImageInfo.hash a0
194        | hash (Input(a0,a1)) = 0w173 + hashty a0 + hashstring a1        | hash (Inside(a0)) = 0w173 + ImageInfo.hash a0
195        | hash (InputWithDefault(a0,a1)) = 0w179 + hashty a0 + hashstring a1        | hash (Input(a0,a1)) = 0w179 + hashty a0 + hashstring a1
196          | hash (InputWithDefault(a0,a1)) = 0w181 + hashty a0 + hashstring a1
197    
198      fun toString (Add(a0)) = concat["Add<", tyToString a0, ">"]      fun toString (Add(a0)) = concat["Add<", tyToString a0, ">"]
199        | toString (Sub(a0)) = concat["Sub<", tyToString a0, ">"]        | toString (Sub(a0)) = concat["Sub<", tyToString a0, ">"]
# Line 225  Line 229 
229        | toString (FloorToInt(a0)) = concat["FloorToInt<", intToString a0, ">"]        | toString (FloorToInt(a0)) = concat["FloorToInt<", intToString a0, ">"]
230        | toString (VoxelAddress(a0)) = concat["VoxelAddress<", ImageInfo.toString a0, ">"]        | toString (VoxelAddress(a0)) = concat["VoxelAddress<", ImageInfo.toString a0, ">"]
231        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", RawTypes.toString a0, ",", intToString a1, ">"]        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", RawTypes.toString a0, ",", intToString a1, ">"]
232        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]        | toString (PosToImgSpace(a0)) = concat["PosToImgSpace<", ImageInfo.toString a0, ">"]
233          | toString (GradToWorldSpace(a0)) = concat["GradToWorldSpace<", ImageInfo.toString a0, ">"]
234        | 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, ">"]
235        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]
236        | toString (Inside(a0)) = concat["Inside<", ImageInfo.toString a0, ">"]        | toString (Inside(a0)) = concat["Inside<", ImageInfo.toString a0, ">"]

Legend:
Removed from v.449  
changed lines
  Added in v.450

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