Initial import of l5c

[snipe.git] / codegen / coloring.sml

diff --git a/codegen/coloring.sml b/codegen/coloring.sml
index 1e08e1d7d6863fb9359eb60cd5126cb60c309610..fc5fdf7b40c155fb4ea77b514f931ffecd4a2459 100644 (file)
--- a/codegen/coloring.sml
+++ b/codegen/coloring.sml
@@ -8,7 +8,7 @@
 signature COLORIZER =
 sig
   structure OperSet : ORD_SET
-    where type Key.ord_key = x86.oper
+    where type Key.ord_key = x86.basicop
   structure LiveMap : ORD_MAP
     where type Key.ord_key = int
   structure TempMap : ORD_MAP
@@ -70,7 +70,7 @@ struct
           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, Temp.Long))))
           fixeds)
       (* Greedy-colorize -- pick the lowest number that isn't used by a neighbor *)
       fun greedy i l =