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 2532, Wed Jan 29 22:33:05 2014 UTC revision 2533, Thu Jan 30 04:58:56 2014 UTC
# Line 55  Line 55 
55        | subSca        | subSca
56        | prodSca        | prodSca
57        | divSca        | divSca
58        | cons of ty        | cons of ty * int
59        | img of int * ty * int        | imgAddr of ImageInfo.info * ty * int
60        | imgAddr of ty * int        | imgLoad of ImageInfo.info * int * int
       | imgLoad of int * int  
61        | addVec of int        | addVec of int
62        | subVec of int        | subVec of int
63        | prodVec of int        | prodVec of int
# Line 123  Line 122 
122        | resultArity prodSca = 1        | resultArity prodSca = 1
123        | resultArity divSca = 1        | resultArity divSca = 1
124        | resultArity (cons _) = 1        | resultArity (cons _) = 1
       | resultArity (img _) = 1  
125        | resultArity (imgAddr _) = 1        | resultArity (imgAddr _) = 1
126        | resultArity (imgLoad _) = 1        | resultArity (imgLoad _) = 1
127        | resultArity (addVec _) = 1        | resultArity (addVec _) = 1
# Line 190  Line 188 
188        | arity prodSca = 2        | arity prodSca = 2
189        | arity divSca = 2        | arity divSca = 2
190        | arity (cons _) = 2        | arity (cons _) = 2
       | arity (img _) = 2  
191        | arity (imgAddr _) = 2        | arity (imgAddr _) = 2
192        | arity (imgLoad _) = 2        | arity (imgLoad _) = 2
193        | arity (addVec _) = 2        | arity (addVec _) = 2
# Line 263  Line 260 
260        | same (subSca, subSca) = true        | same (subSca, subSca) = true
261        | same (prodSca, prodSca) = true        | same (prodSca, prodSca) = true
262        | same (divSca, divSca) = true        | same (divSca, divSca) = true
263        | same (cons(a0), cons(b0)) = samety(a0, b0)        | same (cons(a0,a1), cons(b0,b1)) = samety(a0, b0) andalso sameint(a1, b1)
264        | same (img(a0,a1,a2), img(b0,b1,b2)) = sameint(a0, b0) andalso samety(a1, b1) andalso sameint(a2, b2)        | same (imgAddr(a0,a1,a2), imgAddr(b0,b1,b2)) = ImageInfo.same(a0, b0) andalso samety(a1, b1) andalso sameint(a2, b2)
265        | same (imgAddr(a0,a1), imgAddr(b0,b1)) = samety(a0, b0) andalso sameint(a1, b1)        | same (imgLoad(a0,a1,a2), imgLoad(b0,b1,b2)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1) andalso sameint(a2, b2)
       | same (imgLoad(a0,a1), imgLoad(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)  
266        | same (addVec(a0), addVec(b0)) = sameint(a0, b0)        | same (addVec(a0), addVec(b0)) = sameint(a0, b0)
267        | same (subVec(a0), subVec(b0)) = sameint(a0, b0)        | same (subVec(a0), subVec(b0)) = sameint(a0, b0)
268        | same (prodVec(a0), prodVec(b0)) = sameint(a0, b0)        | same (prodVec(a0), prodVec(b0)) = sameint(a0, b0)
# Line 331  Line 327 
327        | hash subSca = 0w73        | hash subSca = 0w73
328        | hash prodSca = 0w79        | hash prodSca = 0w79
329        | hash divSca = 0w83        | hash divSca = 0w83
330        | hash (cons(a0)) = 0w89 + hashty a0        | hash (cons(a0,a1)) = 0w89 + hashty a0 + hashint a1
331        | hash (img(a0,a1,a2)) = 0w97 + hashint a0 + hashty a1 + hashint a2        | hash (imgAddr(a0,a1,a2)) = 0w97 + ImageInfo.hash a0 + hashty a1 + hashint a2
332        | hash (imgAddr(a0,a1)) = 0w101 + hashty a0 + hashint a1        | hash (imgLoad(a0,a1,a2)) = 0w101 + ImageInfo.hash a0 + hashint a1 + hashint a2
333        | hash (imgLoad(a0,a1)) = 0w103 + hashint a0 + hashint a1        | hash (addVec(a0)) = 0w103 + hashint a0
334        | hash (addVec(a0)) = 0w107 + hashint a0        | hash (subVec(a0)) = 0w107 + hashint a0
335        | hash (subVec(a0)) = 0w109 + hashint a0        | hash (prodVec(a0)) = 0w109 + hashint a0
336        | hash (prodVec(a0)) = 0w113 + hashint a0        | hash (prodScaV(a0)) = 0w113 + hashint a0
337        | hash (prodScaV(a0)) = 0w127 + hashint a0        | hash (sumVec(a0)) = 0w127 + hashint a0
338        | hash (sumVec(a0)) = 0w131 + hashint a0        | hash (Clamp(a0)) = 0w131 + hashty a0
339        | hash (Clamp(a0)) = 0w137 + hashty a0        | hash (Lerp(a0)) = 0w137 + hashty a0
340        | hash (Lerp(a0)) = 0w139 + hashty a0        | hash (Norm(a0)) = 0w139 + hashty a0
341        | hash (Norm(a0)) = 0w149 + hashty a0        | hash (Normalize(a0)) = 0w149 + hashint a0
342        | hash (Normalize(a0)) = 0w151 + hashint a0        | hash (PrincipleEvec(a0)) = 0w151 + hashty a0
343        | hash (PrincipleEvec(a0)) = 0w157 + hashty a0        | hash EigenVecs2x2 = 0w157
344        | hash EigenVecs2x2 = 0w163        | hash EigenVecs3x3 = 0w163
345        | hash EigenVecs3x3 = 0w167        | hash EigenVals2x2 = 0w167
346        | hash EigenVals2x2 = 0w173        | hash EigenVals3x3 = 0w173
347        | hash EigenVals3x3 = 0w179        | hash (Zero(a0)) = 0w179 + hashty a0
348        | hash (Zero(a0)) = 0w181 + hashty a0        | hash (Select(a0,a1)) = 0w181 + hashty a0 + hashint a1
349        | hash (Select(a0,a1)) = 0w191 + hashty a0 + hashint a1        | hash (Index(a0,a1)) = 0w191 + hashty a0 + hashint a1
350        | hash (Index(a0,a1)) = 0w193 + hashty a0 + hashint a1        | hash (Subscript(a0)) = 0w193 + hashty a0
351        | hash (Subscript(a0)) = 0w197 + hashty a0        | hash (MkDynamic(a0,a1)) = 0w197 + hashty a0 + hashint a1
352        | hash (MkDynamic(a0,a1)) = 0w199 + hashty a0 + hashint a1        | hash (Append(a0)) = 0w199 + hashty a0
353        | hash (Append(a0)) = 0w211 + hashty a0        | hash (Prepend(a0)) = 0w211 + hashty a0
354        | hash (Prepend(a0)) = 0w223 + hashty a0        | hash (Concat(a0)) = 0w223 + hashty a0
355        | hash (Concat(a0)) = 0w227 + hashty a0        | hash (Length(a0)) = 0w227 + hashty a0
356        | hash (Length(a0)) = 0w229 + hashty a0        | hash (Ceiling(a0)) = 0w229 + hashint a0
357        | hash (Ceiling(a0)) = 0w233 + hashint a0        | hash (Floor(a0)) = 0w233 + hashint a0
358        | hash (Floor(a0)) = 0w239 + hashint a0        | hash (Round(a0)) = 0w239 + hashint a0
359        | hash (Round(a0)) = 0w241 + hashint a0        | hash (Trunc(a0)) = 0w241 + hashint a0
360        | hash (Trunc(a0)) = 0w251 + hashint a0        | hash IntToReal = 0w251
361        | hash IntToReal = 0w257        | hash (RealToInt(a0)) = 0w257 + hashint a0
362        | hash (RealToInt(a0)) = 0w263 + hashint a0        | hash (Transform(a0)) = 0w263 + ImageInfo.hash a0
363        | hash (Transform(a0)) = 0w269 + ImageInfo.hash a0        | hash (Translate(a0)) = 0w269 + ImageInfo.hash a0
364        | hash (Translate(a0)) = 0w271 + ImageInfo.hash a0        | hash (Kernel(a0,a1)) = 0w271 + Kernel.hash a0 + hashint a1
365        | hash (Kernel(a0,a1)) = 0w277 + Kernel.hash a0 + hashint a1        | hash (ImageAddress(a0)) = 0w277 + ImageInfo.hash a0
366        | hash (ImageAddress(a0)) = 0w281 + ImageInfo.hash a0        | hash (LoadVoxels(a0,a1)) = 0w281 + ImageInfo.hash a0 + hashint a1
367        | hash (LoadVoxels(a0,a1)) = 0w283 + ImageInfo.hash a0 + hashint a1        | hash (Inside(a0,a1)) = 0w283 + ImageInfo.hash a0 + hashint a1
368        | hash (Inside(a0,a1)) = 0w293 + ImageInfo.hash a0 + hashint a1        | hash (LoadSeq(a0,a1)) = 0w293 + hashty a0 + hashstring a1
369        | hash (LoadSeq(a0,a1)) = 0w307 + hashty a0 + hashstring a1        | hash (LoadImage(a0)) = 0w307 + ImageInfo.hash a0
370        | hash (LoadImage(a0)) = 0w311 + ImageInfo.hash a0        | hash (Input(a0,a1,a2)) = 0w311 + hashty a0 + hashstring a1 + hashstring a2
371        | hash (Input(a0,a1,a2)) = 0w313 + hashty a0 + hashstring a1 + hashstring a2        | hash (InputWithDefault(a0,a1,a2)) = 0w313 + hashty a0 + hashstring a1 + hashstring a2
372        | hash (InputWithDefault(a0,a1,a2)) = 0w317 + hashty a0 + hashstring a1 + hashstring a2        | hash (Print(a0)) = 0w317 + hashtys a0
       | hash (Print(a0)) = 0w331 + hashtys a0  
373    
374      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
375        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 398  Line 393 
393        | toString subSca = "subSca"        | toString subSca = "subSca"
394        | toString prodSca = "prodSca"        | toString prodSca = "prodSca"
395        | toString divSca = "divSca"        | toString divSca = "divSca"
396        | toString (cons(a0)) = concat["cons<", tyToString a0, ">"]        | toString (cons(a0,a1)) = concat["cons<", tyToString a0, ",", intToString a1, ">"]
397        | toString (img(a0,a1,a2)) = concat["img<", intToString a0, ",", tyToString a1, ",", intToString a2, ">"]        | toString (imgAddr(a0,a1,a2)) = concat["imgAddr<", ImageInfo.toString a0, ",", tyToString a1, ",", intToString a2, ">"]
398        | toString (imgAddr(a0,a1)) = concat["imgAddr<", tyToString a0, ",", intToString a1, ">"]        | toString (imgLoad(a0,a1,a2)) = concat["imgLoad<", ImageInfo.toString a0, ",", intToString a1, ",", intToString a2, ">"]
       | toString (imgLoad(a0,a1)) = concat["imgLoad<", intToString a0, ",", intToString a1, ">"]  
399        | toString (addVec(a0)) = concat["addVec<", intToString a0, ">"]        | toString (addVec(a0)) = concat["addVec<", intToString a0, ">"]
400        | toString (subVec(a0)) = concat["subVec<", intToString a0, ">"]        | toString (subVec(a0)) = concat["subVec<", intToString a0, ">"]
401        | toString (prodVec(a0)) = concat["prodVec<", intToString a0, ">"]        | toString (prodVec(a0)) = concat["prodVec<", intToString a0, ">"]

Legend:
Removed from v.2532  
changed lines
  Added in v.2533

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