X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FStgCmmHpc.hs;h=a93af34961b5c3db9cefb548c82348f456898ab9;hb=163d12852002a67c5b661b4b3e7e3c5bb6faa5f3;hp=f53c5c68392d01ecf011817e7bed9f00d064aef8;hpb=7cc3fc34f519d250ab1e85e570e691b94d516b23;p=ghc-hetmet.git

diff --git a/compiler/codeGen/StgCmmHpc.hs b/compiler/codeGen/StgCmmHpc.hs
index f53c5c6..a93af34 100644
--- a/compiler/codeGen/StgCmmHpc.hs
+++ b/compiler/codeGen/StgCmmHpc.hs
@@ -12,15 +12,17 @@ import StgCmmUtils
 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 Char
+import Data.Char
 import StaticFlags
+import BasicTypes
 
 mkTickBox :: Module -> Int -> CmmAGraph
 mkTickBox mod n 
@@ -31,7 +33,7 @@ mkTickBox mod n
   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
@@ -54,7 +56,7 @@ initHpc this_mod (HpcInfo tickCount hashNo)
     	; 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)