Propagate strings through the blarg backend.

[snipe.git] / top / top.sml

diff --git a/top/top.sml b/top/top.sml
index 6a132c68931fb415686e29b2689e81d7a0cf0ab2..006fa4685af5d4f531d6fe377cabb60c9ebed5a0 100644 (file)
--- a/top/top.sml
+++ b/top/top.sml
@@ -142,26 +142,26 @@ struct
                   (fn () => List.app (TextIO.print o
                     (fn (t, i) =>
                       (Temp.name t) ^ " => " ^ (
                   (fn () => List.app (TextIO.print o
                     (fn (t, i) =>
                       (Temp.name t) ^ " => " ^ (

-                        if (i <= Blarg.regtonum Blarg.R3)
+                        if (i <= 15)

                           then (Blarg.pp_oper (Blarg.REG (Blarg.numtoreg i)))
                         else
                           then (Blarg.pp_oper (Blarg.REG (Blarg.numtoreg i)))
                         else

-                          "spill[" ^ Int.toString (i - Blarg.regtonum Blarg.R3) ^ "]")
+                          "spill[" ^ Int.toString (i - Blarg.regtonum Blarg.PC) ^ "]")

                         ^ "--"^ Int.toString i ^ "\n"))
                     colors) ()
 
                         ^ "--"^ Int.toString i ^ "\n"))
                     colors) ()
 

-(*        val _ = Flag.guard Flags.verbose say "  Solidifying blargCPU code..."
+        val _ = Flag.guard Flags.verbose say "  Solidifying blargCPU code..."

         val x86 = Solidify.solidify colors assem
 
         val _ = Flag.guard Flags.verbose say "  Optimizing final assembly..."
         val x86p = Optimizer.optimize_final (!enabledopts) x86
 
         val _ = Flag.guard Flags.verbose say "  Stringifying..."
         val x86 = Solidify.solidify colors assem
 
         val _ = Flag.guard Flags.verbose say "  Optimizing final assembly..."
         val x86p = Optimizer.optimize_final (!enabledopts) x86
 
         val _ = Flag.guard Flags.verbose say "  Stringifying..."

-        val x86d = [x86.DIRECTIVE(".globl " ^ name),
-                    x86.DIRECTIVE(name ^ ":")]
+        val x86d = [Blarg.DIRECTIVE(".globl " ^ name),
+                    Blarg.DIRECTIVE(name ^ ":")]

                     @ x86p
                     @ x86p

-        val code = Stringify.stringify realname x86d*)
+        val code = Stringify.stringify realname x86d

       in
       in

-        ""
+        code

       end
 
   fun main (name, args) =
       end
 
   fun main (name, args) =