From 5e46186e8e7b8f4d9a28cb95954d8a75b6b34f81 Mon Sep 17 00:00:00 2001
From: Joshua Wise <jwise@andrew.cmu.edu>
Date: Mon, 5 Jul 2010 05:44:55 -0400
Subject: [PATCH] Update coloring for Blarg.
---
codegen/coloring.sml | 6 +++---
codegen/colororder.sml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/codegen/coloring.sml b/codegen/coloring.sml
index fc5fdf7..4201c26 100644
--- 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.basicop
+ where type Key.ord_key = Blarg.oper
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
- 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
@@ -70,7 +70,7 @@ struct
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 =
diff --git a/codegen/colororder.sml b/codegen/colororder.sml
index 16dd163..f1a724b 100644
--- a/codegen/colororder.sml
+++ b/codegen/colororder.sml
@@ -7,7 +7,7 @@
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
@@ -22,7 +22,7 @@ end
structure ColorOrder :> COLORORDER =
struct
structure T = Temp
- structure X = x86
+ structure X = Blarg
structure OperSet = Igraph.OperSet
structure LiveMap = Igraph.LiveMap
@@ -44,7 +44,7 @@ struct
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. *)
--
2.43.0