From: sof <unknown>
Date: Wed, 30 Jan 2002 01:06:15 +0000 (+0000)
Subject: [project @ 2002-01-30 01:06:14 by sof]
X-Git-Tag: Approximately_9120_patches~226
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=17861c1bff145a4c17c2f80e18110fcd6658a54f;p=ghc-hetmet.git

[project @ 2002-01-30 01:06:14 by sof]
cope with the fact that StgTickyHeader is no more
---

diff --git a/ghc/compiler/codeGen/SMRep.lhs b/ghc/compiler/codeGen/SMRep.lhs
index e2698c0..d3ea1d9 100644
--- a/ghc/compiler/codeGen/SMRep.lhs
+++ b/ghc/compiler/codeGen/SMRep.lhs
@@ -50,10 +50,10 @@ module SMRep (
 
 import CmdLineOpts
 import Constants	( sTD_HDR_SIZE, pROF_HDR_SIZE,
-			  gRAN_HDR_SIZE, tICKY_HDR_SIZE, 
+			  gRAN_HDR_SIZE, tICKY_ITBL_SIZE, 
                           aRR_WORDS_HDR_SIZE, aRR_PTRS_HDR_SIZE,
 			  sTD_ITBL_SIZE, pROF_ITBL_SIZE,
-			  gRAN_ITBL_SIZE, tICKY_ITBL_SIZE )
+			  gRAN_ITBL_SIZE )
 import Outputable
 \end{code}
 
@@ -94,7 +94,7 @@ Size of a closure header.
 
 \begin{code}
 fixedHdrSize :: Int{-words-}
-fixedHdrSize = sTD_HDR_SIZE + profHdrSize + granHdrSize + tickyHdrSize
+fixedHdrSize = sTD_HDR_SIZE + profHdrSize + granHdrSize
 
 profHdrSize  :: Int{-words-}
 profHdrSize  | opt_SccProfilingOn   = pROF_HDR_SIZE
@@ -104,10 +104,6 @@ granHdrSize  :: Int{-words-}
 granHdrSize  | opt_GranMacros	    = gRAN_HDR_SIZE
 	     | otherwise	    = 0
 
-tickyHdrSize :: Int{-words-}
-tickyHdrSize | opt_DoTickyProfiling = tICKY_HDR_SIZE
-	     | otherwise	    = 0
-
 arrWordsHdrSize   :: Int{-words-}
 arrWordsHdrSize   = fixedHdrSize + aRR_WORDS_HDR_SIZE
 
diff --git a/ghc/compiler/main/Constants.lhs b/ghc/compiler/main/Constants.lhs
index daa1c84..6ba8e00 100644
--- a/ghc/compiler/main/Constants.lhs
+++ b/ghc/compiler/main/Constants.lhs
@@ -20,7 +20,6 @@ module Constants (
 	sTD_HDR_SIZE,
 	pROF_HDR_SIZE,
 	gRAN_HDR_SIZE,
-	tICKY_HDR_SIZE,
 	aRR_WORDS_HDR_SIZE,
 	aRR_PTRS_HDR_SIZE,
         rESERVED_C_STACK_BYTES,
@@ -192,7 +191,6 @@ Closure header sizes.
 sTD_HDR_SIZE       = (STD_HDR_SIZE       :: Int)
 pROF_HDR_SIZE      = (PROF_HDR_SIZE      :: Int)
 gRAN_HDR_SIZE      = (GRAN_HDR_SIZE      :: Int)
-tICKY_HDR_SIZE     = (TICKY_HDR_SIZE     :: Int)
 aRR_WORDS_HDR_SIZE = (ARR_WORDS_HDR_SIZE :: Int)
 aRR_PTRS_HDR_SIZE  = (ARR_PTRS_HDR_SIZE  :: Int)
 \end{code}