X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmm.hs;h=74387504c51b1cff56e6311f6bc6aae05b37607f;hb=8bae799da7444d5debe0ce2e3f3f73692991a59d;hp=5ad8ee7dcfc92bb14e1fc49e19acaded792cb9bc;hpb=b4fd46494dc922a8e1134c9396cada1f10e74e55;p=ghc-hetmet.git

diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs
index 5ad8ee7..7438750 100644
--- a/compiler/cmm/Cmm.hs
+++ b/compiler/cmm/Cmm.hs
@@ -17,7 +17,7 @@ module Cmm (
 	CmmReg(..), cmmRegRep,
 	CmmLit(..), cmmLitRep,
 	LocalReg(..), localRegRep,
-	BlockId(..),
+	BlockId(..), BlockEnv,
 	GlobalReg(..), globalRegRep,
 
 	node, nodeReg, spReg, hpReg, spLimReg
@@ -29,6 +29,7 @@ import MachOp
 import CLabel
 import ForeignCall
 import Unique
+import UniqFM
 import FastString
 
 import Data.Word
@@ -57,7 +58,7 @@ data GenCmmTop d i
   = CmmProc
      [d]	       -- Info table, may be empty
      CLabel            -- Used to generate both info & entry labels
-     [LocalReg]        -- Argument locals live on entry (C-- procedure params)
+     CmmFormals        -- Argument locals live on entry (C-- procedure params)
      [GenBasicBlock i] -- Code, may be empty.  The first block is
                        -- the entry point.  The order is otherwise initially 
                        -- unimportant, but at some point the code gen will
@@ -131,10 +132,10 @@ data CmmStmt
 	-- Undefined outside range, and when there's a Nothing
 
   | CmmJump CmmExpr               -- Jump to another function,
-    CmmActuals                    -- with these parameters.
+      CmmActuals                  -- with these parameters.
 
   | CmmReturn                     -- Return from a function,
-    CmmActuals                    -- with these return values.
+      CmmActuals                  -- with these return values.
 
 type CmmActuals = [(CmmExpr,MachHint)]
 type CmmFormals = [(CmmReg,MachHint)]