diff options
| author | andy@galois.com <unknown> | 2007-07-11 07:05:55 +0000 |
|---|---|---|
| committer | andy@galois.com <unknown> | 2007-07-11 07:05:55 +0000 |
| commit | 53ebe8abd4f307200f8f513e0ebb11f4d0cd14d9 (patch) | |
| tree | ca6f5477c3ab449bb97062718c24bac75882083a /compiler/codeGen | |
| parent | 6758ba711a3f9f3100a9dba1818b131c32e62106 (diff) | |
| download | haskell-53ebe8abd4f307200f8f513e0ebb11f4d0cd14d9.tar.gz | |
Adding support for package names into hpc outputed code
We store .mix files in
.hpc/<package>/<the.module.name>.mix
The package main the empty package (aka other naming passes),
so Main just is stored in
.hpc/Main.tix
This change in backwards compatable.
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/CgHpc.hs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs index 0aa011d11b..ed58daaac0 100644 --- a/compiler/codeGen/CgHpc.hs +++ b/compiler/codeGen/CgHpc.hs @@ -22,6 +22,7 @@ import FastString import HscTypes import Char import StaticFlags +import PackageConfig cgTickBox :: Module -> Int -> Code cgTickBox mod n = do @@ -35,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) @@ -53,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 |