X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgHpc.hs;h=9ae576944b31948bc57b29d748a7526a2805ebc5;hb=0aa5f6851c493805be58da3798f6ad55b6538cf2;hp=caf68cd154e43c54dfa7217611f9140f284d6a5e;hpb=affbe8dae5d7eb350686b42ddbd4f3561b7bd0ec;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs
index caf68cd..9ae5769 100644
--- a/compiler/codeGen/CgHpc.hs
+++ b/compiler/codeGen/CgHpc.hs
@@ -11,7 +11,6 @@ module CgHpc (cgTickBox, initHpc, hpcTable) where
 import Cmm
 import CLabel
 import Module
-import MachOp
 import CmmUtils
 import CgUtils
 import CgMonad
@@ -20,59 +19,67 @@ import ForeignCall
 import ClosureInfo
 import FastString
 import HscTypes
+import Panic
 import Char
-import StaticFlags
+
+import Data.Word
 
 cgTickBox :: Module -> Int -> Code
 cgTickBox mod n = do
-       let tick_box = (cmmIndex I64
+       let tick_box = (cmmIndex W64
                        (CmmLit $ CmmLabel $ mkHpcTicksLabel $ mod)
                        (fromIntegral n)
                       )
        stmtsC [ CmmStore tick_box
-                         (CmmMachOp (MO_Add I64)
-                                               [ CmmLoad tick_box I64
-                                               , CmmLit (CmmInt 1 I64)
+                         (CmmMachOp (MO_Add W64)
+                                               [ CmmLoad tick_box b64
+                                               , CmmLit (CmmInt 1 W64)
                                                ])
               ] 
-   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 $ [ CmmDataLabel (mkHpcTicksLabel this_mod)
                                         ] ++
-                                        [ CmmStaticLit (CmmInt 0 I64)
-                                        | _ <- take hpc_tickCount [0..]
+                                        [ CmmStaticLit (CmmInt 0 W64)
+                                        | _ <- 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 _ (NoHpcInfo {}) = error "TODO: impossible"
 
 initHpc :: Module -> HpcInfo -> Code
 initHpc this_mod (HpcInfo tickCount hashNo)
-  = do { id <- newNonPtrTemp wordRep -- TODO FIXME NOW
+  = do { id <- newTemp bWord
        ; emitForeignCall'
                PlayRisky
-               [(id,NoHint)]
-               (CmmForeignCall
+               [CmmHinted 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)
+               [ CmmHinted (mkLblExpr mkHpcModuleNameLabel) AddrHint
+               , CmmHinted (word32 tickCount) NoHint
+               , CmmHinted (word32 hashNo)    NoHint
+               , CmmHinted (CmmLit $ CmmLabel $ mkHpcTicksLabel $ this_mod) AddrHint
                ]
                (Just [])
-               C_SRT -- No SRT b/c we PlayRisky
+               NoC_SRT -- No SRT b/c we PlayRisky
+               CmmMayReturn
        }
   where
+       word32 i = CmmLit (CmmInt (fromIntegral (fromIntegral i :: Word32)) W32)
        mod_alloc = mkFastString "hs_hpc_module"
+initHpc _ (NoHpcInfo {}) = panic "initHpc: NoHpcInfo"