projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use UserInterrupt rather than our own Interrupted exception (#4100)
[ghc-hetmet.git]
/
includes
/
Cmm.h
diff --git
a/includes/Cmm.h
b/includes/Cmm.h
index
69b5acc
..
52b5bec
100644
(file)
--- a/
includes/Cmm.h
+++ b/
includes/Cmm.h
@@
-169,7
+169,7
@@
#if SIZEOF_W == 4
#define W_SHIFT 2
#elif SIZEOF_W == 8
#if SIZEOF_W == 4
#define W_SHIFT 2
#elif SIZEOF_W == 8
-#define W_SHIFT 4
+#define W_SHIFT 3
#endif
/* Converting quantities of words to bytes */
#endif
/* Converting quantities of words to bytes */
@@
-295,9
+295,7
@@
(TO_W_( %INFO_TYPE(%STD_INFO(info)) )) { \
case \
IND, \
(TO_W_( %INFO_TYPE(%STD_INFO(info)) )) { \
case \
IND, \
- IND_OLDGEN, \
IND_PERM, \
IND_PERM, \
- IND_OLDGEN_PERM, \
IND_STATIC: \
{ \
P1 = StgInd_indirectee(P1); \
IND_STATIC: \
{ \
P1 = StgInd_indirectee(P1); \
@@
-463,6
+461,9
@@
#define StgFunInfoExtra_bitmap(i) StgFunInfoExtraFwd_bitmap(i)
#endif
#define StgFunInfoExtra_bitmap(i) StgFunInfoExtraFwd_bitmap(i)
#endif
+#define mutArrPtrsCardWords(n) \
+ ROUNDUP_BYTES_TO_WDS(((n) + (1 << MUT_ARR_PTRS_CARD_BITS) - 1) >> MUT_ARR_PTRS_CARD_BITS)
+
/* -----------------------------------------------------------------------------
Voluntary Yields/Blocks
/* -----------------------------------------------------------------------------
Voluntary Yields/Blocks