TickBox representation change

[ghc-hetmet.git] / compiler / basicTypes / IdInfo.lhs

diff --git a/compiler/basicTypes/IdInfo.lhs b/compiler/basicTypes/IdInfo.lhs
index d53bf56..9b39ccb 100644 (file)
--- a/compiler/basicTypes/IdInfo.lhs
+++ b/compiler/basicTypes/IdInfo.lhs
@@ -1,4 +1,5 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1993-1998
 %
 \section[IdInfo]{@IdInfos@: Non-essential information about @Ids@}
@@ -15,7 +16,7 @@ module IdInfo (
        seqIdInfo, megaSeqIdInfo,
 
        -- Zapping
-       zapLamInfo, zapDemandInfo,
+       zapLamInfo, zapDemandInfo, zapFragileInfo,
 
        -- Arity
        ArityInfo,
@@ -70,36 +71,35 @@ module IdInfo (
        CafInfo(..), cafInfo, ppCafInfo, setCafInfo, mayHaveCafRefs,
 
         -- Lambda-bound variable info
-        LBVarInfo(..), lbvarInfo, setLBVarInfo, noLBVarInfo, hasNoLBVarInfo
+        LBVarInfo(..), lbvarInfo, setLBVarInfo, noLBVarInfo, hasNoLBVarInfo,
+
+        -- Tick-box info
+        TickBoxOp(..), TickBoxId,
     ) where
 
 #include "HsVersions.h"
 
-
 import CoreSyn
-import Class           ( Class )
-import PrimOp          ( PrimOp )
-import Var              ( Id )
-import VarSet          ( VarSet, emptyVarSet, seqVarSet )
-import BasicTypes      ( OccInfo(..), isFragileOcc, isDeadOcc, seqOccInfo, isLoopBreaker,
-                         InsideLam, insideLam, notInsideLam, 
-                         OneBranch, oneBranch, notOneBranch,
-                         Arity,
-                         Activation(..)
-                       )
-import DataCon         ( DataCon )
-import TyCon           ( TyCon, FieldLabel )
-import ForeignCall     ( ForeignCall )
+import Class
+import PrimOp
+import Var
+import VarSet
+import BasicTypes
+import DataCon
+import TyCon
+import ForeignCall
 import NewDemand
 import Outputable      
-import Maybe           ( isJust )
+import Module
+
+import Data.Maybe
 
 #ifdef OLD_STRICTNESS
-import Name            ( Name )
-import Demand          hiding( Demand, seqDemand )
+import Name
+import Demand
 import qualified Demand
-import Util            ( listLengthCmp )
-import List            ( replicate )
+import Util
+import Data.List
 #endif
 
 -- infixl so you can say (id `set` a `set` b)
@@ -219,7 +219,7 @@ seqNewDemandInfo (Just dmd) = seqDemand dmd
 
 %************************************************************************
 %*                                                                     *
-\subsection{GlobalIdDetails
+\subsection{GlobalIdDetails}
 %*                                                                     *
 %************************************************************************
 
@@ -250,6 +250,8 @@ data GlobalIdDetails
   | PrimOpId PrimOp            -- The Id for a primitive operator
   | FCallId ForeignCall                -- The Id for a foreign call
 
+  | TickBoxOpId TickBoxOp      -- The Id for a tick box (both traditional and binary)
+
   | NotGlobalId                        -- Used as a convenient extra return value from globalIdDetails
     
 notGlobalId = NotGlobalId
@@ -262,6 +264,7 @@ instance Outputable GlobalIdDetails where
     ppr (ClassOpId _)     = ptext SLIT("[ClassOp]")
     ppr (PrimOpId _)      = ptext SLIT("[PrimOp]")
     ppr (FCallId _)       = ptext SLIT("[ForeignCall]")
+    ppr (TickBoxOpId _)   = ptext SLIT("[TickBoxOp]")
     ppr (RecordSelId {})  = ptext SLIT("[RecSel]")
 \end{code}
 
@@ -697,3 +700,28 @@ zapDemandInfo info@(IdInfo {newDemandInfo = dmd})
   | otherwise  = Nothing
 \end{code}
 
+\begin{code}
+zapFragileInfo :: IdInfo -> Maybe IdInfo
+zapFragileInfo info = Just (info `setSpecInfo` emptySpecInfo
+                                 `setUnfoldingInfo` NoUnfolding)
+\end{code}
+
+%************************************************************************
+%*                                                                     *
+\subsection{TickBoxOp}
+%*                                                                     *
+%************************************************************************
+
+\begin{code}
+type TickBoxId = Int
+
+data TickBoxOp 
+   = TickBox Module !TickBoxId  -- ^Tick box for Hpc-style coverage,
+                               -- type = State# Void#
+   | BinaryTickBox Module !TickBoxId !TickBoxId
+                         -- ^Binary tick box, with a tick for result = True, result = False,
+                         -- type = Bool -> Bool
+instance Outputable TickBoxOp where
+    ppr (TickBox mod n)         = ptext SLIT("tick") <+> ppr (mod,n)
+    ppr (BinaryTickBox mod t f) = ptext SLIT("btick") <+> ppr (mod,t,f)
+\end{code}