X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgHpc.hs;h=0aa011d11bfdc1062f2425d371fc18f1f530969c;hb=61c73ae30a45d558815cf21272d13f2fa260519f;hp=d5f354216cf90f1468b652010bfa8ad1aee4dd1a;hpb=55dd028c1dc41c603316dbe843fa13c1cac30720;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs
index d5f3542..0aa011d 100644
--- a/compiler/codeGen/CgHpc.hs
+++ b/compiler/codeGen/CgHpc.hs
@@ -17,6 +17,7 @@ import CgUtils
 import CgMonad
 import CgForeignCall
 import ForeignCall
+import ClosureInfo
 import FastString
 import HscTypes
 import Char
@@ -34,41 +35,17 @@ cgTickBox mod n = do
                                                , CmmLit (CmmInt 1 I64)
                                                ])
               ] 
-       let ext_tick_box = CmmLit $ CmmLabel $ mkHpcModuleOffsetLabel $ mod
-
-       whenC (opt_Hpc_Tracer) $ do
-           emitForeignCall'
-               PlayRisky	-- ??
-	       []
-               (CmmForeignCall
-                 (CmmLit $ CmmLabel $ mkForeignLabel visible_tick Nothing False)
-                  CCallConv
-               )
-               [ (CmmMachOp (MO_Add I32)
-                     [ CmmLoad ext_tick_box I32
-                     , CmmLit (CmmInt (fromIntegral n) I32)
-		     ]
-		  ,  NoHint)
-	       ,  ( CmmReg (CmmGlobal CurrentTSO)
-		  , PtrHint 
-		  )
-	       ]
-               (Just [])
    where
       visible_tick = mkFastString "hs_hpc_tick"
 
 hpcTable :: Module -> HpcInfo -> Code
-hpcTable this_mod hpc_tickCount = do
+hpcTable this_mod (HpcInfo hpc_tickCount _) = do
                         emitData ReadOnlyData
                                         [ CmmDataLabel mkHpcModuleNameLabel
                                         , CmmString $ map (fromIntegral . ord)
                                                          (module_name_str)
                                                       ++ [0]
                                         ]
-                        emitData Data
-                                        [ CmmDataLabel (mkHpcModuleOffsetLabel this_mod)
-					, CmmStaticLit (CmmInt 0 I32)
-                                        ]
                         emitData Data $ [ CmmDataLabel (mkHpcTicksLabel this_mod)
                                         ] ++
                                         [ CmmStaticLit (CmmInt 0 I64)
@@ -76,11 +53,11 @@ hpcTable this_mod hpc_tickCount = do
                                         ]
   where
     module_name_str = moduleNameString (Module.moduleName this_mod)
-
+hpcTable this_mod (NoHpcInfo) = error "TODO: impossible"
 
 initHpc :: Module -> HpcInfo -> Code
-initHpc this_mod tickCount
-  = do { id <- newTemp wordRep
+initHpc this_mod (HpcInfo tickCount hashNo)
+  = do { id <- newNonPtrTemp wordRep -- TODO FIXME NOW
        ; emitForeignCall'
                PlayRisky
                [(id,NoHint)]
@@ -90,11 +67,11 @@ initHpc this_mod tickCount
                )
                [ (mkLblExpr mkHpcModuleNameLabel,PtrHint)
                , (CmmLit $ mkIntCLit tickCount,NoHint)
+               , (CmmLit $ mkIntCLit hashNo,NoHint)
                , (CmmLit $ CmmLabel $ mkHpcTicksLabel $ this_mod,PtrHint)
                ]
                (Just [])
-       ; let ext_tick_box = CmmLit $ CmmLabel $ mkHpcModuleOffsetLabel $ this_mod
-       ; stmtsC [ CmmStore ext_tick_box (CmmReg id) ]
+               NoC_SRT -- No SRT b/c we PlayRisky
        }
   where
        mod_alloc = mkFastString "hs_hpc_module"