X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgCon.lhs;h=a2c8578d1890a989f37ec4d0b87fbbe32a8daf4f;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hp=0d8d73102903c93609e402a45a5e9f93b5aeca43;hpb=4638b541041a0db83a2c0e9dca5151708b8034bc;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgCon.lhs b/compiler/codeGen/CgCon.lhs
index 0d8d731..a2c8578 100644
--- a/compiler/codeGen/CgCon.lhs
+++ b/compiler/codeGen/CgCon.lhs
@@ -1,4 +1,5 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP Project, Glasgow University, 1992-1998
 %
 \section[CgCon]{Code generation for constructors}
@@ -20,40 +21,30 @@ module CgCon (
 import CgMonad
 import StgSyn
 
-import CgBindery	( getArgAmodes, bindNewToNode,
-			  bindArgsToRegs, idInfoToAmode, stableIdInfo,
-			  heapIdInfo, CgIdInfo, bindArgsToStack
-			)
-import CgStackery	( mkVirtStkOffsets, freeStackSlots,
-			  getRealSp, getVirtSp, setRealAndVirtualSp )
-import CgUtils		( addIdReps, cmmLabelOffW, emitRODataLits, emitDataLits )
-import CgCallConv	( assignReturnRegs )
-import CgHeapery	( allocDynClosure, layOutDynConstr, 
-			  layOutStaticConstr, mkStaticClosureFields )
-import CgTailCall	( performReturn, emitKnownConReturnCode, returnUnboxedTuple )
-import CgProf		( mkCCostCentreStack, ldvEnter, curCCS )
+import CgBindery
+import CgStackery
+import CgUtils
+import CgCallConv
+import CgHeapery
+import CgTailCall
+import CgProf
 import CgTicky
-import CgInfoTbls	( emitClosureCodeAndInfoTable, dataConTagZ )
+import CgInfoTbls
 import CLabel
-import ClosureInfo	( mkConLFInfo, mkLFArgument )
-import CmmUtils		( mkLblExpr )
+import ClosureInfo
+import CmmUtils
 import Cmm
-import SMRep		( WordOff, CgRep, separateByPtrFollowness,
-			  fixedHdrSize, typeCgRep )
-import CostCentre	( currentOrSubsumedCCS, dontCareCCS, CostCentreStack,
-			  currentCCS )
-import Constants	( mIN_INTLIKE, mAX_INTLIKE, mIN_CHARLIKE, mAX_CHARLIKE )
-import TyCon		( TyCon, tyConDataCons, isEnumerationTyCon, tyConName )
-import DataCon		( DataCon, dataConRepArgTys, isNullaryRepDataCon,
-			  isUnboxedTupleCon, dataConWorkId, 
-			  dataConName, dataConRepArity
-			)
-import Id		( Id, idName, isDeadBinder )
-import Type		( Type )
-import PrelInfo		( maybeCharLikeCon, maybeIntLikeCon )
+import SMRep
+import CostCentre
+import Constants
+import TyCon
+import DataCon
+import Id
+import Type
+import PrelInfo
 import Outputable
-import Util		( lengthIs )
-import ListSetOps	( assocMaybe )
+import Util
+import ListSetOps
 \end{code}
 
 
@@ -70,10 +61,10 @@ cgTopRhsCon :: Id		-- Name of thing bound to this RHS
 	    -> FCode (Id, CgIdInfo)
 cgTopRhsCon id con args
   = do { 
-	; hmods <- getHomeModules
+	; this_pkg <- getThisPackage
 #if mingw32_TARGET_OS
         -- Windows DLLs have a problem with static cross-DLL refs.
-        ; ASSERT( not (isDllConApp hmods con args) ) return ()
+        ; ASSERT( not (isDllConApp this_pkg con args) ) return ()
 #endif
 	; ASSERT( args `lengthIs` dataConRepArity con ) return ()
 
@@ -83,9 +74,9 @@ cgTopRhsCon id con args
 	; let
 	    name          = idName id
 	    lf_info	  = mkConLFInfo con
-    	    closure_label = mkClosureLabel hmods name
+    	    closure_label = mkClosureLabel this_pkg name
 	    caffy         = any stgArgHasCafRefs args
-	    (closure_info, amodes_w_offsets) = layOutStaticConstr hmods con amodes
+	    (closure_info, amodes_w_offsets) = layOutStaticConstr this_pkg con amodes
 	    closure_rep = mkStaticClosureFields
 	    		     closure_info
 	    		     dontCareCCS		-- Because it's static data
@@ -142,9 +133,9 @@ at all.
 
 \begin{code}
 buildDynCon binder cc con []
-  = do hmods <- getHomeModules
+  = do this_pkg <- getThisPackage
        returnFC (stableIdInfo binder
-			   (mkLblExpr (mkClosureLabel hmods (dataConName con)))
+			   (mkLblExpr (mkClosureLabel this_pkg (dataConName con)))
     			   (mkConLFInfo con))
 \end{code}
 
@@ -198,9 +189,9 @@ Now the general case.
 \begin{code}
 buildDynCon binder ccs con args
   = do	{ 
-	; hmods <- getHomeModules
+	; this_pkg <- getThisPackage
 	; let
-	    (closure_info, amodes_w_offsets) = layOutDynConstr hmods con args
+	    (closure_info, amodes_w_offsets) = layOutDynConstr this_pkg con args
 
 	; hp_off <- allocDynClosure closure_info use_cc blame_cc amodes_w_offsets
  	; returnFC (heapIdInfo binder hp_off lf_info) }
@@ -230,10 +221,10 @@ found a $con$.
 \begin{code}
 bindConArgs :: DataCon -> [Id] -> Code
 bindConArgs con args
-  = do hmods <- getHomeModules
+  = do this_pkg <- getThisPackage
        let
 	  bind_arg (arg, offset) = bindNewToNode arg offset (mkLFArgument arg)
-	  (_, args_w_offsets)    = layOutDynConstr hmods con (addIdReps args)
+	  (_, args_w_offsets)    = layOutDynConstr this_pkg con (addIdReps args)
 	--
        ASSERT(not (isUnboxedTupleCon con)) return ()
        mapCs bind_arg args_w_offsets
@@ -304,7 +295,7 @@ cgReturnDataCon con amodes
   = ASSERT( amodes `lengthIs` dataConRepArity con )
     do	{ EndOfBlockInfo _ sequel <- getEndOfBlockInfo
 	; case sequel of
-	    CaseAlts _ (Just (alts, deflt_lbl)) bndr _ 
+	    CaseAlts _ (Just (alts, deflt_lbl)) bndr
 	      ->    -- Ho! We know the constructor so we can
 		    -- go straight to the right alternative
 		 case assocMaybe alts (dataConTagZ con) of {
@@ -326,7 +317,7 @@ cgReturnDataCon con amodes
     
 	    other_sequel	-- The usual case
 	      | isUnboxedTupleCon con -> returnUnboxedTuple amodes
-              | otherwise -> build_it_then (emitKnownConReturnCode con)
+              | otherwise -> build_it_then emitReturnInstr
 	}
   where
     jump_to lbl = stmtC (CmmJump (CmmLit lbl) [])
@@ -416,7 +407,7 @@ static closure, for a constructor.
 cgDataCon :: DataCon -> Code
 cgDataCon data_con
   = do	{     -- Don't need any dynamic closure code for zero-arity constructors
-	  hmods <- getHomeModules
+	  this_pkg <- getThisPackage
 
 	; let
 	    -- To allow the debuggers, interpreters, etc to cope with
@@ -424,10 +415,10 @@ cgDataCon data_con
 	    -- time), we take care that info-table contains the
 	    -- information we need.
 	    (static_cl_info, _) = 
-		layOutStaticConstr hmods data_con arg_reps
+		layOutStaticConstr this_pkg data_con arg_reps
 
 	    (dyn_cl_info, arg_things) = 
-		layOutDynConstr    hmods data_con arg_reps
+		layOutDynConstr    this_pkg data_con arg_reps
 
 	    emit_info cl_info ticky_code
 		= do { code_blks <- getCgStmts the_code
@@ -443,7 +434,7 @@ cgDataCon data_con
 	    body_code = do { 	
 			-- NB: We don't set CC when entering data (WDP 94/06)
 			     tickyReturnOldCon (length arg_things)
-			   ; performReturn (emitKnownConReturnCode data_con) }
+			   ; performReturn emitReturnInstr }
 				-- noStmts: Ptr to thing already in Node
 
 	; whenC (not (isNullaryRepDataCon data_con))
@@ -451,6 +442,4 @@ cgDataCon data_con
 
 		-- Dynamic-Closure first, to reduce forward references
 	; emit_info static_cl_info tickyEnterStaticCon }
-
-  where
 \end{code}