X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgHpc.hs;h=8da2715ac2f2e674b733903735dd5718d05914cf;hb=163d12852002a67c5b661b4b3e7e3c5bb6faa5f3;hp=9ae576944b31948bc57b29d748a7526a2805ebc5;hpb=bae0a5fde7f43b2d4558b56b1f63bf0cbf5563b7;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs
index 9ae5769..8da2715 100644
--- a/compiler/codeGen/CgHpc.hs
+++ b/compiler/codeGen/CgHpc.hs
@@ -8,10 +8,10 @@
 
 module CgHpc (cgTickBox, initHpc, hpcTable) where
 
-import Cmm
+import OldCmm
 import CLabel
 import Module
-import CmmUtils
+import OldCmmUtils
 import CgUtils
 import CgMonad
 import CgForeignCall
@@ -20,15 +20,16 @@ import ClosureInfo
 import FastString
 import HscTypes
 import Panic
-import Char
+import BasicTypes
 
+import Data.Char
 import Data.Word
 
 cgTickBox :: Module -> Int -> Code
 cgTickBox mod n = do
        let tick_box = (cmmIndex W64
                        (CmmLit $ CmmLabel $ mkHpcTicksLabel $ mod)
-                       (fromIntegral n)
+                       n
                       )
        stmtsC [ CmmStore tick_box
                          (CmmMachOp (MO_Add W64)
@@ -66,7 +67,7 @@ initHpc this_mod (HpcInfo tickCount hashNo)
                PlayRisky
                [CmmHinted id NoHint]
                (CmmCallee
-                 (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing False)
+                 (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing ForeignLabelInThisPackage IsFunction)
                   CCallConv
                )
                [ CmmHinted (mkLblExpr mkHpcModuleNameLabel) AddrHint