Tons of bug fixes

Author: rubensf

chp12/color.sml

@@ -278,13 +278,7 @@ struct
           alias := TM.insert ((!alias), v, u);
           movesMap := TM.insert ((!movesMap), u, TS.union(mvU, mvV));
           enableMoves (adjacents v);
-          print ("merging and printing (" ^ (F.makeString (FG.getNodeID nU)) ^ "," ^ (F.makeString (FG.getNodeID nV)) ^ ")\n");
-          FG.printGraph (fn (t,x) => F.makeString t) (!graph);
-          List.app (fn x => print ((F.makeString (FG.getNodeID x))^",")) (FG.nodes (!graph));
-          print "\n";
           graph := FG.mergeNodes (!graph) (nU, nV);
-          print "AFTER\n";
-          FG.printGraph (fn (t,x) => F.makeString t) (!graph);
           List.app decrementoutDegreeEffects adjsV;
 
           if not (isPrecolored u) andalso
@@ -352,17 +346,11 @@ struct
                 val nID = List.last (!selectStack)
                 val actualAdjs = List.map getNodeAlias
                                           (FG.adj (gNode nID))
-                val _ = print "===================PRINTING ACTUAL ADJS===================\n"
-                val _ = print ("Node: "^(F.makeString nID)^"\n")
-                val _ = List.app (fn x => (print ((F.makeString x)^", "))) actualAdjs
-                val _ = print "\n"
                 val unavColors =
                   TS.addList(
                     TS.empty,
                     List.mapPartial (fn x => TM.find((!colors), x))
                                     actualAdjs);
-                val _ = TS.app (fn x => (print ((F.makeString x)^", "))) unavColors
-                val _ = print "\n"
                 val avalColors = TS.difference(allColors, unavColors)
                 (*val _ = print ("Getting " ^ Temp.makeString nID ^ "\nunav\n")*)
                 (*val _ = TS.app (fn x => print (Temp.makeString x ^ "-")) unavColors*)

chp12/frame.sig

@@ -54,8 +54,8 @@ sig
   (* Calls an external function, such as C heap management. *)
   val externCallFn : string * Tree.exp list -> Tree.exp
 
-  val storeLocal : access -> Temp.temp -> Assem.instr
-  val loadLocal  : access -> Temp.temp -> Assem.instr
+  val storeLocal : frame -> access -> Temp.temp -> Assem.instr
+  val loadLocal  : frame -> access -> Temp.temp -> Assem.instr
   (* Function "decorators" - add prologue and epilogue standard mumbo jumbo *)
   val procEntryExit  : frame * Tree.stm -> Tree.stm
   (* Insert a final "instruction" to make sure that special registers and callee saved

chp12/main.sml

@@ -280,7 +280,7 @@ struct
 
       fun printRuntime out =
         let
-          val read = TextIO.openIn("nr.s")
+          val read = TextIO.openIn("runtime.s")
           val _ = TextIO.output(out, TextIO.inputAll(read))
         in
           ()

chp12/mipsframe.sml

@@ -152,17 +152,21 @@ struct
   fun externCallFn (s, args) =
     CALL (NAME (Temp.namedlabel s), args)
 
-  fun storeLocal (InFrame adr) tmp =
-        Assem.OPER {assem="sw      `s0, " ^ (i2s adr) ^ "(`s1)\n",
-                    src=[tmp, getRegTemp sp], dst=[], jump=NONE}
-    | storeLocal (InReg reg) tmp =
+  fun storeLocal (f: frame) (InFrame adr) tmp =
+        Assem.OPER {assem="sw      `s0, " ^
+                          (i2s (adr - wordSize * (!(#maxArgsCall f)))) ^
+                          "(`s1)\n",
+                    src=[tmp, getRegTemp fp], dst=[], jump=NONE}
+    | storeLocal (f: frame) (InReg reg) tmp =
         (ErrorMsg.error 0 "Not a frame value.";
          Assem.LABEL {assem="", lab=Temp.newlabel ()})
 
-  fun loadLocal (InFrame adr) tmp =
-        Assem.OPER {assem="lw      `d0, " ^ (i2s adr) ^ "(`s0)\n",
-                    src=[getRegTemp sp], dst=[tmp], jump=NONE}
-    | loadLocal (InReg reg) tmp =
+  fun loadLocal (f: frame) (InFrame adr) tmp =
+        Assem.OPER {assem="lw      `d0, " ^
+                          (i2s (adr - wordSize * (!(#maxArgsCall f)))) ^
+                          "(`s0)\n",
+                    src=[getRegTemp fp], dst=[tmp], jump=NONE}
+    | loadLocal (f: frame) (InReg reg) tmp =
         (ErrorMsg.error 0 "Not a frame value.";
          Assem.LABEL {assem="", lab=Temp.newlabel ()})