X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgHpc.hs;h=0d0fdb1183f2e06d0024b2a451238c3a0e016e90;hb=9f592bb0ae0dc76bd3ec7729474057d2069bb4db;hp=6da243b804cf71b3173f66a933dcfe698d68b49e;hpb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs
index 6da243b..0d0fdb1 100644
--- a/compiler/codeGen/CgHpc.hs
+++ b/compiler/codeGen/CgHpc.hs
@@ -1,3 +1,10 @@
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 -----------------------------------------------------------------------------
 --
 -- Code generation for coverage
@@ -24,6 +31,8 @@ import Char
 import StaticFlags
 import PackageConfig 
 
+import Data.Word
+
 cgTickBox :: Module -> Int -> Code
 cgTickBox mod n = do
        let tick_box = (cmmIndex I64
@@ -48,7 +57,7 @@ hpcTable this_mod (HpcInfo hpc_tickCount _) = do
                         emitData Data $ [ CmmDataLabel (mkHpcTicksLabel this_mod)
                                         ] ++
                                         [ CmmStaticLit (CmmInt 0 I64)
-                                        | _ <- take hpc_tickCount [0..]
+                                        | _ <- take hpc_tickCount [0::Int ..]
                                         ]
   where
     module_name_str = moduleNameString (Module.moduleName this_mod)
@@ -64,19 +73,21 @@ initHpc this_mod (HpcInfo tickCount hashNo)
   = do { id <- newNonPtrTemp wordRep -- TODO FIXME NOW
        ; emitForeignCall'
                PlayRisky
-               [(id,NoHint)]
-               (CmmForeignCall
+               [CmmKinded id NoHint]
+               (CmmCallee
                  (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing False)
                   CCallConv
                )
-               [ (mkLblExpr mkHpcModuleNameLabel,PtrHint)
-               , (CmmLit $ mkIntCLit tickCount,NoHint)
-               , (CmmLit $ mkIntCLit hashNo,NoHint)
-               , (CmmLit $ CmmLabel $ mkHpcTicksLabel $ this_mod,PtrHint)
+               [ CmmKinded (mkLblExpr mkHpcModuleNameLabel) PtrHint
+               , CmmKinded (word32 tickCount) NoHint
+               , CmmKinded (word32 hashNo)    NoHint
+               , CmmKinded (CmmLit $ CmmLabel $ mkHpcTicksLabel $ this_mod) PtrHint
                ]
                (Just [])
                NoC_SRT -- No SRT b/c we PlayRisky
+               CmmMayReturn
        }
   where
+       word32 i = CmmLit (CmmInt (fromIntegral (fromIntegral i :: Word32)) I32)
        mod_alloc = mkFastString "hs_hpc_module"