Merge in new code generator branch.

[ghc-hetmet.git] / compiler / codeGen / StgCmmHpc.hs

diff --git a/compiler/codeGen/StgCmmHpc.hs b/compiler/codeGen/StgCmmHpc.hs
index afc238a..a93af34 100644 (file)
--- 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 IsFunction)
+               (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing ForeignLabelInThisPackage IsFunction)
                [ (mkLblExpr mkHpcModuleNameLabel,AddrHint)
                , (CmmLit $ mkIntCLit tickCount,NoHint)
                , (CmmLit $ mkIntCLit hashNo,NoHint)