X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcodeGen%2FCgHpc.hs;h=b2e3a9af39d56ab82f81d9600c339419a02df673;hp=7bd7c0373967210cca26a0205a630db05098c28d;hb=ad94d40948668032189ad22a0ad741ac1f645f50;hpb=55a5d8d90280a611bafb659bc80778d3927a6bff

diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs
index 7bd7c03..b2e3a9a 100644
--- a/compiler/codeGen/CgHpc.hs
+++ b/compiler/codeGen/CgHpc.hs
@@ -6,6 +6,13 @@
 --
 -----------------------------------------------------------------------------
 
+{-# 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/CodingStyle#Warnings
+-- for details
+
 module CgHpc (cgTickBox, initHpc, hpcTable) where
 
 import Cmm
@@ -17,10 +24,12 @@ import CgUtils
 import CgMonad
 import CgForeignCall
 import ForeignCall
+import ClosureInfo
 import FastString
 import HscTypes
 import Char
 import StaticFlags
+import PackageConfig 
 
 cgTickBox :: Module -> Int -> Code
 cgTickBox mod n = do
@@ -34,57 +43,36 @@ 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 (HpcInfo hpc_tickCount _) = do
                         emitData ReadOnlyData
                                         [ CmmDataLabel mkHpcModuleNameLabel
                                         , CmmString $ map (fromIntegral . ord)
-                                                         (module_name_str)
+                                                         (full_name_str)
                                                       ++ [0]
                                         ]
-                        emitData Data	-- change Offset => Data or Info
-                                        [ CmmDataLabel (mkHpcModuleOffsetLabel this_mod)
-					, CmmStaticLit (CmmInt 0 I32)	-- stored offset?
-                                        ]
                         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)
-hpcTable this_mod (NoHpcInfo) = error "TODO: impossible"
+    full_name_str   = if modulePackageId this_mod == mainPackageId 
+		      then module_name_str
+		      else packageIdString (modulePackageId this_mod) ++ "/" ++
+			   module_name_str
+
+hpcTable this_mod (NoHpcInfo {}) = error "TODO: impossible"
 
 initHpc :: Module -> HpcInfo -> Code
 initHpc this_mod (HpcInfo tickCount hashNo)
-  = do { id <- newTemp wordRep
+  = do { id <- newNonPtrTemp wordRep -- TODO FIXME NOW
        ; emitForeignCall'
                PlayRisky
                [(id,NoHint)]
-               (CmmForeignCall
+               (CmmCallee
                  (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing False)
                   CCallConv
                )
@@ -94,8 +82,8 @@ initHpc this_mod (HpcInfo tickCount hashNo)
                , (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
+               CmmMayReturn
        }
   where
        mod_alloc = mkFastString "hs_hpc_module"