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

SCM Repository

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

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

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

revision 2748, Wed Oct 1 21:16:56 2014 UTC revision 2749, Wed Oct 1 23:11:09 2014 UTC
# Line 95  Line 95 
95        | E_Lit of Literal.literal        | E_Lit of Literal.literal
96        | E_Op of Op.rator * exp list        | E_Op of Op.rator * exp list
97        | E_Apply of MathFuns.name * exp list        | E_Apply of MathFuns.name * exp list
98        | E_Cons of Ty.ty*  exp list  (*Cons->Vector *)        | E_Cons of Ty.ty*int*  exp list   (*Cons->Vector , vector size used for ops, int:not used size)*)
99        | E_LoadArr of bool*int * int * exp * exp        | E_LoadArr of bool*int * int * exp * exp
100          (*aligned, newVecSize,originalVecSize, addr, offset *)          (*aligned, newVecSize,originalVecSize, addr, offset *)
101        | E_LoadVec of bool*int * int * exp * exp        | E_LoadVec of bool*int * int * exp * exp
102        | E_Mux of bool*int *int * Ty.ty*exp list (* same as storeVec stmt*)        | E_Mux of bool*int *int * Ty.ty*exp list
103              (*eventual Merging of these two expressions*)              (*wraps around vector arguments, gets turned into S_storeVec if used by SAVE*)
104    
105    
106    (*When occurance >1  local variables are created, and the expression list are vars. Then other operators call the vars*)    (*When occurance >1  local variables are created, and the expression list are vars. Then other operators call the vars*)
# Line 183  Line 183 
183              ":",iTos  oSize, ">", "( ", toString arg, ",", toString offset, ")"]              ":",iTos  oSize, ">", "( ", toString arg, ",", toString offset, ")"]
184       | toString (E_Op(rator, args)) = String.concat["OP",Op.toString rator,"(",       | toString (E_Op(rator, args)) = String.concat["OP",Op.toString rator,"(",
185          String.concatWith"," (List.map toString args),")"]          String.concatWith"," (List.map toString args),")"]
186       | toString (E_Cons(ty, args)) =String.concat ["ConsExp:", Ty.toString ty, "(",       | toString (E_Cons(ty, sizeO,args)) =String.concat ["ConsExp:", Ty.toString ty,Int.toString sizeO, "(",
187          String.concatWith"," (List.map toString args),")"]          String.concatWith"," (List.map toString args),")"]
188       | toString (E_State x) = "StateVar"^stateVarToString x       | toString (E_State x) = "StateVar"^stateVarToString x
189       | toString (E_Var x) = String.concat[kindToString(Var.kind x),"- Var: "^Var.name x]       | toString (E_Var x) = String.concat[kindToString(Var.kind x),"- Var: "^Var.name x]
# Line 209  Line 209 
209          | toStringS(S_StoreVec(x,_,tyNew, tyOrig,pieces,args)) =let          | toStringS(S_StoreVec(x,_,tyNew, tyOrig,pieces,args)) =let
210              val a= String.concatWith "," (List.map toString args)              val a= String.concatWith "," (List.map toString args)
211              in              in
212                  String.concat["Statment Store-Arr: ",toString x,  "=",iTos tyNew,"|",iTos tyOrig,"@ [",                  String.concat["Statment Store: ",toString x,  "=",iTos tyNew,"|",iTos tyOrig,"@ [",
213                  Ty.toString pieces ,"]",a]                  Ty.toString pieces ,"]",a]
214              end              end
215           | toStringS (S_Cons(x,_,ty, args)) = String.concat ["ConsStmt:", Var.name x, "] =",Ty.toString ty, "(",           | toStringS (S_Cons(x,_,ty, args)) = String.concat ["ConsStmt:", Var.name x, "] =",Ty.toString ty, "(",

Legend:
Removed from v.2748  
changed lines
  Added in v.2749

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