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 545, Wed Feb 16 23:19:14 2011 UTC revision 546, Thu Feb 17 14:56:58 2011 UTC
# Line 66  Line 66 
66        | GradToWorldSpace of int        | GradToWorldSpace of int
67        | EvalKernel of int * Kernel.kernel * int        | EvalKernel of int * Kernel.kernel * int
68        | LoadImage of ImageInfo.info        | LoadImage of ImageInfo.info
69        | Inside of int        | Inside of int * int
70        | Input of ty * string        | Input of ty * string
71        | InputWithDefault of ty * string        | InputWithDefault of ty * string
72    
# Line 150  Line 150 
150        | same (GradToWorldSpace(a0), GradToWorldSpace(b0)) = sameint(a0, b0)        | same (GradToWorldSpace(a0), GradToWorldSpace(b0)) = sameint(a0, b0)
151        | same (EvalKernel(a0,a1,a2), EvalKernel(b0,b1,b2)) = sameint(a0, b0) andalso Kernel.same(a1, b1) andalso sameint(a2, b2)        | same (EvalKernel(a0,a1,a2), EvalKernel(b0,b1,b2)) = sameint(a0, b0) andalso Kernel.same(a1, b1) andalso sameint(a2, b2)
152        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)        | same (LoadImage(a0), LoadImage(b0)) = ImageInfo.same(a0, b0)
153        | same (Inside(a0), Inside(b0)) = sameint(a0, b0)        | same (Inside(a0,a1), Inside(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)
154        | same (Input(a0,a1), Input(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)        | same (Input(a0,a1), Input(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)
155        | same (InputWithDefault(a0,a1), InputWithDefault(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)        | same (InputWithDefault(a0,a1), InputWithDefault(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)
156        | same _ = false        | same _ = false
# Line 193  Line 193 
193        | hash (GradToWorldSpace(a0)) = 0w157 + hashint a0        | hash (GradToWorldSpace(a0)) = 0w157 + hashint a0
194        | hash (EvalKernel(a0,a1,a2)) = 0w163 + hashint a0 + Kernel.hash a1 + hashint a2        | hash (EvalKernel(a0,a1,a2)) = 0w163 + hashint a0 + Kernel.hash a1 + hashint a2
195        | hash (LoadImage(a0)) = 0w167 + ImageInfo.hash a0        | hash (LoadImage(a0)) = 0w167 + ImageInfo.hash a0
196        | hash (Inside(a0)) = 0w173 + hashint a0        | hash (Inside(a0,a1)) = 0w173 + hashint a0 + hashint a1
197        | hash (Input(a0,a1)) = 0w179 + hashty a0 + hashstring a1        | hash (Input(a0,a1)) = 0w179 + hashty a0 + hashstring a1
198        | hash (InputWithDefault(a0,a1)) = 0w181 + hashty a0 + hashstring a1        | hash (InputWithDefault(a0,a1)) = 0w181 + hashty a0 + hashstring a1
199    
# Line 235  Line 235 
235        | toString (GradToWorldSpace(a0)) = concat["GradToWorldSpace<", intToString a0, ">"]        | toString (GradToWorldSpace(a0)) = concat["GradToWorldSpace<", intToString a0, ">"]
236        | toString (EvalKernel(a0,a1,a2)) = concat["EvalKernel<", intToString a0, ",", Kernel.toString a1, ",", intToString a2, ">"]        | toString (EvalKernel(a0,a1,a2)) = concat["EvalKernel<", intToString a0, ",", Kernel.toString a1, ",", intToString a2, ">"]
237        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]        | toString (LoadImage(a0)) = concat["LoadImage<", ImageInfo.toString a0, ">"]
238        | toString (Inside(a0)) = concat["Inside<", intToString a0, ">"]        | toString (Inside(a0,a1)) = concat["Inside<", intToString a0, ",", intToString a1, ">"]
239        | toString (Input(a0,a1)) = concat["Input<", tyToString a0, ",", stringToString a1, ">"]        | toString (Input(a0,a1)) = concat["Input<", tyToString a0, ",", stringToString a1, ">"]
240        | toString (InputWithDefault(a0,a1)) = concat["InputWithDefault<", tyToString a0, ",", stringToString a1, ">"]        | toString (InputWithDefault(a0,a1)) = concat["InputWithDefault<", tyToString a0, ",", stringToString a1, ">"]
241    
# Line 246  Line 246 
246    structure Op = MidOps)    structure Op = MidOps)
247    
248  structure MidILCensus = CensusFn(MidIL)  structure MidILCensus = CensusFn(MidIL)
249    

Legend:
Removed from v.545  
changed lines
  Added in v.546

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