projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-09-04 18:29:20 by ken]
[ghc-hetmet.git]
/
ghc
/
compiler
/
absCSyn
/
CLabel.lhs
diff --git
a/ghc/compiler/absCSyn/CLabel.lhs
b/ghc/compiler/absCSyn/CLabel.lhs
index
ab21f74
..
c8712f5
100644
(file)
--- 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
%
%
% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
%
-% $Id: CLabel.lhs,v 1.42 2000/11/13 14:40:38 simonmar Exp $
+% $Id: CLabel.lhs,v 1.47 2001/09/04 18:29:20 ken Exp $
%
\section[CLabel]{@CLabel@: Information to make C Labels}
%
\section[CLabel]{@CLabel@: Information to make C Labels}
@@
-48,6
+48,7
@@
module CLabel (
mkCharlikeClosureLabel,
mkIntlikeClosureLabel,
mkMAP_FROZEN_infoLabel,
mkCharlikeClosureLabel,
mkIntlikeClosureLabel,
mkMAP_FROZEN_infoLabel,
+ mkEMPTY_MVAR_infoLabel,
mkTopTickyCtrLabel,
mkBlackHoleInfoTableLabel,
mkTopTickyCtrLabel,
mkBlackHoleInfoTableLabel,
@@
-85,11
+86,11
@@
import CmdLineOpts ( opt_Static, opt_DoTickyProfiling )
import CStrings ( pp_cSEP )
import DataCon ( ConTag )
import Module ( moduleName, moduleNameFS,
import CStrings ( pp_cSEP )
import DataCon ( ConTag )
import Module ( moduleName, moduleNameFS,
- Module, isModuleInThisPackage )
+ Module, isHomeModule )
import Name ( Name, getName, isDllName, isExternallyVisibleName )
import TyCon ( TyCon )
import Unique ( pprUnique, Unique )
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}
import CostCentre ( CostCentre, CostCentreStack )
import Outputable
\end{code}
@@
-253,6
+254,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")
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"))
mkTopTickyCtrLabel = RtsLabel RtsTopTickyCtr
mkBlackHoleInfoTableLabel = RtsLabel (RtsBlackHoleInfoTbl SLIT("stg_BLACKHOLE_info"))
@@
-387,7
+389,7
@@
labelDynamic lbl =
DataConLabel n k -> isDllName n
TyConLabel tc -> isDllName (getName tc)
ForeignLabel _ d -> d
DataConLabel n k -> isDllName n
TyConLabel tc -> isDllName (getName tc)
ForeignLabel _ d -> d
- ModuleInitLabel m -> (not opt_Static) && (not (isModuleInThisPackage m))
+ ModuleInitLabel m -> (not opt_Static) && (not (isHomeModule m))
_ -> False
\end{code}
_ -> False
\end{code}
@@
-508,7
+510,7
@@
pprCLbl (RtsLabel (RtsApEntry upd_reqd arity))
]
pprCLbl (RtsLabel (RtsPrimOp primop))
]
pprCLbl (RtsLabel (RtsPrimOp primop))
- = pprPrimOp primop <> ptext SLIT("_fast")
+ = ppr primop <> ptext SLIT("_fast")
pprCLbl (RtsLabel RtsModuleRegd)
= ptext SLIT("module_registered")
pprCLbl (RtsLabel RtsModuleRegd)
= ptext SLIT("module_registered")
@@
-526,7
+528,7
@@
pprCLbl (CC_Label cc) = ppr cc
pprCLbl (CCS_Label ccs) = ppr ccs
pprCLbl (ModuleInitLabel mod)
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
ppIdFlavor :: IdLabelInfo -> SDoc