Merging in the new codegen branch

This merge does not turn on the new codegen (which only compiles
a select few programs at this point),
but it does introduce some changes to the old code generator.

The high bits:
1. The Rep Swamp patch is finally here.
   The highlight is that the representation of types at the
   machine level has changed.
   Consequently, this patch contains updates across several back ends.
2. The new Stg -> Cmm path is here, although it appears to have a
   fair number of bugs lurking.
3. Many improvements along the CmmCPSZ path, including:
   o stack layout
   o some code for infotables, half of which is right and half wrong
   o proc-point splitting

1 files changed, 22 insertions, 23 deletions

diff --git a/compiler/codeGen/CgProf.hs b/compiler/codeGen/CgProf.hs
index c2a8a1bd75..c85beb50aa 100644
--- a/compiler/codeGen/CgProf.hs
+++ b/compiler/codeGen/CgProf.hs
@@ -45,7 +45,6 @@ import CgMonad
 import SMRep
 
 import Cmm
-import MachOp
 import CmmUtils
 import CLabel
 
@@ -70,7 +69,7 @@ import Control.Monad
 
 -- Expression representing the current cost centre stack
 curCCS :: CmmExpr
-curCCS = CmmLoad curCCSAddr wordRep
+curCCS = CmmLoad curCCSAddr bWord
 
 -- Address of current CCS variable, for storing into
 curCCSAddr :: CmmExpr
@@ -84,7 +83,7 @@ mkCCostCentreStack ccs = CmmLabel (mkCCSLabel ccs)
 
 costCentreFrom :: CmmExpr 	-- A closure pointer
 	       -> CmmExpr	-- The cost centre from that closure
-costCentreFrom cl = CmmLoad (cmmOffsetB cl oFFSET_StgHeader_ccs) wordRep
+costCentreFrom cl = CmmLoad (cmmOffsetB cl oFFSET_StgHeader_ccs) bWord
 
 staticProfHdr :: CostCentreStack -> [CmmLit]
 -- The profiling header words in a static closure
@@ -122,13 +121,13 @@ profAlloc words ccs
   = ifProfiling $
     stmtC (addToMemE alloc_rep
 		(cmmOffsetB ccs oFFSET_CostCentreStack_mem_alloc)
-	  	(CmmMachOp (MO_U_Conv wordRep alloc_rep) $
+	  	(CmmMachOp (MO_UU_Conv wordWidth alloc_rep) $
 		  [CmmMachOp mo_wordSub [words, 
 					 CmmLit (mkIntCLit profHdrSize)]]))
 		-- subtract the "profiling overhead", which is the
 		-- profiling header in a closure.
  where 
-	alloc_rep =  REP_CostCentreStack_mem_alloc
+   alloc_rep = typeWidth REP_CostCentreStack_mem_alloc
 
 -- ----------------------------------------------------------------------
 -- Setting the cost centre in a new closure
@@ -162,7 +161,7 @@ emitCCS ccs = push_em (ccsExpr ccs') (reverse cc's)
 
 	push_em ccs [] = return ccs
 	push_em ccs (cc:rest) = do
-  	  tmp <- newNonPtrTemp wordRep -- TODO FIXME NOW
+  	  tmp <- newTemp bWord -- TODO FIXME NOW
 	  pushCostCentre tmp ccs cc
 	  push_em (CmmReg (CmmLocal tmp)) rest
 
@@ -267,7 +266,7 @@ enterCostCentreThunk closure =
   ifProfiling $ do 
     stmtC $ CmmStore curCCSAddr (costCentreFrom closure)
 
-enter_ccs_fun stack = emitRtsCall (sLit "EnterFunCCS") [CmmKinded stack PtrHint] False
+enter_ccs_fun stack = emitRtsCall (sLit "EnterFunCCS") [CmmHinted stack AddrHint] False
 			-- ToDo: vols
 
 enter_ccs_fsub = enteringPAP 0
@@ -280,7 +279,7 @@ enter_ccs_fsub = enteringPAP 0
 enteringPAP :: Integer -> Code
 enteringPAP n
   = stmtC (CmmStore (CmmLit (CmmLabel (mkRtsDataLabel (sLit "entering_PAP"))))
-		(CmmLit (CmmInt n cIntRep)))
+		(CmmLit (CmmInt n cIntWidth)))
 
 ifProfiling :: Code -> Code
 ifProfiling code
@@ -340,7 +339,7 @@ emitCostCentreStackDecl ccs
   | otherwise = pprPanic "emitCostCentreStackDecl" (ppr ccs)
 
 zero = mkIntCLit 0
-zero64 = CmmInt 0 I64
+zero64 = CmmInt 0 W64
 
 sizeof_ccs_words :: Int
 sizeof_ccs_words 
@@ -359,12 +358,12 @@ sizeof_ccs_words
 
 emitRegisterCC :: CostCentre -> Code
 emitRegisterCC cc = do
-  { tmp <- newNonPtrTemp cIntRep
+  { tmp <- newTemp cInt
   ; stmtsC [
      CmmStore (cmmOffsetB cc_lit oFFSET_CostCentre_link)
-		 (CmmLoad cC_LIST wordRep),
+		 (CmmLoad cC_LIST bWord),
      CmmStore cC_LIST cc_lit,
-     CmmAssign (CmmLocal tmp) (CmmLoad cC_ID cIntRep),
+     CmmAssign (CmmLocal tmp) (CmmLoad cC_ID cInt),
      CmmStore (cmmOffsetB cc_lit oFFSET_CostCentre_ccID) (CmmReg (CmmLocal tmp)),
      CmmStore cC_ID (cmmRegOffB (CmmLocal tmp) 1)
    ]
@@ -378,12 +377,12 @@ emitRegisterCC cc = do
 
 emitRegisterCCS :: CostCentreStack -> Code
 emitRegisterCCS ccs = do
-  { tmp <- newNonPtrTemp cIntRep
+  { tmp <- newTemp cInt
   ; stmtsC [
      CmmStore (cmmOffsetB ccs_lit oFFSET_CostCentreStack_prevStack) 
-			(CmmLoad cCS_LIST wordRep),
+			(CmmLoad cCS_LIST bWord),
      CmmStore cCS_LIST ccs_lit,
-     CmmAssign (CmmLocal tmp) (CmmLoad cCS_ID cIntRep),
+     CmmAssign (CmmLocal tmp) (CmmLoad cCS_ID cInt),
      CmmStore (cmmOffsetB ccs_lit oFFSET_CostCentreStack_ccsID) (CmmReg (CmmLocal tmp)),
      CmmStore cCS_ID (cmmRegOffB (CmmLocal tmp) 1)
    ]
@@ -405,7 +404,7 @@ emitSetCCC :: CostCentre -> Code
 emitSetCCC cc
   | not opt_SccProfilingOn = nopC
   | otherwise = do 
-    tmp <- newNonPtrTemp wordRep -- TODO FIXME NOW
+    tmp <- newTemp bWord -- TODO FIXME NOW
     ASSERT( sccAbleCostCentre cc )
       pushCostCentre tmp curCCS cc
     stmtC (CmmStore curCCSAddr (CmmReg (CmmLocal tmp)))
@@ -414,14 +413,14 @@ emitSetCCC cc
 
 pushCostCentre :: LocalReg -> CmmExpr -> CostCentre -> Code
 pushCostCentre result ccs cc
-  = emitRtsCallWithResult result PtrHint
-	(sLit "PushCostCentre") [CmmKinded ccs PtrHint, 
-				CmmKinded (CmmLit (mkCCostCentre cc)) PtrHint]
+  = emitRtsCallWithResult result AddrHint
+	(sLit "PushCostCentre") [CmmHinted ccs AddrHint, 
+				 CmmHinted (CmmLit (mkCCostCentre cc)) AddrHint]
         False
 
 bumpSccCount :: CmmExpr -> CmmStmt
 bumpSccCount ccs
-  = addToMem REP_CostCentreStack_scc_count
+  = addToMem (typeWidth REP_CostCentreStack_scc_count)
 	 (cmmOffsetB ccs oFFSET_CostCentreStack_scc_count) 1
 
 -----------------------------------------------------------------------------
@@ -475,13 +474,13 @@ ldvEnter cl_ptr
   where
         -- don't forget to substract node's tag
     ldv_wd = ldvWord cl_ptr
-    new_ldv_wd = cmmOrWord (cmmAndWord (CmmLoad ldv_wd wordRep)
+    new_ldv_wd = cmmOrWord (cmmAndWord (CmmLoad ldv_wd bWord)
 				       (CmmLit (mkWordCLit lDV_CREATE_MASK)))
 		 (cmmOrWord loadEra (CmmLit (mkWordCLit lDV_STATE_USE)))
 
 loadEra :: CmmExpr 
-loadEra = CmmMachOp (MO_U_Conv cIntRep wordRep)
-	  [CmmLoad (mkLblExpr (mkRtsDataLabel (sLit "era"))) cIntRep]
+loadEra = CmmMachOp (MO_UU_Conv cIntWidth wordWidth)
+	  [CmmLoad (mkLblExpr (mkRtsDataLabel $ sLit("era"))) cInt]
 
 ldvWord :: CmmExpr -> CmmExpr
 -- Takes the address of a closure, and returns