Move some more constants into platformConstants

3 files changed, 21 insertions, 17 deletions

diff --git a/compiler/nativeGen/SPARC/Base.hs b/compiler/nativeGen/SPARC/Base.hs
index de11b9f77c..aa7b057e69 100644
--- a/compiler/nativeGen/SPARC/Base.hs
+++ b/compiler/nativeGen/SPARC/Base.hs
@@ -25,7 +25,7 @@ module SPARC.Base (
 
 where
 
-import qualified Constants
+import DynFlags
 import Panic
 
 import Data.Int
@@ -40,9 +40,9 @@ wordLengthInBits
 	= wordLength * 8
 
 -- Size of the available spill area
-spillAreaLength :: Int
+spillAreaLength :: DynFlags -> Int
 spillAreaLength
-	= Constants.rESERVED_C_STACK_BYTES
+	= rESERVED_C_STACK_BYTES
 
 -- | We need 8 bytes because our largest registers are 64 bit.
 spillSlotSize :: Int
diff --git a/compiler/nativeGen/SPARC/Instr.hs b/compiler/nativeGen/SPARC/Instr.hs
index 021b2fb772..9404badea6 100644
--- a/compiler/nativeGen/SPARC/Instr.hs
+++ b/compiler/nativeGen/SPARC/Instr.hs
@@ -46,6 +46,7 @@ import Size
 import CLabel
 import CodeGen.Platform
 import BlockId
+import DynFlags
 import OldCmm
 import FastString
 import FastBool
@@ -372,15 +373,16 @@ sparc_patchJumpInstr insn patchF
 -- | Make a spill instruction.
 -- 	On SPARC we spill below frame pointer leaving 2 words/spill
 sparc_mkSpillInstr
-    :: Platform
+    :: DynFlags
     -> Reg      -- ^ register to spill
     -> Int      -- ^ current stack delta
     -> Int      -- ^ spill slot to use
     -> Instr
 
-sparc_mkSpillInstr platform reg _ slot
- = let	off     = spillSlotToOffset slot
-        off_w	= 1 + (off `div` 4)
+sparc_mkSpillInstr dflags reg _ slot
+ = let  platform = targetPlatform dflags
+        off      = spillSlotToOffset dflags slot
+        off_w    = 1 + (off `div` 4)
         sz 	= case targetClassOfReg platform reg of
 			RcInteger -> II32
 			RcFloat   -> FF32
@@ -392,14 +394,15 @@ sparc_mkSpillInstr platform reg _ slot
 
 -- | Make a spill reload instruction.
 sparc_mkLoadInstr
-    :: Platform
+    :: DynFlags
     -> Reg      -- ^ register to load into
     -> Int      -- ^ current stack delta
     -> Int      -- ^ spill slot to use
     -> Instr
 
-sparc_mkLoadInstr platform reg _ slot
-  = let off     = spillSlotToOffset slot
+sparc_mkLoadInstr dflags reg _ slot
+  = let platform = targetPlatform dflags
+        off      = spillSlotToOffset dflags slot
 	off_w	= 1 + (off `div` 4)
         sz	= case targetClassOfReg platform reg of
 			RcInteger -> II32
diff --git a/compiler/nativeGen/SPARC/Stack.hs b/compiler/nativeGen/SPARC/Stack.hs
index 7f75693889..65dfef0e25 100644
--- a/compiler/nativeGen/SPARC/Stack.hs
+++ b/compiler/nativeGen/SPARC/Stack.hs
@@ -20,6 +20,7 @@ import SPARC.Regs
 import SPARC.Base
 import SPARC.Imm
 
+import DynFlags
 import Outputable
 
 -- | Get an AddrMode relative to the address in sp.
@@ -42,15 +43,15 @@ fpRel n
 
 -- | Convert a spill slot number to a *byte* offset, with no sign.
 --
-spillSlotToOffset :: Int -> Int
-spillSlotToOffset slot
-	| slot >= 0 && slot < maxSpillSlots
+spillSlotToOffset :: DynFlags -> Int -> Int
+spillSlotToOffset dflags slot
+	| slot >= 0 && slot < maxSpillSlots dflags
 	= 64 + spillSlotSize * slot
 
 	| otherwise
 	= pprPanic "spillSlotToOffset:" 
 	              (   text "invalid spill location: " <> int slot
-		      $$  text "maxSpillSlots:          " <> int maxSpillSlots)
+		      $$  text "maxSpillSlots:          " <> int (maxSpillSlots dflags))
 
 
 -- | The maximum number of spill slots available on the C stack.
@@ -59,7 +60,7 @@ spillSlotToOffset slot
 --	Why do we reserve 64 bytes, instead of using the whole thing??
 --		-- BL 2009/02/15
 --
-maxSpillSlots :: Int
-maxSpillSlots 
-	= ((spillAreaLength - 64) `div` spillSlotSize) - 1
+maxSpillSlots :: DynFlags -> Int
+maxSpillSlots dflags
+	= ((spillAreaLength dflags - 64) `div` spillSlotSize) - 1