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 982, Tue Apr 26 13:35:52 2011 UTC revision 983, Tue Apr 26 16:58:46 2011 UTC
# Line 68  Line 68 
68        | VoxelAddress of ImageInfo.info * int        | VoxelAddress of ImageInfo.info * int
69        | LoadVoxels of ImageInfo.info * int        | LoadVoxels of ImageInfo.info * int
70        | PosToImgSpace of ImageInfo.info        | PosToImgSpace of ImageInfo.info
71        | GradToWorldSpace of ImageInfo.info        | TensorToWorldSpace of ImageInfo.info * ty
72        | EvalKernel of int * Kernel.kernel * int        | EvalKernel of int * Kernel.kernel * int
73        | LoadImage of ImageInfo.info        | LoadImage of ImageInfo.info
74        | Inside of ImageInfo.info * int        | Inside of ImageInfo.info * int
# Line 115  Line 115 
115        | arity (VoxelAddress _) = ~1        | arity (VoxelAddress _) = ~1
116        | arity (LoadVoxels _) = 1        | arity (LoadVoxels _) = 1
117        | arity (PosToImgSpace _) = 2        | arity (PosToImgSpace _) = 2
118        | arity (GradToWorldSpace _) = 2        | arity (TensorToWorldSpace _) = 2
119        | arity (EvalKernel _) = 1        | arity (EvalKernel _) = 1
120        | arity (LoadImage _) = 1        | arity (LoadImage _) = 1
121        | arity (Inside _) = 2        | arity (Inside _) = 2
# Line 162  Line 162 
162        | same (VoxelAddress(a0,a1), VoxelAddress(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (VoxelAddress(a0,a1), VoxelAddress(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
163        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
164        | same (PosToImgSpace(a0), PosToImgSpace(b0)) = ImageInfo.same(a0, b0)        | same (PosToImgSpace(a0), PosToImgSpace(b0)) = ImageInfo.same(a0, b0)
165        | same (GradToWorldSpace(a0), GradToWorldSpace(b0)) = ImageInfo.same(a0, b0)        | same (TensorToWorldSpace(a0,a1), TensorToWorldSpace(b0,b1)) = ImageInfo.same(a0, b0) andalso samety(a1, b1)
166        | 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)
167        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)
168        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
# Line 210  Line 210 
210        | hash (VoxelAddress(a0,a1)) = 0w167 + ImageInfo.hash a0 + hashint a1        | hash (VoxelAddress(a0,a1)) = 0w167 + ImageInfo.hash a0 + hashint a1
211        | hash (LoadVoxels(a0,a1)) = 0w173 + ImageInfo.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w173 + ImageInfo.hash a0 + hashint a1
212        | hash (PosToImgSpace(a0)) = 0w179 + ImageInfo.hash a0        | hash (PosToImgSpace(a0)) = 0w179 + ImageInfo.hash a0
213        | hash (GradToWorldSpace(a0)) = 0w181 + ImageInfo.hash a0        | hash (TensorToWorldSpace(a0,a1)) = 0w181 + ImageInfo.hash a0 + hashty a1
214        | hash (EvalKernel(a0,a1,a2)) = 0w191 + hashint a0 + Kernel.hash a1 + hashint a2        | hash (EvalKernel(a0,a1,a2)) = 0w191 + hashint a0 + Kernel.hash a1 + hashint a2
215        | hash (LoadImage(a0)) = 0w193 + ImageInfo.hash a0        | hash (LoadImage(a0)) = 0w193 + ImageInfo.hash a0
216        | hash (Inside(a0,a1)) = 0w197 + ImageInfo.hash a0 + hashint a1        | hash (Inside(a0,a1)) = 0w197 + ImageInfo.hash a0 + hashint a1
# Line 257  Line 257 
257        | toString (VoxelAddress(a0,a1)) = concat["VoxelAddress<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (VoxelAddress(a0,a1)) = concat["VoxelAddress<", ImageInfo.toString a0, ",", intToString a1, ">"]
258        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]
259        | toString (PosToImgSpace(a0)) = concat["PosToImgSpace<", ImageInfo.toString a0, ">"]        | toString (PosToImgSpace(a0)) = concat["PosToImgSpace<", ImageInfo.toString a0, ">"]
260        | toString (GradToWorldSpace(a0)) = concat["GradToWorldSpace<", ImageInfo.toString a0, ">"]        | toString (TensorToWorldSpace(a0,a1)) = concat["TensorToWorldSpace<", ImageInfo.toString a0, ",", tyToString a1, ">"]
261        | 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, ">"]
262        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]
263        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]

Legend:
Removed from v.982  
changed lines
  Added in v.983

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