X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgTicky.hs;h=985ebb8626c6a40c3df3fd1a9d1589f3fc4aa710;hb=b88025eabcd83f65d1d81f09272f5172f06a60e7;hp=3e72981c50a1ce247720ebd862c0cf56ae661661;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgTicky.hs b/compiler/codeGen/CgTicky.hs
index 3e72981..985ebb8 100644
--- a/compiler/codeGen/CgTicky.hs
+++ b/compiler/codeGen/CgTicky.hs
@@ -2,7 +2,7 @@
 --
 -- Code generation for ticky-ticky profiling
 --
--- (c) The University of Glasgow 2004
+-- (c) The University of Glasgow 2004-2006
 --
 -----------------------------------------------------------------------------
 
@@ -40,32 +40,30 @@ module CgTicky (
 #include "../includes/DerivedConstants.h"
 	-- For REP_xxx constants, which are MachReps
 
-import ClosureInfo	( ClosureInfo, closureSize, slopSize, closureSMRep,
-			  closureUpdReqd, closureName, isStaticClosure )
+import ClosureInfo
 import CgUtils
 import CgMonad
-import SMRep		( ClosureType(..), smRepClosureType, CgRep )
+import SMRep
 
 import Cmm
 import MachOp
-import CmmUtils		( zeroCLit, mkIntCLit, mkLblExpr, cmmIndexExpr )
-import CLabel		( CLabel, mkRtsDataLabel, mkRednCountsLabel )
-
-import Name		( isInternalName )
-import Id		( Id, idType )
-import StaticFlags	( opt_DoTickyProfiling )
-import BasicTypes	( Arity )
-import FastString	( FastString, mkFastString, LitString )	
-import Constants	-- Lots of field offsets
+import CmmUtils
+import CLabel
+
+import Name
+import Id
+import StaticFlags
+import BasicTypes
+import FastString
+import Constants
 import Outputable
 
 -- Turgid imports for showTypeCategory
 import PrelNames
-import TcType		( Type, isDictTy, tcSplitTyConApp_maybe,
-			  tcSplitFunTy_maybe )
-import TyCon		( isPrimTyCon, isTupleTyCon, isEnumerationTyCon,
-			  maybeTyConSingleCon )
-import Maybe
+import TcType
+import TyCon
+
+import Data.Maybe
 
 -----------------------------------------------------------------------------
 --
@@ -83,7 +81,7 @@ staticTickyHdr
 emitTickyCounter :: ClosureInfo -> [Id] -> Int -> Code
 emitTickyCounter cl_info args on_stk
   = ifTicky $
-    do	{ mod_name <- moduleName
+    do	{ mod_name <- getModuleName
 	; fun_descr_lit <- mkStringCLit (fun_descr mod_name)
 	; arg_descr_lit <- mkStringCLit arg_descr
 	; emitDataLits ticky_ctr_label 	-- Must match layout of StgEntCounter