X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgMonad.lhs;h=900b6d9b85504322f2e9be7a7684f03e3ec2f3e5;hb=8b3bfb2ec41fd0e807a8f6e7a823795eafca1dcb;hp=83d2b72747cc8135db62d8314effa2c9150b603e;hpb=a02e7f40afc1aab7fe466f949f505c1d7250713d;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgMonad.lhs b/compiler/codeGen/CgMonad.lhs
index 83d2b72..900b6d9 100644
--- a/compiler/codeGen/CgMonad.lhs
+++ b/compiler/codeGen/CgMonad.lhs
@@ -63,8 +63,8 @@ import {-# SOURCE #-} CgBindery ( CgBindings, nukeVolatileBinds )
 
 import DynFlags
 import BlockId
-import Cmm
-import CmmUtils
+import OldCmm
+import OldCmmUtils
 import CLabel
 import StgSyn (SRT)
 import SMRep
@@ -73,9 +73,7 @@ import Id
 import VarEnv
 import OrdList
 import Unique
-import Util()
 import UniqSupply
-import FastString()
 import Outputable
 
 import Control.Monad
@@ -169,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
@@ -704,6 +701,8 @@ whenC :: Bool -> Code -> Code
 whenC True  code = code
 whenC False _    = nopC
 
+-- Corresponds to 'emit' in new code generator with a smart constructor
+-- from cmm/MkGraph.hs
 stmtC :: CmmStmt -> Code
 stmtC stmt = emitCgStmt (CgStmt stmt)
 
@@ -712,7 +711,7 @@ labelC id = emitCgStmt (CgLabel id)
 
 newLabelC :: FCode BlockId
 newLabelC = do { u <- newUnique
-               ; return $ BlockId u }
+               ; return $ mkBlockId u }
 
 checkedAbsC :: CmmStmt -> Code
 -- Emit code, eliminating no-ops
@@ -745,10 +744,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 (ListGraph 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