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 2667, Thu Jun 5 18:54:12 2014 UTC revision 2668, Thu Jun 12 03:29:04 2014 UTC
# Line 60  Line 60 
60        | Min        | Min
61        | Clamp of ty        | Clamp of ty
62        | Lerp of ty        | Lerp of ty
       | Norm of ty  
       | Normalize of int  
63        | PrincipleEvec of ty        | PrincipleEvec of ty
64        | EigenVecs2x2        | EigenVecs2x2
65        | EigenVecs3x3        | EigenVecs3x3
# Line 123  Line 121 
121        | resultArity Min = 1        | resultArity Min = 1
122        | resultArity (Clamp _) = 1        | resultArity (Clamp _) = 1
123        | resultArity (Lerp _) = 1        | resultArity (Lerp _) = 1
       | resultArity (Norm _) = 1  
       | resultArity (Normalize _) = 1  
124        | resultArity (PrincipleEvec _) = 1        | resultArity (PrincipleEvec _) = 1
125        | resultArity EigenVecs2x2 = 1        | resultArity EigenVecs2x2 = 1
126        | resultArity EigenVecs3x3 = 1        | resultArity EigenVecs3x3 = 1
# Line 186  Line 182 
182        | arity Min = 2        | arity Min = 2
183        | arity (Clamp _) = 3        | arity (Clamp _) = 3
184        | arity (Lerp _) = 3        | arity (Lerp _) = 3
       | arity (Norm _) = 1  
       | arity (Normalize _) = 1  
185        | arity (PrincipleEvec _) = 2        | arity (PrincipleEvec _) = 2
186        | arity EigenVecs2x2 = 1        | arity EigenVecs2x2 = 1
187        | arity EigenVecs3x3 = 1        | arity EigenVecs3x3 = 1
# Line 256  Line 250 
250        | same (Min, Min) = true        | same (Min, Min) = true
251        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)
252        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)
       | same (Norm(a0), Norm(b0)) = samety(a0, b0)  
       | same (Normalize(a0), Normalize(b0)) = sameint(a0, b0)  
253        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)
254        | same (EigenVecs2x2, EigenVecs2x2) = true        | same (EigenVecs2x2, EigenVecs2x2) = true
255        | same (EigenVecs3x3, EigenVecs3x3) = true        | same (EigenVecs3x3, EigenVecs3x3) = true
# Line 320  Line 312 
312        | hash Min = 0w101        | hash Min = 0w101
313        | hash (Clamp(a0)) = 0w103 + hashty a0        | hash (Clamp(a0)) = 0w103 + hashty a0
314        | hash (Lerp(a0)) = 0w107 + hashty a0        | hash (Lerp(a0)) = 0w107 + hashty a0
315        | hash (Norm(a0)) = 0w109 + hashty a0        | hash (PrincipleEvec(a0)) = 0w109 + hashty a0
316        | hash (Normalize(a0)) = 0w113 + hashint a0        | hash EigenVecs2x2 = 0w113
317        | hash (PrincipleEvec(a0)) = 0w127 + hashty a0        | hash EigenVecs3x3 = 0w127
318        | hash EigenVecs2x2 = 0w131        | hash EigenVals2x2 = 0w131
319        | hash EigenVecs3x3 = 0w137        | hash EigenVals3x3 = 0w137
320        | hash EigenVals2x2 = 0w139        | hash (Zero(a0)) = 0w139 + hashty a0
321        | hash EigenVals3x3 = 0w149        | hash (Select(a0,a1)) = 0w149 + hashty a0 + hashint a1
322        | hash (Zero(a0)) = 0w151 + hashty a0        | hash (Index(a0,a1)) = 0w151 + hashty a0 + hashint a1
323        | hash (Select(a0,a1)) = 0w157 + hashty a0 + hashint a1        | hash (Subscript(a0)) = 0w157 + hashty a0
324        | hash (Index(a0,a1)) = 0w163 + hashty a0 + hashint a1        | hash (MkDynamic(a0,a1)) = 0w163 + hashty a0 + hashint a1
325        | hash (Subscript(a0)) = 0w167 + hashty a0        | hash (Append(a0)) = 0w167 + hashty a0
326        | hash (MkDynamic(a0,a1)) = 0w173 + hashty a0 + hashint a1        | hash (Prepend(a0)) = 0w173 + hashty a0
327        | hash (Append(a0)) = 0w179 + hashty a0        | hash (Concat(a0)) = 0w179 + hashty a0
328        | hash (Prepend(a0)) = 0w181 + hashty a0        | hash Sqrt = 0w181
329        | hash (Concat(a0)) = 0w191 + hashty a0        | hash (Ceiling(a0)) = 0w191 + hashint a0
330        | hash Sqrt = 0w193        | hash (Floor(a0)) = 0w193 + hashint a0
331        | hash (Ceiling(a0)) = 0w197 + hashint a0        | hash (Round(a0)) = 0w197 + hashint a0
332        | hash (Floor(a0)) = 0w199 + hashint a0        | hash (Trunc(a0)) = 0w199 + hashint a0
333        | hash (Round(a0)) = 0w211 + hashint a0        | hash IntToReal = 0w211
334        | hash (Trunc(a0)) = 0w223 + hashint a0        | hash (RealToInt(a0)) = 0w223 + hashint a0
335        | hash IntToReal = 0w227        | hash (Transform(a0)) = 0w227 + ImageInfo.hash a0
336        | hash (RealToInt(a0)) = 0w229 + hashint a0        | hash (Translate(a0)) = 0w229 + ImageInfo.hash a0
337        | hash (Transform(a0)) = 0w233 + ImageInfo.hash a0        | hash (Kernel(a0,a1)) = 0w233 + Kernel.hash a0 + hashint a1
338        | hash (Translate(a0)) = 0w239 + ImageInfo.hash a0        | hash (ImageAddress(a0)) = 0w239 + ImageInfo.hash a0
339        | hash (Kernel(a0,a1)) = 0w241 + Kernel.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w241 + ImageInfo.hash a0 + hashint a1
340        | hash (ImageAddress(a0)) = 0w251 + ImageInfo.hash a0        | hash (Inside(a0,a1)) = 0w251 + ImageInfo.hash a0 + hashint a1
341        | hash (LoadVoxels(a0,a1)) = 0w257 + ImageInfo.hash a0 + hashint a1        | hash (LoadSeq(a0,a1)) = 0w257 + hashty a0 + hashstring a1
342        | hash (Inside(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1        | hash (LoadImage(a0)) = 0w263 + ImageInfo.hash a0
343        | hash (LoadSeq(a0,a1)) = 0w269 + hashty a0 + hashstring a1        | hash (imgAddr(a0,a1,a2)) = 0w269 + ImageInfo.hash a0 + hashty a1 + hashint a2
344        | hash (LoadImage(a0)) = 0w271 + ImageInfo.hash a0        | hash (imgLoad(a0,a1,a2)) = 0w271 + ImageInfo.hash a0 + hashint a1 + hashint a2
345        | hash (imgAddr(a0,a1,a2)) = 0w277 + ImageInfo.hash a0 + hashty a1 + hashint a2        | hash (Input(a0,a1,a2)) = 0w277 + hashty a0 + hashstring a1 + hashstring a2
346        | hash (imgLoad(a0,a1,a2)) = 0w281 + ImageInfo.hash a0 + hashint a1 + hashint a2        | hash (InputWithDefault(a0,a1,a2)) = 0w281 + hashty a0 + hashstring a1 + hashstring a2
347        | hash (Input(a0,a1,a2)) = 0w283 + hashty a0 + hashstring a1 + hashstring a2        | hash (Print(a0)) = 0w283 + hashtys a0
       | hash (InputWithDefault(a0,a1,a2)) = 0w293 + hashty a0 + hashstring a1 + hashstring a2  
       | hash (Print(a0)) = 0w307 + hashtys a0  
348    
349      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
350        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 383  Line 373 
373        | toString Min = "Min"        | toString Min = "Min"
374        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]
375        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]
       | toString (Norm(a0)) = concat["Norm<", tyToString a0, ">"]  
       | toString (Normalize(a0)) = concat["Normalize<", intToString a0, ">"]  
376        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]
377        | toString EigenVecs2x2 = "EigenVecs2x2"        | toString EigenVecs2x2 = "EigenVecs2x2"
378        | toString EigenVecs3x3 = "EigenVecs3x3"        | toString EigenVecs3x3 = "EigenVecs3x3"

Legend:
Removed from v.2667  
changed lines
  Added in v.2668

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