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

SCM Repository

[diderot] Diff of /branches/charisee/src/compiler/low-il/low-il.sml
ViewVC logotype

Diff of /branches/charisee/src/compiler/low-il/low-il.sml

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

revision 1232, Mon May 16 23:37:52 2011 UTC revision 1295, Thu Jun 9 06:42:54 2011 UTC
# Line 40  Line 40 
40        | Not        | Not
41        | Max        | Max
42        | Min        | Min
43          | Clamp of ty
44        | Lerp of ty        | Lerp of ty
45        | Dot of int        | Dot of int
46        | MulVecMat of int * int        | MulVecMat of int * int
# Line 86  Line 87 
87        | arity Not = 1        | arity Not = 1
88        | arity Max = 2        | arity Max = 2
89        | arity Min = 2        | arity Min = 2
90          | arity (Clamp _) = 3
91        | arity (Lerp _) = 3        | arity (Lerp _) = 3
92        | arity (Dot _) = 2        | arity (Dot _) = 2
93        | arity (MulVecMat _) = 2        | arity (MulVecMat _) = 2
# Line 132  Line 134 
134        | same (Not, Not) = true        | same (Not, Not) = true
135        | same (Max, Max) = true        | same (Max, Max) = true
136        | same (Min, Min) = true        | same (Min, Min) = true
137          | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)
138        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)
139        | same (Dot(a0), Dot(b0)) = sameint(a0, b0)        | same (Dot(a0), Dot(b0)) = sameint(a0, b0)
140        | same (MulVecMat(a0,a1), MulVecMat(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)        | same (MulVecMat(a0,a1), MulVecMat(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)
# Line 179  Line 182 
182        | hash Not = 0w43        | hash Not = 0w43
183        | hash Max = 0w47        | hash Max = 0w47
184        | hash Min = 0w53        | hash Min = 0w53
185        | hash (Lerp(a0)) = 0w59 + hashty a0        | hash (Clamp(a0)) = 0w59 + hashty a0
186        | hash (Dot(a0)) = 0w61 + hashint a0        | hash (Lerp(a0)) = 0w61 + hashty a0
187        | hash (MulVecMat(a0,a1)) = 0w67 + hashint a0 + hashint a1        | hash (Dot(a0)) = 0w67 + hashint a0
188        | hash (MulMatVec(a0,a1)) = 0w71 + hashint a0 + hashint a1        | hash (MulVecMat(a0,a1)) = 0w71 + hashint a0 + hashint a1
189        | hash (MulMatMat(a0,a1,a2)) = 0w73 + hashint a0 + hashint a1 + hashint a2        | hash (MulMatVec(a0,a1)) = 0w73 + hashint a0 + hashint a1
190        | hash Cross = 0w79        | hash (MulMatMat(a0,a1,a2)) = 0w79 + hashint a0 + hashint a1 + hashint a2
191        | hash (Select(a0,a1)) = 0w83 + hashty a0 + hashint a1        | hash Cross = 0w83
192        | hash (Norm(a0)) = 0w89 + hashty a0        | hash (Select(a0,a1)) = 0w89 + hashty a0 + hashint a1
193        | hash (Normalize(a0)) = 0w97 + hashint a0        | hash (Norm(a0)) = 0w97 + hashty a0
194        | hash (Scale(a0)) = 0w101 + hashty a0        | hash (Normalize(a0)) = 0w101 + hashint a0
195        | hash CL = 0w103        | hash (Scale(a0)) = 0w103 + hashty a0
196        | hash (PrincipleEvec(a0)) = 0w107 + hashty a0        | hash CL = 0w107
197        | hash (Identity(a0)) = 0w109 + hashint a0        | hash (PrincipleEvec(a0)) = 0w109 + hashty a0
198        | hash (Zero(a0)) = 0w113 + hashty a0        | hash (Identity(a0)) = 0w113 + hashint a0
199        | hash (Trace(a0)) = 0w127 + hashint a0        | hash (Zero(a0)) = 0w127 + hashty a0
200        | hash (Subscript(a0)) = 0w131 + hashty a0        | hash (Trace(a0)) = 0w131 + hashint a0
201        | hash (Ceiling(a0)) = 0w137 + hashint a0        | hash (Subscript(a0)) = 0w137 + hashty a0
202        | hash (Floor(a0)) = 0w139 + hashint a0        | hash (Ceiling(a0)) = 0w139 + hashint a0
203        | hash (Round(a0)) = 0w149 + hashint a0        | hash (Floor(a0)) = 0w149 + hashint a0
204        | hash (Trunc(a0)) = 0w151 + hashint a0        | hash (Round(a0)) = 0w151 + hashint a0
205        | hash IntToReal = 0w157        | hash (Trunc(a0)) = 0w157 + hashint a0
206        | hash (RealToInt(a0)) = 0w163 + hashint a0        | hash IntToReal = 0w163
207        | hash (ImageAddress(a0)) = 0w167 + ImageInfo.hash a0        | hash (RealToInt(a0)) = 0w167 + hashint a0
208        | hash (LoadVoxels(a0,a1)) = 0w173 + ImageInfo.hash a0 + hashint a1        | hash (ImageAddress(a0)) = 0w173 + ImageInfo.hash a0
209        | hash (PosToImgSpace(a0)) = 0w179 + ImageInfo.hash a0        | hash (LoadVoxels(a0,a1)) = 0w179 + ImageInfo.hash a0 + hashint a1
210        | hash (TensorToWorldSpace(a0,a1)) = 0w181 + ImageInfo.hash a0 + hashty a1        | hash (PosToImgSpace(a0)) = 0w181 + ImageInfo.hash a0
211        | hash (LoadImage(a0)) = 0w191 + ImageInfo.hash a0        | hash (TensorToWorldSpace(a0,a1)) = 0w191 + ImageInfo.hash a0 + hashty a1
212        | hash (Inside(a0,a1)) = 0w193 + ImageInfo.hash a0 + hashint a1        | hash (LoadImage(a0)) = 0w193 + ImageInfo.hash a0
213        | hash (Input(a0,a1)) = 0w197 + hashty a0 + hashstring a1        | hash (Inside(a0,a1)) = 0w197 + ImageInfo.hash a0 + hashint a1
214        | hash (InputWithDefault(a0,a1)) = 0w199 + hashty a0 + hashstring a1        | hash (Input(a0,a1)) = 0w199 + hashty a0 + hashstring a1
215          | hash (InputWithDefault(a0,a1)) = 0w211 + hashty a0 + hashstring a1
216    
217      fun toString (Add(a0)) = concat["Add<", tyToString a0, ">"]      fun toString (Add(a0)) = concat["Add<", tyToString a0, ">"]
218        | toString (Sub(a0)) = concat["Sub<", tyToString a0, ">"]        | toString (Sub(a0)) = concat["Sub<", tyToString a0, ">"]
# Line 225  Line 229 
229        | toString Not = "Not"        | toString Not = "Not"
230        | toString Max = "Max"        | toString Max = "Max"
231        | toString Min = "Min"        | toString Min = "Min"
232          | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]
233        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]
234        | toString (Dot(a0)) = concat["Dot<", intToString a0, ">"]        | toString (Dot(a0)) = concat["Dot<", intToString a0, ">"]
235        | toString (MulVecMat(a0,a1)) = concat["MulVecMat<", intToString a0, ",", intToString a1, ">"]        | toString (MulVecMat(a0,a1)) = concat["MulVecMat<", intToString a0, ",", intToString a1, ">"]

Legend:
Removed from v.1232  
changed lines
  Added in v.1295

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