X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FConstants.lhs;h=f52c4838714e4826693628ae98ef8c10c75638b7;hb=f4eba96b198baf4499ca6ccd7242d9daa41337ac;hp=eca728d3c3fa24dfb548c56bbc5ef7fc58da404e;hpb=449deb80dde91031b86b9cb4fb183696e0139bae;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/Constants.lhs b/ghc/compiler/main/Constants.lhs
index eca728d..f52c483 100644
--- a/ghc/compiler/main/Constants.lhs
+++ b/ghc/compiler/main/Constants.lhs
@@ -5,16 +5,6 @@
 
 \begin{code}
 module Constants (
-	uNFOLDING_USE_THRESHOLD,
-	uNFOLDING_CREATION_THRESHOLD,
-	iNTERFACE_UNFOLD_THRESHOLD,
-	lIBERATE_CASE_THRESHOLD,
-	uNFOLDING_CHEAP_OP_COST,
-	uNFOLDING_DEAR_OP_COST,
-	uNFOLDING_NOREP_LIT_COST,
-	uNFOLDING_CON_DISCOUNT_WEIGHT,
-	uNFOLDING_KEENESS_FACTOR,
-
 	mAX_CONTEXT_REDUCTION_DEPTH,
 	mAX_TUPLE_SIZE,
 
@@ -24,8 +14,6 @@ module Constants (
 	mAX_SPEC_SELECTEE_SIZE,
 	mAX_SPEC_AP_SIZE,
 
-	tARGET_MIN_INT, tARGET_MAX_INT,
-
 	mIN_UPD_SIZE,
 	mIN_SIZE_NonUpdHeapObject,
 
@@ -33,7 +21,10 @@ module Constants (
 	pROF_HDR_SIZE,
 	gRAN_HDR_SIZE,
 	tICKY_HDR_SIZE,
-	aRR_HDR_SIZE,
+	aRR_WORDS_HDR_SIZE,
+	aRR_PTRS_HDR_SIZE,
+        rESERVED_C_STACK_BYTES,
+        rESERVED_STACK_WORDS,
 
 	sTD_ITBL_SIZE,
 	pROF_ITBL_SIZE,
@@ -44,12 +35,15 @@ module Constants (
 
 	uF_SIZE,
 	sCC_UF_SIZE,
+	gRAN_UF_SIZE,  -- HWL
 	uF_RET,
 	uF_SU,
 	uF_UPDATEE,
 	uF_CCS,
 
 	sEQ_FRAME_SIZE,
+	sCC_SEQ_FRAME_SIZE,
+	gRAN_SEQ_FRAME_SIZE, -- HWL
 
 	mAX_Vanilla_REG,
 	mAX_Float_REG,
@@ -64,6 +58,7 @@ module Constants (
 	oTHER_TAG,
 
 	mAX_INTLIKE, mIN_INTLIKE,
+	mAX_CHARLIKE, mIN_CHARLIKE,
 
 	spRelToInt,
 
@@ -71,7 +66,10 @@ module Constants (
 	iNT64_SIZE,
 	wORD64_SIZE,
 	
-	interfaceFileFormatVersion
+	wORD_SIZE,
+
+	bLOCK_SIZE,
+	bLOCK_SIZE_W
 
     ) where
 
@@ -95,21 +93,8 @@ mAX_TUPLE_SIZE = (37 :: Int)
 mAX_CONTEXT_REDUCTION_DEPTH = (20 :: Int)
 \end{code}
 
-\begin{code}
-uNFOLDING_USE_THRESHOLD	      = ( 8 :: Int)
-uNFOLDING_CREATION_THRESHOLD  = (30 :: Int)	-- Discounts can be big
-iNTERFACE_UNFOLD_THRESHOLD    = (30 :: Int)
-lIBERATE_CASE_THRESHOLD	      = (10 :: Int)
-
-uNFOLDING_CHEAP_OP_COST       = ( 1 :: Int)
-uNFOLDING_DEAR_OP_COST        = ( 4 :: Int)
-uNFOLDING_NOREP_LIT_COST      = ( 20 :: Int)	-- Strings can be pretty big
-uNFOLDING_CON_DISCOUNT_WEIGHT = ( 3 :: Int)
-uNFOLDING_KEENESS_FACTOR      = ( 2.0 :: Float)
-\end{code}
 
 \begin{code}
-
 -- specialised fun/thunk/constr closure types
 mAX_SPEC_THUNK_SIZE   = (MAX_SPEC_THUNK_SIZE :: Int)
 mAX_SPEC_FUN_SIZE     = (MAX_SPEC_FUN_SIZE :: Int)
@@ -124,22 +109,6 @@ mIN_UPD_SIZE			= (MIN_UPD_SIZE::Int)
 mIN_SIZE_NonUpdHeapObject	= (MIN_NONUPD_SIZE::Int)
 \end{code}
 
-If we're compiling with GHC (and we're not cross-compiling), then we
-know that minBound and maxBound :: Int are the right values for the
-target architecture.  Otherwise, we assume -2^31 and 2^31-1
-respectively (which will be wrong on a 64-bit machine).
-
-\begin{code}
-tARGET_MIN_INT, tARGET_MAX_INT :: Integer
-#if __GLASGOW_HASKELL__
-tARGET_MIN_INT = toInteger (minBound :: Int)
-tARGET_MAX_INT = toInteger (maxBound :: Int)
-#else
-tARGET_MIN_INT = -2147483648
-tARGET_MAX_INT =  2147483647
-#endif
-\end{code}
- 
 Constants for semi-tagging; the tags associated with the data
 constructors will start at 0 and go up.
 
@@ -151,6 +120,10 @@ oTHER_TAG = (INFO_OTHER_TAG :: Integer)	-- (-1) unevaluated, probably
 mIN_INTLIKE, mAX_INTLIKE :: Integer	-- Only used to compare with (MachInt Integer)
 mIN_INTLIKE = MIN_INTLIKE
 mAX_INTLIKE = MAX_INTLIKE
+
+mIN_CHARLIKE, mAX_CHARLIKE :: Int	-- Only used to compare with (MachChar Int)
+mIN_CHARLIKE = MIN_CHARLIKE
+mAX_CHARLIKE = MAX_CHARLIKE
 \end{code}
 
 A little function that abstracts the stack direction.  Note that most
@@ -179,6 +152,9 @@ uF_SIZE	= (NOSCC_UF_SIZE::Int)
 -- Same again, with profiling
 sCC_UF_SIZE = (SCC_UF_SIZE::Int)
 
+-- Same again, with gransim
+gRAN_UF_SIZE = (GRAN_UF_SIZE::Int)
+
 -- Offsets in an update frame.  They don't change with profiling!
 uF_RET         = (UF_RET::Int)
 uF_SU          = (UF_SU::Int)
@@ -186,8 +162,12 @@ uF_UPDATEE     = (UF_UPDATEE::Int)
 uF_CCS         = (UF_CCS::Int)
 \end{code}
 
+Seq frame sizes.
+
 \begin{code}
-sEQ_FRAME_SIZE = (SEQ_FRAME_SIZE::Int)
+sEQ_FRAME_SIZE = (NOSCC_SEQ_FRAME_SIZE::Int)
+sCC_SEQ_FRAME_SIZE = (SCC_SEQ_FRAME_SIZE::Int)
+gRAN_SEQ_FRAME_SIZE = (GRAN_SEQ_FRAME_SIZE::Int)
 \end{code}
 
 \begin{code}
@@ -209,11 +189,12 @@ mAX_Real_Long_REG       = (0::Int)
 Closure header sizes.
 
 \begin{code}
-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_HDR_SIZE   = (ARR_HDR_SIZE   :: Int)
+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}
 
 Info Table sizes.
@@ -233,10 +214,29 @@ wORD64_SIZE    = (WORD64_SIZE   :: Int)
 iNT64_SIZE     = (INT64_SIZE   :: Int)
 \end{code}
 
-The version of the interface file format we're
-using:
+This tells the native code generator the size of the spill
+area is has available.
+
+\begin{code}
+rESERVED_C_STACK_BYTES = (RESERVED_C_STACK_BYTES :: Int)
+\end{code}
+
+The amount of (Haskell) stack to leave free for saving registers when
+returning to the scheduler.
+
+\begin{code}
+rESERVED_STACK_WORDS = (RESERVED_STACK_WORDS :: Int)
+\end{code}
+
+Size of a word, in bytes
+
+\begin{code}
+wORD_SIZE = (WORD_SIZE :: Int)
+\end{code}
+
+Size of a storage manager block (in bytes).
 
 \begin{code}
-interfaceFileFormatVersion :: Int
-interfaceFileFormatVersion = HscIfaceFileVersion
+bLOCK_SIZE = (BLOCK_SIZE :: Int)
+bLOCK_SIZE_W = (bLOCK_SIZE `div` wORD_SIZE :: Int)
 \end{code}