projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove accidental extra in previous patch
[ghc-hetmet.git]
/
ghc
/
includes
/
Cmm.h
diff --git
a/ghc/includes/Cmm.h
b/ghc/includes/Cmm.h
index
5a38059
..
783b0e4
100644
(file)
--- a/
ghc/includes/Cmm.h
+++ b/
ghc/includes/Cmm.h
@@
-232,9
+232,11
@@
#define ENTER() \
again: \
#define ENTER() \
again: \
+ W_ info; \
+ info = %INFO_PTR(R1); \
switch [INVALID_OBJECT .. N_CLOSURE_TYPES] \
switch [INVALID_OBJECT .. N_CLOSURE_TYPES] \
- (TO_W_( %INFO_TYPE(%GET_STD_INFO(R1)) )) { \
- case \
+ (TO_W_( %INFO_TYPE(%STD_INFO(info)) )) { \
+ case \
IND, \
IND_OLDGEN, \
IND_PERM, \
IND, \
IND_OLDGEN, \
IND_PERM, \
@@
-244,7
+246,7
@@
R1 = StgInd_indirectee(R1); \
goto again; \
} \
R1 = StgInd_indirectee(R1); \
goto again; \
} \
- case \
+ case \
BCO, \
FUN, \
FUN_1_0, \
BCO, \
FUN, \
FUN_1_0, \
@@
-259,7
+261,7
@@
} \
default: \
{ \
} \
default: \
{ \
- jump %GET_ENTRY(R1); \
+ jump %ENTRY_CODE(info); \
} \
}
} \
}
@@
-340,11
+342,7
@@
* the value from GHC, but it seems like too much trouble to do that
* for StgThunkHeader.
*/
* the value from GHC, but it seems like too much trouble to do that
* for StgThunkHeader.
*/
-#ifdef SMP
#define SIZEOF_StgThunkHeader SIZEOF_StgHeader+SIZEOF_StgSMPThunkHeader
#define SIZEOF_StgThunkHeader SIZEOF_StgHeader+SIZEOF_StgSMPThunkHeader
-#else
-#define SIZEOF_StgThunkHeader SIZEOF_StgHeader
-#endif
#define StgThunk_payload(__ptr__,__ix__) \
W_[__ptr__+SIZEOF_StgThunkHeader+ WDS(__ix__)]
#define StgThunk_payload(__ptr__,__ix__) \
W_[__ptr__+SIZEOF_StgThunkHeader+ WDS(__ix__)]