projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-11-21 11:27:05 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
main
/
Constants.lhs
diff --git
a/ghc/compiler/main/Constants.lhs
b/ghc/compiler/main/Constants.lhs
index
0e6a179
..
1feffac
100644
(file)
--- 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,
sTD_HDR_SIZE,
pROF_HDR_SIZE,
gRAN_HDR_SIZE,
- tICKY_HDR_SIZE,
aRR_WORDS_HDR_SIZE,
aRR_PTRS_HDR_SIZE,
rESERVED_C_STACK_BYTES,
aRR_WORDS_HDR_SIZE,
aRR_PTRS_HDR_SIZE,
rESERVED_C_STACK_BYTES,
@@
-34,14
+33,14
@@
module Constants (
mAX_FAMILY_SIZE_FOR_VEC_RETURNS,
uF_SIZE,
mAX_FAMILY_SIZE_FOR_VEC_RETURNS,
uF_SIZE,
- sCC_UF_SIZE,
+ pROF_UF_SIZE,
gRAN_UF_SIZE, -- HWL
uF_RET,
uF_SU,
uF_UPDATEE,
sEQ_FRAME_SIZE,
gRAN_UF_SIZE, -- HWL
uF_RET,
uF_SU,
uF_UPDATEE,
sEQ_FRAME_SIZE,
- sCC_SEQ_FRAME_SIZE,
+ pROF_SEQ_FRAME_SIZE,
gRAN_SEQ_FRAME_SIZE, -- HWL
mAX_Vanilla_REG,
gRAN_SEQ_FRAME_SIZE, -- HWL
mAX_Vanilla_REG,
@@
-81,6
+80,8
@@
module Constants (
#include "../includes/config.h"
#include "../includes/MachRegs.h"
#include "../includes/Constants.h"
#include "../includes/config.h"
#include "../includes/MachRegs.h"
#include "../includes/Constants.h"
+#include "../includes/MachDeps.h"
+#include "../includes/DerivedConstants.h"
-- import Util
\end{code}
-- import Util
\end{code}
@@
-88,7
+89,8
@@
module Constants (
All pretty arbitrary:
\begin{code}
All pretty arbitrary:
\begin{code}
-mAX_TUPLE_SIZE = (37 :: Int)
+mAX_TUPLE_SIZE = (62 :: Int) -- Should really match the number
+ -- of decls in Data.Tuple
mAX_CONTEXT_REDUCTION_DEPTH = (20 :: Int)
\end{code}
mAX_CONTEXT_REDUCTION_DEPTH = (20 :: Int)
\end{code}
@@
-146,10
+148,10
@@
mAX_FAMILY_SIZE_FOR_VEC_RETURNS = (MAX_VECTORED_RTN::Int) -- pretty arbitrary
-- If you change this, you may need to change runtimes/standard/Update.lhc
-- The update frame sizes
-- If you change this, you may need to change runtimes/standard/Update.lhc
-- The update frame sizes
-uF_SIZE = (NOSCC_UF_SIZE::Int)
+uF_SIZE = (STD_UF_SIZE::Int)
-- Same again, with profiling
-- Same again, with profiling
-sCC_UF_SIZE = (SCC_UF_SIZE::Int)
+pROF_UF_SIZE = (PROF_UF_SIZE::Int)
-- Same again, with gransim
gRAN_UF_SIZE = (GRAN_UF_SIZE::Int)
-- Same again, with gransim
gRAN_UF_SIZE = (GRAN_UF_SIZE::Int)
@@
-163,8
+165,8
@@
uF_UPDATEE = (UF_UPDATEE::Int)
Seq frame sizes.
\begin{code}
Seq frame sizes.
\begin{code}
-sEQ_FRAME_SIZE = (NOSCC_SEQ_FRAME_SIZE::Int)
-sCC_SEQ_FRAME_SIZE = (SCC_SEQ_FRAME_SIZE::Int)
+sEQ_FRAME_SIZE = (STD_SEQ_FRAME_SIZE::Int)
+pROF_SEQ_FRAME_SIZE = (PROF_SEQ_FRAME_SIZE::Int)
gRAN_SEQ_FRAME_SIZE = (GRAN_SEQ_FRAME_SIZE::Int)
\end{code}
gRAN_SEQ_FRAME_SIZE = (GRAN_SEQ_FRAME_SIZE::Int)
\end{code}
@@
-190,7
+192,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)
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}
aRR_WORDS_HDR_SIZE = (ARR_WORDS_HDR_SIZE :: Int)
aRR_PTRS_HDR_SIZE = (ARR_PTRS_HDR_SIZE :: Int)
\end{code}
@@
-207,9
+208,9
@@
tICKY_ITBL_SIZE = (TICKY_ITBL_SIZE :: Int)
Size of a double in StgWords.
\begin{code}
Size of a double in StgWords.
\begin{code}
-dOUBLE_SIZE = (DOUBLE_SIZE :: Int)
-wORD64_SIZE = (WORD64_SIZE :: Int)
-iNT64_SIZE = (INT64_SIZE :: Int)
+dOUBLE_SIZE = (SIZEOF_DOUBLE `quot` SIZEOF_HSWORD :: Int)
+wORD64_SIZE = (8 `quot` SIZEOF_HSWORD :: Int)
+iNT64_SIZE = wORD64_SIZE
\end{code}
This tells the native code generator the size of the spill
\end{code}
This tells the native code generator the size of the spill
@@
-229,7
+230,7
@@
rESERVED_STACK_WORDS = (RESERVED_STACK_WORDS :: Int)
Size of a word, in bytes
\begin{code}
Size of a word, in bytes
\begin{code}
-wORD_SIZE = (WORD_SIZE :: Int)
+wORD_SIZE = (SIZEOF_HSWORD :: Int)
\end{code}
Size of a storage manager block (in bytes).
\end{code}
Size of a storage manager block (in bytes).