X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgBindery.lhs;h=66776930c5aaae003d0e072dd5e3dee224b4b914;hb=90b9566607ef837329434657c8fabc4bdffdf1af;hp=7447222d458c4da506a8f61fdf72ba80f511f7e4;hpb=6015a94f9108a502150565577b66c23650796639;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgBindery.lhs b/compiler/codeGen/CgBindery.lhs
index 7447222..6677693 100644
--- a/compiler/codeGen/CgBindery.lhs
+++ b/compiler/codeGen/CgBindery.lhs
@@ -5,6 +5,13 @@
 \section[CgBindery]{Utility functions related to doing @CgBindings@}
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module CgBindery (
 	CgBindings, CgIdInfo,
 	StableLoc, VolatileLoc,
@@ -31,8 +38,6 @@ module CgBindery (
 	maybeLetNoEscape, 
     ) where
 
-#include "HsVersions.h"
-
 import CgMonad
 import CgHeapery
 import CgStackery
@@ -55,6 +60,7 @@ import StgSyn
 import Unique
 import UniqSet
 import Outputable
+import FastString
 
 \end{code}
 
@@ -147,20 +153,20 @@ data StableLoc
 \begin{code}
 instance Outputable CgIdInfo where
   ppr (CgIdInfo id rep vol stb lf _) -- TODO, pretty pring the tag info
-    = ppr id <+> ptext SLIT("-->") <+> vcat [ppr vol, ppr stb]
+    = ppr id <+> ptext (sLit "-->") <+> vcat [ppr vol, ppr stb]
 
 instance Outputable VolatileLoc where
   ppr NoVolatileLoc = empty
-  ppr (RegLoc r)     = ptext SLIT("reg") <+> ppr r
-  ppr (VirHpLoc v)   = ptext SLIT("vh")  <+> ppr v
-  ppr (VirNodeLoc v) = ptext SLIT("vn")  <+> ppr v
+  ppr (RegLoc r)     = ptext (sLit "reg") <+> ppr r
+  ppr (VirHpLoc v)   = ptext (sLit "vh")  <+> ppr v
+  ppr (VirNodeLoc v) = ptext (sLit "vn")  <+> ppr v
 
 instance Outputable StableLoc where
   ppr NoStableLoc   = empty
-  ppr VoidLoc       = ptext SLIT("void")
-  ppr (VirStkLoc v) = ptext SLIT("vs")    <+> ppr v
-  ppr (VirStkLNE v) = ptext SLIT("lne")    <+> ppr v
-  ppr (StableLoc a) = ptext SLIT("amode") <+> ppr a
+  ppr VoidLoc       = ptext (sLit "void")
+  ppr (VirStkLoc v) = ptext (sLit "vs")    <+> ppr v
+  ppr (VirStkLNE v) = ptext (sLit "lne")    <+> ppr v
+  ppr (StableLoc a) = ptext (sLit "amode") <+> ppr a
 \end{code}
 
 %************************************************************************
@@ -280,8 +286,7 @@ getCgIdInfo id
 	    name = idName id
 	in
 	if isExternalName name then do
-	    this_pkg <- getThisPackage
-	    let ext_lbl = CmmLit (CmmLabel (mkClosureLabel this_pkg name))
+	    let ext_lbl = CmmLit (CmmLabel (mkClosureLabel name))
 	    return (stableIdInfo id ext_lbl (mkLFImported id))
 	else
 	if isVoidArg (idCgRep id) then
@@ -300,11 +305,11 @@ cgLookupPanic id
 	srt <- getSRTLabel
 	pprPanic "cgPanic"
 		(vcat [ppr id,
-		ptext SLIT("static binds for:"),
+		ptext (sLit "static binds for:"),
 		vcat [ ppr (cg_id info) | info <- varEnvElts static_binds ],
-		ptext SLIT("local binds for:"),
+		ptext (sLit "local binds for:"),
 		vcat [ ppr (cg_id info) | info <- varEnvElts local_binds ],
-	        ptext SLIT("SRT label") <+> pprCLabel srt
+	        ptext (sLit "SRT label") <+> pprCLabel srt
 	      ])
 \end{code}
 
@@ -444,8 +449,8 @@ bindNewToTemp id
     uniq     = getUnique id
     temp_reg = LocalReg uniq (argMachRep (idCgRep id)) kind
     kind     = if isFollowableArg (idCgRep id)
-               then KindPtr
-               else KindNonPtr
+               then GCKindPtr
+               else GCKindNonPtr
     lf_info  = mkLFArgument id	-- Always used of things we
 				-- know nothing about