Pass DynFlags down to bWord

I've switched to passing DynFlags rather than Platform, as (a) it's
simpler to not have to extract targetPlatform in so many places, and
(b) it may be useful to have DynFlags around in future.

1 files changed, 22 insertions, 18 deletions

diff --git a/compiler/codeGen/StgCmmEnv.hs b/compiler/codeGen/StgCmmEnv.hs
index e4611237cc..10fc2029a9 100644
--- a/compiler/codeGen/StgCmmEnv.hs
+++ b/compiler/codeGen/StgCmmEnv.hs
@@ -41,6 +41,7 @@ import StgCmmClosure
 
 import CLabel
 
+import DynFlags
 import MkGraph
 import BlockId
 import CmmExpr
@@ -81,18 +82,18 @@ mkCgIdInfo id lf expr
              , cg_loc = CmmLoc expr, 
 	       cg_tag = lfDynTag lf }
 
-litIdInfo :: Id -> LambdaFormInfo -> CmmLit -> CgIdInfo
-litIdInfo id lf lit
+litIdInfo :: DynFlags -> Id -> LambdaFormInfo -> CmmLit -> CgIdInfo
+litIdInfo dflags id lf lit
   = CgIdInfo { cg_id = id, cg_lf = lf
-             , cg_loc = CmmLoc (addDynTag (CmmLit lit) tag) 
+             , cg_loc = CmmLoc (addDynTag dflags (CmmLit lit) tag) 
 	     , cg_tag = tag }
   where
     tag = lfDynTag lf
 
-lneIdInfo :: Id -> [NonVoid Id] -> CgIdInfo
-lneIdInfo id regs 
+lneIdInfo :: DynFlags -> Id -> [NonVoid Id] -> CgIdInfo
+lneIdInfo dflags id regs
   = CgIdInfo { cg_id = id, cg_lf = lf
-             , cg_loc = LneLoc blk_id (map idToReg regs)
+             , cg_loc = LneLoc blk_id (map (idToReg dflags) regs)
 	     , cg_tag = lfDynTag lf }
   where
     lf     = mkLFLetNoEscape
@@ -104,9 +105,9 @@ rhsIdInfo id lf_info
   = do { reg <- newTemp gcWord
        ; return (mkCgIdInfo id lf_info (CmmReg (CmmLocal reg)), reg) }
 
-mkRhsInit :: LocalReg -> LambdaFormInfo -> CmmExpr -> CmmAGraph
-mkRhsInit reg lf_info expr
-  = mkAssign (CmmLocal reg) (addDynTag expr (lfDynTag lf_info))
+mkRhsInit :: DynFlags -> LocalReg -> LambdaFormInfo -> CmmExpr -> CmmAGraph
+mkRhsInit dflags reg lf_info expr
+  = mkAssign (CmmLocal reg) (addDynTag dflags expr (lfDynTag lf_info))
 
 idInfoToAmode :: CgIdInfo -> CmmExpr
 -- Returns a CmmExpr for the *tagged* pointer
@@ -114,9 +115,9 @@ idInfoToAmode (CgIdInfo { cg_loc = CmmLoc e }) = e
 idInfoToAmode cg_info
   = pprPanic "idInfoToAmode" (ppr (cg_id cg_info))	-- LneLoc
 
-addDynTag :: CmmExpr -> DynTag -> CmmExpr
+addDynTag :: DynFlags -> CmmExpr -> DynTag -> CmmExpr
 -- A tag adds a byte offset to the pointer
-addDynTag expr tag = cmmOffsetB expr tag
+addDynTag dflags expr tag = cmmOffsetB dflags expr tag
 
 cgIdInfoId :: CgIdInfo -> Id
 cgIdInfoId = cg_id 
@@ -170,7 +171,8 @@ getCgIdInfo id
 	in
 	if isExternalName name then do
 	    let ext_lbl = CmmLabel (mkClosureLabel name $ idCafInfo id)
-	    return (litIdInfo id (mkLFImported id) ext_lbl)
+            dflags <- getDynFlags
+	    return (litIdInfo dflags id (mkLFImported id) ext_lbl)
 	else
 	-- Bug	
 	cgLookupPanic id
@@ -212,9 +214,10 @@ getNonVoidArgAmodes (arg:args)
 bindToReg :: NonVoid Id -> LambdaFormInfo -> FCode LocalReg
 -- Bind an Id to a fresh LocalReg
 bindToReg nvid@(NonVoid id) lf_info
-  = do	{ let reg = idToReg nvid
-	; addBindC id (mkCgIdInfo id lf_info (CmmReg (CmmLocal reg)))
-	; return reg }
+  = do dflags <- getDynFlags
+       let reg = idToReg dflags nvid
+       addBindC id (mkCgIdInfo id lf_info (CmmReg (CmmLocal reg)))
+       return reg
 
 rebindToReg :: NonVoid Id -> FCode LocalReg
 -- Like bindToReg, but the Id is already in scope, so 
@@ -229,7 +232,7 @@ bindArgToReg nvid@(NonVoid id) = bindToReg nvid (mkLFArgument id)
 bindArgsToRegs :: [NonVoid Id] -> FCode [LocalReg]
 bindArgsToRegs args = mapM bindArgToReg args
 
-idToReg :: NonVoid Id -> LocalReg
+idToReg :: DynFlags -> NonVoid Id -> LocalReg
 -- Make a register from an Id, typically a function argument,
 -- free variable, or case binder
 --
@@ -237,8 +240,9 @@ idToReg :: NonVoid Id -> LocalReg
 --
 -- By now the Ids should be uniquely named; else one would worry
 -- about accidental collision 
-idToReg (NonVoid id) = LocalReg (idUnique id) 
+idToReg dflags (NonVoid id)
+             = LocalReg (idUnique id)
                         (case idPrimRep id of VoidRep -> pprPanic "idToReg" (ppr id)
-                                              _ -> primRepCmmType (idPrimRep id))
+                                              _ -> primRepCmmType dflags (idPrimRep id))