Update coloring for Blarg.

diff --git a/codegen/coloring.sml b/codegen/coloring.sml
index fc5fdf7b40c155fb4ea77b514f931ffecd4a2459..4201c2600542d4ac2bdf2ff5b751e0e55d1b51c0 100644 (file)
--- a/codegen/coloring.sml
+++ b/codegen/coloring.sml
@@ -8,7 +8,7 @@
 signature COLORIZER =
 sig
   structure OperSet : ORD_SET
 signature COLORIZER =
 sig
   structure OperSet : ORD_SET

-    where type Key.ord_key = x86.basicop
+    where type Key.ord_key = Blarg.oper

   structure LiveMap : ORD_MAP
     where type Key.ord_key = int
   structure TempMap : ORD_MAP
   structure LiveMap : ORD_MAP
     where type Key.ord_key = int
   structure TempMap : ORD_MAP


@@ -31,7 +31,7 @@ struct
   type colorlist = (Temp.temp * int) list
   type igraph = OperSet.set TempMap.map
   
   type colorlist = (Temp.temp * int) list
   type igraph = OperSet.set TempMap.map
   

-  structure X = x86
+  structure X = Blarg

   
   (* val color_single : igraph -> Temp.temp * colorlist -> colorlist
    * color_single graph (temp, regs) => takes an interference graph, the temp to be colored, and the 
   
   (* val color_single : igraph -> Temp.temp * colorlist -> colorlist
    * color_single graph (temp, regs) => takes an interference graph, the temp to be colored, and the 


@@ -70,7 +70,7 @@ struct
           colorized)
         @ (List.map
              (fn X.REG a => X.regtonum a
           colorized)
         @ (List.map
              (fn X.REG a => X.regtonum a

-               | loss => raise ErrorMsg.InternalError ("Bad kind of specreg " ^ (X.pp_oper (loss, Temp.Long))))
+               | loss => raise ErrorMsg.InternalError ("Bad kind of specreg " ^ (X.pp_oper loss)))

           fixeds)
       (* Greedy-colorize -- pick the lowest number that isn't used by a neighbor *)
       fun greedy i l =
           fixeds)
       (* Greedy-colorize -- pick the lowest number that isn't used by a neighbor *)
       fun greedy i l =

diff --git a/codegen/colororder.sml b/codegen/colororder.sml
index 16dd163067d0c600a8d8c0e544e3c27ee097c01d..f1a724b82915c1a54216cd5483759db7466c43dd 100644 (file)
--- a/codegen/colororder.sml
+++ b/codegen/colororder.sml
@@ -7,7 +7,7 @@
 signature COLORORDER =
 sig
   structure OperSet : ORD_SET
 signature COLORORDER =
 sig
   structure OperSet : ORD_SET

-    where type Key.ord_key = x86.basicop
+    where type Key.ord_key = Blarg.oper

   structure LiveMap : ORD_MAP
     where type Key.ord_key = int
   structure TempMap : ORD_MAP
   structure LiveMap : ORD_MAP
     where type Key.ord_key = int
   structure TempMap : ORD_MAP


@@ -22,7 +22,7 @@ end
 structure ColorOrder :> COLORORDER =
 struct
   structure T = Temp
 structure ColorOrder :> COLORORDER =
 struct
   structure T = Temp

-  structure X = x86
+  structure X = Blarg

   
   structure OperSet = Igraph.OperSet
   structure LiveMap = Igraph.LiveMap
   
   structure OperSet = Igraph.OperSet
   structure LiveMap = Igraph.LiveMap


@@ -44,7 +44,7 @@ struct
                 if (w2 > w1)
                 then (t2, w2)
                 else (t1, w1))
                 if (w2 > w1)
                 then (t2, w2)
                 else (t1, w1))

-              (Temp.new "emarnus" Temp.Word, ~9999)
+              (Temp.new "emarnus", ~9999)

               weights
               
           fun ditchOne f nil = nil     (* Special case of filter, which bails out after it removes one. *)
               weights
               
           fun ditchOne f nil = nil     (* Special case of filter, which bails out after it removes one. *)