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

SCM Repository

[diderot] Diff of /branches/vis15/src/compiler/mid-ir/mid-ir.sml
ViewVC logotype

Diff of /branches/vis15/src/compiler/mid-ir/mid-ir.sml

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

revision 3720, Mon Apr 4 18:20:42 2016 UTC revision 3725, Mon Apr 4 22:00:07 2016 UTC
# Line 106  Line 106 
106        | LoadVoxels of ImageInfo.info * int        | LoadVoxels of ImageInfo.info * int
107        | Inside of ImageInfo.info * int        | Inside of ImageInfo.info * int
108        | ImageDim of ImageInfo.info * int        | ImageDim of ImageInfo.info * int
109          | BorderCtlDefault of ImageInfo.info
110          | BorderCtlClamp of ImageInfo.info
111          | BorderCtlMirror of ImageInfo.info
112          | BorderCtlWrap of ImageInfo.info
113        | LoadSeq of ty * string        | LoadSeq of ty * string
114        | LoadImage of ty * string        | LoadImage of ty * string
115        | Print of tys        | Print of tys
# Line 166  Line 170 
170        | resultArity (LoadVoxels _) = 1        | resultArity (LoadVoxels _) = 1
171        | resultArity (Inside _) = 1        | resultArity (Inside _) = 1
172        | resultArity (ImageDim _) = 1        | resultArity (ImageDim _) = 1
173          | resultArity (BorderCtlDefault _) = 1
174          | resultArity (BorderCtlClamp _) = 1
175          | resultArity (BorderCtlMirror _) = 1
176          | resultArity (BorderCtlWrap _) = 1
177        | resultArity (LoadSeq _) = 1        | resultArity (LoadSeq _) = 1
178        | resultArity (LoadImage _) = 1        | resultArity (LoadImage _) = 1
179        | resultArity (Print _) = 0        | resultArity (Print _) = 0
# Line 226  Line 234 
234        | arity (LoadVoxels _) = 1        | arity (LoadVoxels _) = 1
235        | arity (Inside _) = 2        | arity (Inside _) = 2
236        | arity (ImageDim _) = 1        | arity (ImageDim _) = 1
237          | arity (BorderCtlDefault _) = 2
238          | arity (BorderCtlClamp _) = 1
239          | arity (BorderCtlMirror _) = 1
240          | arity (BorderCtlWrap _) = 1
241        | arity (LoadSeq _) = 0        | arity (LoadSeq _) = 0
242        | arity (LoadImage _) = 0        | arity (LoadImage _) = 0
243        | arity (Print _) = ~1        | arity (Print _) = ~1
# Line 293  Line 305 
305        | 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)
306        | 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)
307        | same (ImageDim(a0,a1), ImageDim(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (ImageDim(a0,a1), ImageDim(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
308          | same (BorderCtlDefault(a0), BorderCtlDefault(b0)) = ImageInfo.same(a0, b0)
309          | same (BorderCtlClamp(a0), BorderCtlClamp(b0)) = ImageInfo.same(a0, b0)
310          | same (BorderCtlMirror(a0), BorderCtlMirror(b0)) = ImageInfo.same(a0, b0)
311          | same (BorderCtlWrap(a0), BorderCtlWrap(b0)) = ImageInfo.same(a0, b0)
312        | same (LoadSeq(a0,a1), LoadSeq(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)        | same (LoadSeq(a0,a1), LoadSeq(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)
313        | same (LoadImage(a0,a1), LoadImage(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)        | same (LoadImage(a0,a1), LoadImage(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)
314        | same (Print(a0), Print(b0)) = sametys(a0, b0)        | same (Print(a0), Print(b0)) = sametys(a0, b0)
# Line 354  Line 370 
370        | hash (LoadVoxels(a0,a1)) = 0w251 + ImageInfo.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w251 + ImageInfo.hash a0 + hashint a1
371        | hash (Inside(a0,a1)) = 0w257 + ImageInfo.hash a0 + hashint a1        | hash (Inside(a0,a1)) = 0w257 + ImageInfo.hash a0 + hashint a1
372        | hash (ImageDim(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1        | hash (ImageDim(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1
373        | hash (LoadSeq(a0,a1)) = 0w269 + hashty a0 + hashstring a1        | hash (BorderCtlDefault(a0)) = 0w269 + ImageInfo.hash a0
374        | hash (LoadImage(a0,a1)) = 0w271 + hashty a0 + hashstring a1        | hash (BorderCtlClamp(a0)) = 0w271 + ImageInfo.hash a0
375        | hash (Print(a0)) = 0w277 + hashtys a0        | hash (BorderCtlMirror(a0)) = 0w277 + ImageInfo.hash a0
376        | hash (MathFn(a0)) = 0w281 + MathFns.hash a0        | hash (BorderCtlWrap(a0)) = 0w281 + ImageInfo.hash a0
377          | hash (LoadSeq(a0,a1)) = 0w283 + hashty a0 + hashstring a1
378          | hash (LoadImage(a0,a1)) = 0w293 + hashty a0 + hashstring a1
379          | hash (Print(a0)) = 0w307 + hashtys a0
380          | hash (MathFn(a0)) = 0w311 + MathFns.hash a0
381    
382      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
383        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 414  Line 434 
434        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]
435        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]
436        | toString (ImageDim(a0,a1)) = concat["ImageDim<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (ImageDim(a0,a1)) = concat["ImageDim<", ImageInfo.toString a0, ",", intToString a1, ">"]
437          | toString (BorderCtlDefault(a0)) = concat["BorderCtlDefault<", ImageInfo.toString a0, ">"]
438          | toString (BorderCtlClamp(a0)) = concat["BorderCtlClamp<", ImageInfo.toString a0, ">"]
439          | toString (BorderCtlMirror(a0)) = concat["BorderCtlMirror<", ImageInfo.toString a0, ">"]
440          | toString (BorderCtlWrap(a0)) = concat["BorderCtlWrap<", ImageInfo.toString a0, ">"]
441        | toString (LoadSeq(a0,a1)) = concat["LoadSeq<", tyToString a0, ",", stringToString a1, ">"]        | toString (LoadSeq(a0,a1)) = concat["LoadSeq<", tyToString a0, ",", stringToString a1, ">"]
442        | toString (LoadImage(a0,a1)) = concat["LoadImage<", tyToString a0, ",", stringToString a1, ">"]        | toString (LoadImage(a0,a1)) = concat["LoadImage<", tyToString a0, ",", stringToString a1, ">"]
443        | toString (Print(a0)) = concat["Print<", tysToString a0, ">"]        | toString (Print(a0)) = concat["Print<", tysToString a0, ">"]

Legend:
Removed from v.3720  
changed lines
  Added in v.3725

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