X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FabsCSyn%2FCLabel.lhs;h=ae460878383b3ffd6860154bfd09f967ec12c084;hb=d11e681f219f6e38c2e5bc87adfb66f82de5ea65;hp=0b0825a569dad69611bcd1fe8563479eb847256e;hpb=96cf57e3ca14b3d9e6654a7780ea0b0ea4f5c0e8;p=ghc-hetmet.git

diff --git a/ghc/compiler/absCSyn/CLabel.lhs b/ghc/compiler/absCSyn/CLabel.lhs
index 0b0825a..ae46087 100644
--- a/ghc/compiler/absCSyn/CLabel.lhs
+++ b/ghc/compiler/absCSyn/CLabel.lhs
@@ -1,7 +1,7 @@
 %
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-% $Id: CLabel.lhs,v 1.43 2000/11/20 17:42:00 sewardj Exp $
+% $Id: CLabel.lhs,v 1.49 2001/12/05 17:35:12 sewardj Exp $
 %
 \section[CLabel]{@CLabel@: Information to make C Labels}
 
@@ -48,6 +48,7 @@ module CLabel (
 	mkCharlikeClosureLabel,
 	mkIntlikeClosureLabel,
 	mkMAP_FROZEN_infoLabel,
+        mkEMPTY_MVAR_infoLabel,
 
 	mkTopTickyCtrLabel,
 	mkBlackHoleInfoTableLabel,
@@ -69,9 +70,6 @@ module CLabel (
 	CLabelType(..), labelType, labelDynamic,
 
 	pprCLabel
-#if ! OMIT_NATIVE_CODEGEN
-	, pprCLabel_asm
-#endif
     ) where
 
 
@@ -89,7 +87,7 @@ import Module		( moduleName, moduleNameFS,
 import Name		( Name, getName, isDllName, isExternallyVisibleName )
 import TyCon		( TyCon )
 import Unique		( pprUnique, Unique )
-import PrimOp		( PrimOp, pprPrimOp )
+import PrimOp		( PrimOp )
 import CostCentre	( CostCentre, CostCentreStack )
 import Outputable
 \end{code}
@@ -253,6 +251,7 @@ mkMainRegTableLabel		= RtsLabel RtsMainRegTable
 mkCharlikeClosureLabel		= RtsLabel (Rts_Closure "stg_CHARLIKE_closure")
 mkIntlikeClosureLabel		= RtsLabel (Rts_Closure "stg_INTLIKE_closure")
 mkMAP_FROZEN_infoLabel		= RtsLabel (Rts_Info "stg_MUT_ARR_PTRS_FROZEN_info")
+mkEMPTY_MVAR_infoLabel		= RtsLabel (Rts_Info "stg_EMPTY_MVAR_info")
 
 mkTopTickyCtrLabel		= RtsLabel RtsTopTickyCtr
 mkBlackHoleInfoTableLabel	= RtsLabel (RtsBlackHoleInfoTbl SLIT("stg_BLACKHOLE_info"))
@@ -349,6 +348,7 @@ labelType (RtsLabel (RtsBlackHoleInfoTbl _))  = InfoTblType
 labelType (RtsLabel (RtsSelectorInfoTbl _ _)) = InfoTblType
 labelType (RtsLabel (RtsApInfoTbl _ _))       = InfoTblType
 labelType (RtsLabel RtsUpdInfo)       	      = InfoTblType
+labelType (RtsLabel (Rts_Info _))             = InfoTblType
 labelType (CaseLabel _ CaseReturnInfo)        = InfoTblType
 labelType (CaseLabel _ CaseReturnPt)	      = CodeType
 labelType (CaseLabel _ CaseVecTbl)            = VecTblType
@@ -429,11 +429,6 @@ internal names. <type> is one of the following:
 	 ccs			Cost centre stack
 
 \begin{code}
--- specialised for PprAsm: saves lots of arg passing in NCG
-#if ! OMIT_NATIVE_CODEGEN
-pprCLabel_asm = pprCLabel
-#endif
-
 pprCLabel :: CLabel -> SDoc
 
 #if ! OMIT_NATIVE_CODEGEN
@@ -508,7 +503,7 @@ pprCLbl (RtsLabel (RtsApEntry upd_reqd arity))
 	]
 
 pprCLbl (RtsLabel (RtsPrimOp primop)) 
-  = pprPrimOp primop <> ptext SLIT("_fast")
+  = ppr primop <> ptext SLIT("_fast")
 
 pprCLbl (RtsLabel RtsModuleRegd)
   = ptext SLIT("module_registered")
@@ -526,7 +521,7 @@ pprCLbl (CC_Label cc) 		= ppr cc
 pprCLbl (CCS_Label ccs) 	= ppr ccs
 
 pprCLbl (ModuleInitLabel mod)	
-   = ptext SLIT("__init_") <> ptext (moduleNameFS (moduleName mod))
+   = ptext SLIT("__stginit_") <> ptext (moduleNameFS (moduleName mod))
 
 ppIdFlavor :: IdLabelInfo -> SDoc