diff options
| author | hwloidl <unknown> | 2000-01-13 14:34:09 +0000 |
|---|---|---|
| committer | hwloidl <unknown> | 2000-01-13 14:34:09 +0000 |
| commit | 1b28d4e1f43185ad8c8e7407c66413e1b358402b (patch) | |
| tree | 9a69069b4adaf380e7bad6827e2e248b29f96024 /ghc/compiler/codeGen/CgStackery.lhs | |
| parent | d3d20ba70003e869af4d9f44d70d1d403d131812 (diff) | |
| download | haskell-1b28d4e1f43185ad8c8e7407c66413e1b358402b.tar.gz | |
[project @ 2000-01-13 14:33:57 by hwloidl]
Merged GUM-4-04 branch into the main trunk. In particular merged GUM and
SMP code. Most of the GranSim code in GUM-4-04 still has to be carried over.
Diffstat (limited to 'ghc/compiler/codeGen/CgStackery.lhs')
| -rw-r--r-- | ghc/compiler/codeGen/CgStackery.lhs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ghc/compiler/codeGen/CgStackery.lhs b/ghc/compiler/codeGen/CgStackery.lhs index d97476e345..33a873a5c7 100644 --- a/ghc/compiler/codeGen/CgStackery.lhs +++ b/ghc/compiler/codeGen/CgStackery.lhs @@ -1,7 +1,7 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % -% $Id: CgStackery.lhs,v 1.12 1999/06/24 13:04:20 simonmar Exp $ +% $Id: CgStackery.lhs,v 1.13 2000/01/13 14:33:58 hwloidl Exp $ % \section[CgStackery]{Stack management functions} @@ -25,9 +25,10 @@ import AbsCSyn import CgUsages ( getRealSp ) import AbsCUtils ( mkAbstractCs, mkAbsCStmts, getAmodeRep ) import PrimRep ( getPrimRepSize, PrimRep(..), isFollowableRep ) -import CmdLineOpts ( opt_SccProfilingOn ) +import CmdLineOpts ( opt_SccProfilingOn, opt_GranMacros ) import Panic ( panic ) -import Constants ( uF_SIZE, sCC_UF_SIZE, sEQ_FRAME_SIZE, sCC_SEQ_FRAME_SIZE ) +import Constants ( uF_SIZE, sCC_UF_SIZE, gRAN_UF_SIZE, + sEQ_FRAME_SIZE, sCC_SEQ_FRAME_SIZE, gRAN_SEQ_FRAME_SIZE ) import IOExts ( trace ) \end{code} @@ -224,11 +225,13 @@ getFinalStackHW fcode info_down (MkCgState absC binds usages) = state1 \end{code} \begin{code} -updateFrameSize | opt_SccProfilingOn = sCC_UF_SIZE - | otherwise = uF_SIZE +updateFrameSize | opt_SccProfilingOn = trace ("updateFrameSize = " ++ (show sCC_UF_SIZE)) sCC_UF_SIZE + | opt_GranMacros = trace ("updateFrameSize = " ++ (show gRAN_UF_SIZE))gRAN_UF_SIZE + | otherwise = trace ("updateFrameSize = " ++ (show uF_SIZE)) uF_SIZE seqFrameSize | opt_SccProfilingOn = sCC_SEQ_FRAME_SIZE - | otherwise = sEQ_FRAME_SIZE + | opt_GranMacros = gRAN_SEQ_FRAME_SIZE + | otherwise = sEQ_FRAME_SIZE \end{code} %************************************************************************ |