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 564, Wed Feb 23 22:34:31 2011 UTC revision 565, Thu Feb 24 18:34:48 2011 UTC
# Line 54  Line 54 
54        | CL        | CL
55        | PrincipleEvec of ty        | PrincipleEvec of ty
56        | Subscript of ty        | Subscript of ty
57          | Ceiling of int
58        | Floor of int        | Floor of int
59          | Round of int
60          | Trunc of int
61        | IntToReal        | IntToReal
62        | TruncToInt of int        | RealToInt of int
       | RoundToInt of int  
       | CeilToInt of int  
       | FloorToInt of int  
63        | VoxelAddress of ImageInfo.info        | VoxelAddress of ImageInfo.info
64        | LoadVoxels of ImageInfo.info * int        | LoadVoxels of ImageInfo.info * int
65        | PosToImgSpace of ImageInfo.info        | PosToImgSpace of ImageInfo.info
# Line 96  Line 96 
96        | arity CL = 1        | arity CL = 1
97        | arity (PrincipleEvec _) = 2        | arity (PrincipleEvec _) = 2
98        | arity (Subscript _) = 2        | arity (Subscript _) = 2
99          | arity (Ceiling _) = 1
100        | arity (Floor _) = 1        | arity (Floor _) = 1
101          | arity (Round _) = 1
102          | arity (Trunc _) = 1
103        | arity IntToReal = 1        | arity IntToReal = 1
104        | arity (TruncToInt _) = 1        | arity (RealToInt _) = 1
       | arity (RoundToInt _) = 1  
       | arity (CeilToInt _) = 1  
       | arity (FloorToInt _) = 1  
105        | arity (VoxelAddress _) = ~1        | arity (VoxelAddress _) = ~1
106        | arity (LoadVoxels _) = 1        | arity (LoadVoxels _) = 1
107        | arity (PosToImgSpace _) = 2        | arity (PosToImgSpace _) = 2
# Line 138  Line 138 
138        | same (CL, CL) = true        | same (CL, CL) = true
139        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)
140        | same (Subscript(a0), Subscript(b0)) = samety(a0, b0)        | same (Subscript(a0), Subscript(b0)) = samety(a0, b0)
141          | same (Ceiling(a0), Ceiling(b0)) = sameint(a0, b0)
142        | same (Floor(a0), Floor(b0)) = sameint(a0, b0)        | same (Floor(a0), Floor(b0)) = sameint(a0, b0)
143          | same (Round(a0), Round(b0)) = sameint(a0, b0)
144          | same (Trunc(a0), Trunc(b0)) = sameint(a0, b0)
145        | same (IntToReal, IntToReal) = true        | same (IntToReal, IntToReal) = true
146        | same (TruncToInt(a0), TruncToInt(b0)) = sameint(a0, b0)        | same (RealToInt(a0), RealToInt(b0)) = sameint(a0, b0)
       | same (RoundToInt(a0), RoundToInt(b0)) = sameint(a0, b0)  
       | same (CeilToInt(a0), CeilToInt(b0)) = sameint(a0, b0)  
       | same (FloorToInt(a0), FloorToInt(b0)) = sameint(a0, b0)  
147        | same (VoxelAddress(a0), VoxelAddress(b0)) = ImageInfo.same(a0, b0)        | same (VoxelAddress(a0), VoxelAddress(b0)) = ImageInfo.same(a0, b0)
148        | 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)
149        | same (PosToImgSpace(a0), PosToImgSpace(b0)) = ImageInfo.same(a0, b0)        | same (PosToImgSpace(a0), PosToImgSpace(b0)) = ImageInfo.same(a0, b0)
# Line 181  Line 181 
181        | hash CL = 0w97        | hash CL = 0w97
182        | hash (PrincipleEvec(a0)) = 0w101 + hashty a0        | hash (PrincipleEvec(a0)) = 0w101 + hashty a0
183        | hash (Subscript(a0)) = 0w103 + hashty a0        | hash (Subscript(a0)) = 0w103 + hashty a0
184        | hash (Floor(a0)) = 0w107 + hashint a0        | hash (Ceiling(a0)) = 0w107 + hashint a0
185        | hash IntToReal = 0w109        | hash (Floor(a0)) = 0w109 + hashint a0
186        | hash (TruncToInt(a0)) = 0w113 + hashint a0        | hash (Round(a0)) = 0w113 + hashint a0
187        | hash (RoundToInt(a0)) = 0w127 + hashint a0        | hash (Trunc(a0)) = 0w127 + hashint a0
188        | hash (CeilToInt(a0)) = 0w131 + hashint a0        | hash IntToReal = 0w131
189        | hash (FloorToInt(a0)) = 0w137 + hashint a0        | hash (RealToInt(a0)) = 0w137 + hashint a0
190        | hash (VoxelAddress(a0)) = 0w139 + ImageInfo.hash a0        | hash (VoxelAddress(a0)) = 0w139 + ImageInfo.hash a0
191        | hash (LoadVoxels(a0,a1)) = 0w149 + ImageInfo.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w149 + ImageInfo.hash a0 + hashint a1
192        | hash (PosToImgSpace(a0)) = 0w151 + ImageInfo.hash a0        | hash (PosToImgSpace(a0)) = 0w151 + ImageInfo.hash a0
# Line 223  Line 223 
223        | toString CL = "CL"        | toString CL = "CL"
224        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]
225        | toString (Subscript(a0)) = concat["Subscript<", tyToString a0, ">"]        | toString (Subscript(a0)) = concat["Subscript<", tyToString a0, ">"]
226          | toString (Ceiling(a0)) = concat["Ceiling<", intToString a0, ">"]
227        | toString (Floor(a0)) = concat["Floor<", intToString a0, ">"]        | toString (Floor(a0)) = concat["Floor<", intToString a0, ">"]
228          | toString (Round(a0)) = concat["Round<", intToString a0, ">"]
229          | toString (Trunc(a0)) = concat["Trunc<", intToString a0, ">"]
230        | toString IntToReal = "IntToReal"        | toString IntToReal = "IntToReal"
231        | toString (TruncToInt(a0)) = concat["TruncToInt<", intToString a0, ">"]        | toString (RealToInt(a0)) = concat["RealToInt<", intToString a0, ">"]
       | toString (RoundToInt(a0)) = concat["RoundToInt<", intToString a0, ">"]  
       | toString (CeilToInt(a0)) = concat["CeilToInt<", intToString a0, ">"]  
       | toString (FloorToInt(a0)) = concat["FloorToInt<", intToString a0, ">"]  
232        | toString (VoxelAddress(a0)) = concat["VoxelAddress<", ImageInfo.toString a0, ">"]        | toString (VoxelAddress(a0)) = concat["VoxelAddress<", ImageInfo.toString a0, ">"]
233        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]
234        | toString (PosToImgSpace(a0)) = concat["PosToImgSpace<", ImageInfo.toString a0, ">"]        | toString (PosToImgSpace(a0)) = concat["PosToImgSpace<", ImageInfo.toString a0, ">"]

Legend:
Removed from v.564  
changed lines
  Added in v.565

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