X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgHeapery.lhs;h=66d41d3d96742693c785f7110ce74cc095b4b143;hb=08652e67c4d5d9a40687f93c286021a867c1bca0;hp=9cb1bb4370f85e381b0594dffc32f92d11c1c2b8;hpb=e5d9aaa2b7b717c862651f8eea5e2dc66f0a8028;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgHeapery.lhs b/compiler/codeGen/CgHeapery.lhs
index 9cb1bb4..66d41d3 100644
--- a/compiler/codeGen/CgHeapery.lhs
+++ b/compiler/codeGen/CgHeapery.lhs
@@ -52,6 +52,7 @@ import Util
 import Constants
 import PackageConfig
 import Outputable
+import FastString
 
 import Data.List
 \end{code}
@@ -353,7 +354,7 @@ altHeapCheck alt_type code
 	; setRealHp hpHw
 	; code }
   where
-    rts_label PolyAlt = CmmLit (CmmLabel (mkRtsCodeLabel SLIT( "stg_gc_unpt_r1")))
+    rts_label PolyAlt = CmmLit (CmmLabel (mkRtsCodeLabel (sLit "stg_gc_unpt_r1")))
       	-- Do *not* enter R1 after a heap check in
 	-- a polymorphic case.  It might be a function
 	-- and the entry code for a function (currently)
@@ -367,14 +368,14 @@ altHeapCheck alt_type code
     rts_label (PrimAlt tc)
       = CmmLit $ CmmLabel $ 
 	case primRepToCgRep (tyConPrimRep tc) of
-	  VoidArg   -> mkRtsCodeLabel SLIT( "stg_gc_noregs")
-	  FloatArg  -> mkRtsCodeLabel SLIT( "stg_gc_f1")
-	  DoubleArg -> mkRtsCodeLabel SLIT( "stg_gc_d1")
-	  LongArg   -> mkRtsCodeLabel SLIT( "stg_gc_l1")
+	  VoidArg   -> mkRtsCodeLabel (sLit "stg_gc_noregs")
+	  FloatArg  -> mkRtsCodeLabel (sLit "stg_gc_f1")
+	  DoubleArg -> mkRtsCodeLabel (sLit "stg_gc_d1")
+	  LongArg   -> mkRtsCodeLabel (sLit "stg_gc_l1")
 				-- R1 is boxed but unlifted: 
-	  PtrArg    -> mkRtsCodeLabel SLIT( "stg_gc_unpt_r1")
+	  PtrArg    -> mkRtsCodeLabel (sLit "stg_gc_unpt_r1")
 				-- R1 is unboxed:
-	  NonPtrArg -> mkRtsCodeLabel SLIT( "stg_gc_unbx_r1")
+	  NonPtrArg -> mkRtsCodeLabel (sLit "stg_gc_unbx_r1")
 
     rts_label (UbxTupAlt _) = panic "altHeapCheck"
 \end{code}
@@ -412,7 +413,7 @@ unbxTupleHeapCheck regs ptrs nptrs fail_code code
     assign_liveness = CmmAssign (CmmGlobal (VanillaReg 9)) 	-- Ho ho ho!
 				(CmmLit (mkWordCLit liveness))
     liveness 	    = mkRegLiveness regs ptrs nptrs
-    rts_label	    = CmmLit (CmmLabel (mkRtsCodeLabel SLIT("stg_gc_ut")))
+    rts_label	    = CmmLit (CmmLabel (mkRtsCodeLabel (sLit "stg_gc_ut")))
 
 \end{code}
 
@@ -519,7 +520,7 @@ stkChkNodePoints :: CmmExpr -> Code
 stkChkNodePoints bytes
   = do_checks' bytes (CmmLit (mkIntCLit 0)) True False noStmts stg_gc_enter1
 
-stg_gc_gen = CmmLit (CmmLabel (mkRtsCodeLabel SLIT("stg_gc_gen")))
+stg_gc_gen = CmmLit (CmmLabel (mkRtsCodeLabel (sLit "stg_gc_gen")))
 stg_gc_enter1 = CmmReg (CmmGlobal GCEnter1)
 \end{code}