X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcodeGen%2FCgHpc.hs;h=48756505c37fea6226021fea5496c24866a2bd7f;hp=9620973d1045f036c67d00fd45b3996981b562fd;hb=b2bd63f99d643f6b3eb30bb72bb9ae26d4183252;hpb=dd8c1ab22f0bf0eaa9028f1621ceac02aea96205

diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs
index 9620973..4875650 100644
--- a/compiler/codeGen/CgHpc.hs
+++ b/compiler/codeGen/CgHpc.hs
@@ -6,66 +6,34 @@
 --
 -----------------------------------------------------------------------------
 
-module CgHpc (cgTickBox, initHpc, hpcTable) where
+module CgHpc (cgTickBox, hpcTable) where
 
-import Cmm
+import OldCmm
 import CLabel
 import Module
-import MachOp
-import CmmUtils
+import OldCmmUtils
 import CgMonad
-import CgForeignCall
-import ForeignCall
-import FastString
 import HscTypes
-import Char
 
 cgTickBox :: Module -> Int -> Code
 cgTickBox mod n = do
-       let tick_box = (cmmIndex I64
+       let tick_box = (cmmIndex W64
                        (CmmLit $ CmmLabel $ mkHpcTicksLabel $ mod)
-                       (fromIntegral n)
+                       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)
                                                ])
-              ]
-
+              ] 
 
 hpcTable :: Module -> HpcInfo -> Code
-hpcTable this_mod hpc_tickCount = do
-                        emitData ReadOnlyData
-                                        [ CmmDataLabel mkHpcModuleNameLabel
-                                        , CmmString $ map (fromIntegral . ord)
-                                                         (module_name_str)
-                                                      ++ [0]
-                                        ]
+hpcTable this_mod (HpcInfo hpc_tickCount _) = do
                         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)
-
-
-initHpc :: Module -> HpcInfo -> Code
-initHpc this_mod tickCount
-  = do { emitForeignCall'
-               PlayRisky
-               []
-               (CmmForeignCall
-                 (CmmLit $ CmmLabel $ mkForeignLabel mod_alloc Nothing False)
-                  CCallConv
-               )
-               [ (mkLblExpr mkHpcModuleNameLabel,PtrHint)
-               , (CmmLit $ mkIntCLit tickCount,NoHint)
-               , (CmmLit $ CmmLabel $ mkHpcTicksLabel $ this_mod,PtrHint)
-               ]
-               (Just [])
-       }
-  where
-       mod_alloc = mkFastString "hs_hpc_module"
 
+hpcTable _ (NoHpcInfo {}) = error "TODO: impossible"