X-Git-Url: http://git.joshuawise.com/snipe.git/blobdiff_plain/0a24e44d4e9f82f8d3d83de8e58c83c8cf2868b6..4a34fbf0834d02dd913bf872e45b3285aafce641:/trans/tree.sml

diff --git a/trans/tree.sml b/trans/tree.sml
index f69cefb..2111fc1 100644
--- a/trans/tree.sml
+++ b/trans/tree.sml
@@ -1,103 +1,72 @@
-(* L2 Compiler
+(* L3 Compiler
  * IR Trees
  * Author: Kaustuv Chaudhuri <kaustuv+@cs.cmu.edu>
  * Modified: Alex Vaynberg <alv@andrew.cmu.edu>
  * Modified: Frank Pfenning <fp@cs.cmu.edu>
+ * Modified: Joshua Wise <jwise>
+ * Modified: Chris Lu <czl>
  *)
 
 signature TREE =
 sig
-
-  datatype binop = ADD | SUB | MUL | DIV | MOD | LSH | RSH | LOGOR | LOGAND | BITOR | BITAND | BITXOR | NEQ | EQ | LT | GT | LE | GE
+  datatype binop = ADD | SUB | MUL | DIV | MOD | LSH | RSH | LOGOR | LOGAND | BITOR | BITAND | BITXOR | NEQ | EQ | LT | GT | LE | GE | BE
   datatype unop = NEG | BITNOT | BANG
 
+  type Blarg = int
+
   datatype exp = 
       CONST of Word32.word
     | TEMP of Temp.temp
+    | ARG of Blarg (* I am j4cbo *)
     | BINOP of binop * exp * exp
     | UNOP of unop * exp
+    | CALL of Ast.ident * exp list
+    | MEMORY of exp
+    | ALLOC of exp
+    | COND of exp * exp * exp
+    | STMVAR of stm list * exp
+    | NULLPTR
   and stm =
       MOVE of exp * exp
     | RETURN of exp
+    | EFFECT of exp
     | LABEL of Label.label
     | JUMPIFN of exp * Label.label
     | JUMP of Label.label
+  and func =
+      FUNCTION of Ast.ident * stm list
 
-  type program = stm list
-
-  structure Print :
-  sig
-    val pp_exp : exp -> string
-    val pp_stm : stm -> string
-    val pp_program : program -> string
-  end
+  type program = func list
 end
 
 structure Tree :> TREE =
 struct
-
-  datatype binop = ADD | SUB | MUL | DIV | MOD | LSH | RSH | LOGOR | LOGAND | BITOR | BITAND | BITXOR | NEQ | EQ | LT | GT | LE | GE
+  datatype binop = ADD | SUB | MUL | DIV | MOD | LSH | RSH | LOGOR | LOGAND | BITOR | BITAND | BITXOR | NEQ | EQ | LT | GT | LE | GE | BE
   datatype unop = NEG | BITNOT | BANG
 
+  type Blarg = int
+
   datatype exp = 
       CONST of Word32.word
     | TEMP of Temp.temp
+    | ARG of Blarg (* I am j4cbo *)
     | BINOP of binop * exp * exp
     | UNOP of unop * exp
+    | CALL of Ast.ident * exp list
+    | MEMORY of exp
+    | ALLOC of exp
+    | COND of exp * exp * exp
+    | STMVAR of stm list * exp
+    | NULLPTR
   and stm =
       MOVE of exp * exp
     | RETURN of exp
+    | EFFECT of exp
     | LABEL of Label.label
     | JUMPIFN of exp * Label.label
     | JUMP of Label.label
+  and func =
+      FUNCTION of Ast.ident * stm list
 
-  type program = stm list
-
-  structure Print = 
-  struct
-
-    fun pp_binop ADD = "+"
-      | pp_binop SUB = "-"
-      | pp_binop MUL = "*"
-      | pp_binop DIV = "/"
-      | pp_binop MOD = "%"
-      | pp_binop LSH = "<<"
-      | pp_binop RSH = ">>"
-      | pp_binop LOGOR = "||"
-      | pp_binop LOGAND = "&&"
-      | pp_binop BITOR = "|"
-      | pp_binop BITAND = "&"
-      | pp_binop BITXOR = "^"
-      | pp_binop NEQ = "!="
-      | pp_binop EQ = "=="
-      | pp_binop LE = "<="
-      | pp_binop LT = "<"
-      | pp_binop GE = ">="
-      | pp_binop GT = ">"
-    
-    fun pp_unop NEG = "-"
-      | pp_unop BITNOT = "~"
-      | pp_unop BANG = "!"
-
-    fun pp_exp (CONST(x)) = Word32Signed.toString x
-      | pp_exp (TEMP(t)) = Temp.name t
-      | pp_exp (BINOP (binop, e1, e2)) =
-	  "(" ^ pp_exp e1 ^ " " ^ pp_binop binop ^ " " ^ pp_exp e2 ^ ")"
-      | pp_exp (UNOP (unop, e1)) =
-          pp_unop unop ^ "(" ^ pp_exp e1 ^ ")"
-
-    fun pp_stm (MOVE (e1,e2)) =
-	  pp_exp e1 ^ "  <--  " ^ pp_exp e2
-      | pp_stm (RETURN e) =
-	  "return " ^ pp_exp e
-      | pp_stm (LABEL l) =
-          Label.name l ^ ":"
-      | pp_stm (JUMP l) = 
-          "jump "^Label.name l
-      | pp_stm (JUMPIFN (e, l)) =
-          "jump "^Label.name l^" if! "^pp_exp e
-
-    fun pp_program (nil) = ""
-      | pp_program (stm::stms) = pp_stm stm ^ "\n" ^ pp_program stms
-  end
+  type program = func list
 end