X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FStgCmmMonad.hs;h=f1823bd17650522334daa6d8088e8b7cbb228534;hb=17c8229adf9f268097e4c87053d940a918c3a26f;hp=1419773ce0b61e6cecb93d7441c456fb347d8860;hpb=31a9d04804d9cacda35695c5397590516b964964;p=ghc-hetmet.git

diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs
index 1419773..f1823bd 100644
--- a/compiler/codeGen/StgCmmMonad.hs
+++ b/compiler/codeGen/StgCmmMonad.hs
@@ -10,7 +10,7 @@ module StgCmmMonad (
 	FCode,	-- type
 
 	initC, thenC, thenFC, listCs, listFCs, mapCs, mapFCs,
-	returnFC, fixC, nopC, whenC, 
+	returnFC, fixC, fixC_, nopC, whenC, 
 	newUnique, newUniqSupply, 
 
 	emit, emitData, emitProc, emitProcWithConvention, emitSimpleProc,
@@ -149,6 +149,8 @@ fixC fcode = FCode (
 			result
 	)
 
+fixC_ :: (a -> FCode a) -> FCode ()
+fixC_ fcode = fixC fcode >> return ()
 
 --------------------------------------------------------
 --	The code generator environment
@@ -258,7 +260,9 @@ data CgState
 data HeapUsage =
   HeapUsage {
 	virtHp :: VirtualHpOffset,	-- Virtual offset of highest-allocated word
+	       	  			--   Incremented whenever we allocate
 	realHp :: VirtualHpOffset	-- realHp: Virtual offset of real heap ptr
+	       	  			--   Used in instruction addressing modes
   }
 
 type VirtualHpOffset = WordOff
@@ -607,7 +611,7 @@ emitProcWithConvention conv info lbl args blocks
         ; setState $ state { cgs_tops = cgs_tops state `snocOL` proc_block } }
 
 emitProc :: CmmInfo -> CLabel -> CmmFormals -> CmmAGraph -> FCode ()
-emitProc = emitProcWithConvention Native
+emitProc = emitProcWithConvention NativeNodeCall
 
 emitSimpleProc :: CLabel -> CmmAGraph -> FCode ()
 emitSimpleProc lbl code =