diff options
author | Simon Marlow <simonmar@microsoft.com> | 2006-10-11 12:05:17 +0000 |
---|---|---|
committer | Simon Marlow <simonmar@microsoft.com> | 2006-10-11 12:05:17 +0000 |
commit | 49c98d143c382a1341e1046f5ca00819a25691ba (patch) | |
tree | 72060af5f0c9af869be6f1dfb24737afdcbdace4 /compiler/codeGen/CgTicky.hs | |
parent | b00b5bc04ff36a551552470060064f0b7d84ca30 (diff) | |
download | haskell-49c98d143c382a1341e1046f5ca00819a25691ba.tar.gz |
Module header tidyup, phase 1
This patch is a start on removing import lists and generally tidying
up the top of each module. In addition to removing import lists:
- Change DATA.IOREF -> Data.IORef etc.
- Change List -> Data.List etc.
- Remove $Id$
- Update copyrights
- Re-order imports to put non-GHC imports last
- Remove some unused and duplicate imports
Diffstat (limited to 'compiler/codeGen/CgTicky.hs')
-rw-r--r-- | compiler/codeGen/CgTicky.hs | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/compiler/codeGen/CgTicky.hs b/compiler/codeGen/CgTicky.hs index 3e72981c50..985ebb8626 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 |