Fixed uninitialised FunBind fun_tick field

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

diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs
index 53d81c9..d5f3542 100644 (file)
--- a/compiler/codeGen/CgHpc.hs
+++ b/compiler/codeGen/CgHpc.hs
@@ -13,12 +13,14 @@ import CLabel
 import Module
 import MachOp
 import CmmUtils
+import CgUtils
 import CgMonad
 import CgForeignCall
 import ForeignCall
 import FastString
 import HscTypes
 import Char
+import StaticFlags
 
 cgTickBox :: Module -> Int -> Code
 cgTickBox mod n = do
@@ -29,10 +31,31 @@ cgTickBox mod n = do
        stmtsC [ CmmStore tick_box
                          (CmmMachOp (MO_Add I64)
                                                [ CmmLoad tick_box I64
-                                               , CmmLit (mkIntCLit 1)
+                                               , 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
@@ -42,6 +65,10 @@ hpcTable this_mod hpc_tickCount = do
                                                          (module_name_str)
                                                       ++ [0]
                                         ]
+                        emitData Data
+                                        [ CmmDataLabel (mkHpcModuleOffsetLabel this_mod)
+                                       , CmmStaticLit (CmmInt 0 I32)
+                                        ]
                         emitData Data $ [ CmmDataLabel (mkHpcTicksLabel this_mod)
                                         ] ++
                                         [ CmmStaticLit (CmmInt 0 I64)
@@ -53,9 +80,10 @@ hpcTable this_mod hpc_tickCount = do
 
 initHpc :: Module -> HpcInfo -> Code
 initHpc this_mod tickCount
-  = do { emitForeignCall'
+  = do { id <- newTemp wordRep
+       ; emitForeignCall'
                PlayRisky
-               []
+               [(id,NoHint)]
                (CmmForeignCall
                  (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing False)
                   CCallConv
@@ -65,6 +93,8 @@ initHpc this_mod tickCount
                , (CmmLit $ CmmLabel $ mkHpcTicksLabel $ this_mod,PtrHint)
                ]
                (Just [])
+       ; let ext_tick_box = CmmLit $ CmmLabel $ mkHpcModuleOffsetLabel $ this_mod
+       ; stmtsC [ CmmStore ext_tick_box (CmmReg id) ]
        }
   where
        mod_alloc = mkFastString "hs_hpc_module"