X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgCallConv.hs;h=b0fab89f820ddba213c3dc9ea4d0c84c49f71a43;hb=f96e9aa0444de0e673b3c4055c6e43299639bc5b;hp=895552b37fd5abd2dab7b41ba187b180b5163bfe;hpb=7f1bc015a4094a8282ad4090768d780fd4d6122d;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgCallConv.hs b/compiler/codeGen/CgCallConv.hs
index 895552b..b0fab89 100644
--- a/compiler/codeGen/CgCallConv.hs
+++ b/compiler/codeGen/CgCallConv.hs
@@ -25,8 +25,6 @@ module CgCallConv (
 	constructSlowCall, slowArgs, slowCallPattern,
 
 	-- Returns
-	CtrlReturnConvention(..),
-	ctrlReturnConvAlg,
 	dataReturnConvPrim,
 	getSequelAmode
     ) where
@@ -48,12 +46,12 @@ import CmmUtils
 import Maybes
 import Id
 import Name
-import TyCon
 import Bitmap
 import Util
 import StaticFlags
 import FastString
 import Outputable
+import Unique
 
 import Data.Bits
 
@@ -138,7 +136,7 @@ stdPattern other = Nothing
 mkLiveness :: Name -> Int -> Bitmap -> FCode Liveness
 mkLiveness name size bits
   | size > mAX_SMALL_BITMAP_SIZE		-- Bitmap does not fit in one word
-  = do	{ let lbl = mkBitmapLabel name
+  = do	{ let lbl = mkBitmapLabel (getUnique name)
 	; emitRODataLits lbl ( mkWordCLit (fromIntegral size)
 		             : map mkWordCLit bits)
 	; return (BigLiveness lbl) }
@@ -215,10 +213,6 @@ constructSlowCall amodes
     stg_ap_pat = mkRtsApFastLabel arg_pat
     (arg_pat, these, rest) = matchSlowPattern amodes
 
-enterRtsRetLabel arg_pat
-  | tablesNextToCode = mkRtsRetInfoLabel arg_pat
-  | otherwise        = mkRtsRetLabel arg_pat
-
 -- | 'slowArgs' takes a list of function arguments and prepares them for
 -- pushing on the stack for "extra" arguments to a function which requires
 -- fewer arguments than we currently have.
@@ -257,27 +251,6 @@ slowCallPattern _  = panic "CgStackery.slowCallPattern"
 --
 -------------------------------------------------------------------------
 
--- A @CtrlReturnConvention@ says how {\em control} is returned.
-
-data CtrlReturnConvention
-  = VectoredReturn	Int	-- size of the vector table (family size)
-  | UnvectoredReturn    Int 	-- family size
-
-ctrlReturnConvAlg :: TyCon -> CtrlReturnConvention
-ctrlReturnConvAlg tycon
-  = case (tyConFamilySize tycon) of
-      size -> -- we're supposed to know...
-      -- Disable vectored returns
---	if (size > (1::Int) && size <= mAX_FAMILY_SIZE_FOR_VEC_RETURNS) then
---	    VectoredReturn size
---	else
-	    UnvectoredReturn size	
-  -- NB: unvectored returns Include size 0 (no constructors), so that
-  --     the following perverse code compiles (it crashed GHC in 5.02)
-  -- 	    data T1
-  --	    data T2 = T2 !T1 Int
-  --     The only value of type T1 is bottom, which never returns anyway.
-
 dataReturnConvPrim :: CgRep -> CmmReg
 dataReturnConvPrim PtrArg    = CmmGlobal (VanillaReg 1)
 dataReturnConvPrim NonPtrArg = CmmGlobal (VanillaReg 1)
@@ -288,7 +261,7 @@ dataReturnConvPrim VoidArg   = panic "dataReturnConvPrim: void"
 
 
 -- getSequelAmode returns an amode which refers to an info table.  The info
--- table will always be of the RET(_VEC)?_(BIG|SMALL) kind.  We're careful
+-- table will always be of the RET_(BIG|SMALL) kind.  We're careful
 -- not to handle real code pointers, just in case we're compiling for 
 -- an unregisterised/untailcallish architecture, where info pointers and
 -- code pointers aren't the same.
@@ -305,9 +278,8 @@ getSequelAmode
 	    OnStack -> do { sp_rel <- getSpRelOffset virt_sp
 			  ; returnFC (CmmLoad sp_rel wordRep) }
 
-	    UpdateCode 	           -> returnFC (CmmLit (CmmLabel mkUpdInfoLabel))
-	    CaseAlts lbl _ _ True  -> returnFC (CmmLit (CmmLabel mkSeqInfoLabel))
-	    CaseAlts lbl _ _ False -> returnFC (CmmLit (CmmLabel lbl))
+	    UpdateCode 	      -> returnFC (CmmLit (CmmLabel mkUpdInfoLabel))
+	    CaseAlts lbl _ _  -> returnFC (CmmLit (CmmLabel lbl))
 	}
 
 -------------------------------------------------------------------------
@@ -319,7 +291,7 @@ getSequelAmode
 -- There are four kinds of things on the stack:
 --
 --	- pointer variables (bound in the environment)
--- 	- non-pointer variables (boudn in the environment)
+-- 	- non-pointer variables (bound in the environment)
 -- 	- free slots (recorded in the stack free list)
 -- 	- non-pointer data slots (recorded in the stack free list)
 --