projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge _stub.o files into the main .o file (Fixes #3687 and #706)
[ghc-hetmet.git]
/
compiler
/
codeGen
/
StgCmmHpc.hs
diff --git
a/compiler/codeGen/StgCmmHpc.hs
b/compiler/codeGen/StgCmmHpc.hs
index
f53c5c6
..
a93af34
100644
(file)
--- a/
compiler/codeGen/StgCmmHpc.hs
+++ b/
compiler/codeGen/StgCmmHpc.hs
@@
-12,15
+12,17
@@
import StgCmmUtils
import StgCmmMonad
import StgCmmForeign
import StgCmmMonad
import StgCmmForeign
-import MkZipCfgCmm
-import Cmm
+import MkGraph
+import CmmDecl
+import CmmExpr
import CLabel
import Module
import CmmUtils
import FastString
import HscTypes
import CLabel
import Module
import CmmUtils
import FastString
import HscTypes
-import Char
+import Data.Char
import StaticFlags
import StaticFlags
+import BasicTypes
mkTickBox :: Module -> Int -> CmmAGraph
mkTickBox mod n
mkTickBox :: Module -> Int -> CmmAGraph
mkTickBox mod n
@@
-31,7
+33,7
@@
mkTickBox mod n
where
tick_box = cmmIndex W64
(CmmLit $ CmmLabel $ mkHpcTicksLabel $ mod)
where
tick_box = cmmIndex W64
(CmmLit $ CmmLabel $ mkHpcTicksLabel $ mod)
- (fromIntegral n)
+ n
initHpc :: Module -> HpcInfo -> FCode CmmAGraph
-- Emit top-level tables for HPC and return code to initialise
initHpc :: Module -> HpcInfo -> FCode CmmAGraph
-- Emit top-level tables for HPC and return code to initialise
@@
-54,7
+56,7
@@
initHpc this_mod (HpcInfo tickCount hashNo)
; id <- newTemp bWord -- TODO FIXME NOW
; emitCCall
[(id,NoHint)]
; id <- newTemp bWord -- TODO FIXME NOW
; emitCCall
[(id,NoHint)]
- (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing False)
+ (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing ForeignLabelInThisPackage IsFunction)
[ (mkLblExpr mkHpcModuleNameLabel,AddrHint)
, (CmmLit $ mkIntCLit tickCount,NoHint)
, (CmmLit $ mkIntCLit hashNo,NoHint)
[ (mkLblExpr mkHpcModuleNameLabel,AddrHint)
, (CmmLit $ mkIntCLit tickCount,NoHint)
, (CmmLit $ mkIntCLit hashNo,NoHint)