X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcodeGen%2FCgMonad.lhs;h=8a3b664fc1aa35bcc2980d9d5bb7244ec0a42eaf;hp=688591292cb8497fc0093f5452a2eaa06d626b78;hb=d0faaa6fa0cecd23c5670fd199e9206275313666;hpb=1f8efd5d6214c490ef4942134abf5de9f468d29c

diff --git a/compiler/codeGen/CgMonad.lhs b/compiler/codeGen/CgMonad.lhs
index 6885912..8a3b664 100644
--- a/compiler/codeGen/CgMonad.lhs
+++ b/compiler/codeGen/CgMonad.lhs
@@ -13,7 +13,7 @@ module CgMonad (
 	FCode,	-- type
 
 	initC, thenC, thenFC, listCs, listFCs, mapCs, mapFCs,
-	returnFC, fixC, checkedAbsC, 
+	returnFC, fixC, fixC_, checkedAbsC, 
 	stmtC, stmtsC, labelC, emitStmts, nopC, whenC, newLabelC,
 	newUnique, newUniqSupply, 
 
@@ -47,7 +47,7 @@ module CgMonad (
 	Sequel(..), -- ToDo: unabstract?
 
 	-- ideally we wouldn't export these, but some other modules access internal state
-	getState, setState, getInfoDown, getDynFlags, getThisPackage,
+	getState, setState, getInfoDown, getDynFlags, getThisPackage, 
 
 	-- more localised access to monad state	
 	getStkUsage, setStkUsage,
@@ -62,9 +62,9 @@ module CgMonad (
 import {-# SOURCE #-} CgBindery ( CgBindings, nukeVolatileBinds )
 
 import DynFlags
-import PackageConfig
-import Cmm
-import CmmUtils
+import BlockId
+import OldCmm
+import OldCmmUtils
 import CLabel
 import StgSyn (SRT)
 import SMRep
@@ -73,12 +73,11 @@ import Id
 import VarEnv
 import OrdList
 import Unique
-import Util
 import UniqSupply
-import FastString
 import Outputable
 
 import Control.Monad
+import Data.List
 
 infixr 9 `thenC`	-- Right-associative!
 infixr 9 `thenFC`
@@ -157,6 +156,7 @@ data EndOfBlockInfo
 			  -- by a case alternative.
 	Sequel
 
+initEobInfo :: EndOfBlockInfo
 initEobInfo = EndOfBlockInfo 0 OnStack
 \end{code}
 
@@ -167,7 +167,6 @@ block.
 \begin{code}
 data Sequel
   = OnStack 		-- Continuation is on the stack
-  | UpdateCode		-- Continuation is update
 
   | CaseAlts
 	  CLabel     -- Jump to this; if the continuation is for a vectored
@@ -233,6 +232,7 @@ flattenCgStmts id stmts =
 	    where (block,blocks) = flatten stmts
 	(CgFork fork_id stmts : ss) -> 
 	   flatten (CgFork fork_id stmts : CgStmt stmt : ss)
+        (CgStmt {} : _) -> panic "CgStmt not seen as ordinary"
 
   flatten (s:ss) = 
 	case s of
@@ -243,11 +243,14 @@ flattenCgStmts id stmts =
 		where (fork_block, fork_blocks) = flatten (fromOL stmts)
     where (block,blocks) = flatten ss
 
+isJump :: CmmStmt -> Bool
 isJump (CmmJump _ _) = True
 isJump (CmmBranch _) = True
 isJump (CmmSwitch _ _) = True
+isJump (CmmReturn _) = True
 isJump _ = False
 
+isOrdinaryStmt :: CgStmt -> Bool
 isOrdinaryStmt (CgStmt _) = True
 isOrdinaryStmt _ = False
 \end{code}
@@ -388,7 +391,7 @@ initC dflags mod (FCode code)
 	}
 
 returnFC :: a -> FCode a
-returnFC val = FCode (\info_down state -> (val, state))
+returnFC val = FCode (\_ state -> (val, state))
 \end{code}
 
 \begin{code}
@@ -437,6 +440,9 @@ fixC fcode = FCode (
 		in
 			result
 	)
+
+fixC_ :: (a -> FCode a) -> FCode ()
+fixC_ fcode = fixC fcode >> return ()
 \end{code}
 
 %************************************************************************
@@ -448,10 +454,10 @@ fixC fcode = FCode (
 
 \begin{code}
 getState :: FCode CgState
-getState = FCode $ \info_down state -> (state,state)
+getState = FCode $ \_ state -> (state,state)
 
 setState :: CgState -> FCode ()
-setState state = FCode $ \info_down _ -> ((),state)
+setState state = FCode $ \_ _ -> ((),state)
 
 getStkUsage :: FCode StackUsage
 getStkUsage = do
@@ -693,7 +699,7 @@ nopC = return ()
 
 whenC :: Bool -> Code -> Code
 whenC True  code = code
-whenC False code = nopC
+whenC False _    = nopC
 
 stmtC :: CmmStmt -> Code
 stmtC stmt = emitCgStmt (CgStmt stmt)
@@ -702,7 +708,8 @@ labelC :: BlockId -> Code
 labelC id = emitCgStmt (CgLabel id)
 
 newLabelC :: FCode BlockId
-newLabelC = do { id <- newUnique; return (BlockId id) }
+newLabelC = do { u <- newUnique
+               ; return $ mkBlockId u }
 
 checkedAbsC :: CmmStmt -> Code
 -- Emit code, eliminating no-ops
@@ -735,10 +742,11 @@ emitData sect lits
     data_block = CmmData sect lits
 
 emitProc :: CmmInfo -> CLabel -> CmmFormals -> [CmmBasicBlock] -> Code
-emitProc info lbl args blocks
-  = do  { let proc_block = CmmProc info lbl args blocks
+emitProc info lbl [] blocks
+  = do  { let proc_block = CmmProc info lbl (ListGraph blocks)
 	; state <- getState
 	; setState $ state { cgs_tops = cgs_tops state `snocOL` proc_block } }
+emitProc _ _ (_:_) _ = panic "emitProc called with nonempty args"
 
 emitSimpleProc :: CLabel -> Code -> Code
 -- Emit a procedure whose body is the specified code; no info table
@@ -749,11 +757,14 @@ emitSimpleProc lbl code
 
 getCmm :: Code -> FCode Cmm
 -- Get all the CmmTops (there should be no stmts)
+-- Return a single Cmm which may be split from other Cmms by
+-- object splitting (at a later stage)
 getCmm code 
   = do	{ state1 <- getState
 	; ((), state2) <- withState code (state1 { cgs_tops  = nilOL })
 	; setState $ state2 { cgs_tops = cgs_tops state1 } 
-	; return (Cmm (fromOL (cgs_tops state2))) }
+	; return (Cmm (fromOL (cgs_tops state2))) 
+        }
 
 -- ----------------------------------------------------------------------------
 -- CgStmts