Add strings to type system and parser/lexer

[snipe.git] / codegen / coloring.sml

diff --git a/codegen/coloring.sml b/codegen/coloring.sml
index 1e08e1d7d6863fb9359eb60cd5126cb60c309610..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.oper
+    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.prettyprint_oper X.Long loss )))
+               | 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 =