X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgHpc.hs;h=ed58daaac0dbd40de33f910b10046184e7cc5813;hb=bf2f000a552e025ec156010d52aee282bdfcf7a4;hp=e457e4c944fe2aca679b690aac26231fc4a01e07;hpb=207802589da0d23c3f16195f453b24a1e46e322d;p=ghc-hetmet.git diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs index e457e4c..ed58daa 100644 --- a/compiler/codeGen/CgHpc.hs +++ b/compiler/codeGen/CgHpc.hs @@ -17,10 +17,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,15 +36,13 @@ cgTickBox mod n = do , CmmLit (CmmInt 1 I64) ]) ] - 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) @@ -52,6 +52,11 @@ hpcTable this_mod (HpcInfo hpc_tickCount _) = do ] where module_name_str = moduleNameString (Module.moduleName this_mod) + 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 @@ -70,6 +75,7 @@ initHpc this_mod (HpcInfo tickCount hashNo) , (CmmLit $ CmmLabel $ mkHpcTicksLabel $ this_mod,PtrHint) ] (Just []) + NoC_SRT -- No SRT b/c we PlayRisky } where mod_alloc = mkFastString "hs_hpc_module"