diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/Cmm.h | 2 | ||||
| -rw-r--r-- | includes/rts/storage/ClosureMacros.h | 2 | ||||
| -rw-r--r-- | includes/rts/storage/ClosureTypes.h | 64 | ||||
| -rw-r--r-- | includes/stg/MiscClosures.h | 2 |
4 files changed, 31 insertions, 39 deletions
diff --git a/includes/Cmm.h b/includes/Cmm.h index ff91146745..183e10394f 100644 --- a/includes/Cmm.h +++ b/includes/Cmm.h @@ -295,9 +295,7 @@ (TO_W_( %INFO_TYPE(%STD_INFO(info)) )) { \ case \ IND, \ - IND_OLDGEN, \ IND_PERM, \ - IND_OLDGEN_PERM, \ IND_STATIC: \ { \ P1 = StgInd_indirectee(P1); \ diff --git a/includes/rts/storage/ClosureMacros.h b/includes/rts/storage/ClosureMacros.h index 098c65db15..56e7dca204 100644 --- a/includes/rts/storage/ClosureMacros.h +++ b/includes/rts/storage/ClosureMacros.h @@ -327,8 +327,6 @@ closure_sizeW_ (StgClosure *p, StgInfoTable *info) return pap_sizeW((StgPAP *)p); case IND: case IND_PERM: - case IND_OLDGEN: - case IND_OLDGEN_PERM: return sizeofW(StgInd); case ARR_WORDS: return arr_words_sizeW((StgArrWords *)p); diff --git a/includes/rts/storage/ClosureTypes.h b/includes/rts/storage/ClosureTypes.h index 518d39bb11..8d09e69324 100644 --- a/includes/rts/storage/ClosureTypes.h +++ b/includes/rts/storage/ClosureTypes.h @@ -50,38 +50,36 @@ #define PAP 26 #define AP_STACK 27 #define IND 28 -#define IND_OLDGEN 29 -#define IND_PERM 30 -#define IND_OLDGEN_PERM 31 -#define IND_STATIC 32 -#define RET_BCO 33 -#define RET_SMALL 34 -#define RET_BIG 35 -#define RET_DYN 36 -#define RET_FUN 37 -#define UPDATE_FRAME 38 -#define CATCH_FRAME 39 -#define STOP_FRAME 40 -#define BLOCKING_QUEUE 41 -#define BLACKHOLE 42 -#define MVAR_CLEAN 43 -#define MVAR_DIRTY 44 -#define ARR_WORDS 45 -#define MUT_ARR_PTRS_CLEAN 46 -#define MUT_ARR_PTRS_DIRTY 47 -#define MUT_ARR_PTRS_FROZEN0 48 -#define MUT_ARR_PTRS_FROZEN 49 -#define MUT_VAR_CLEAN 50 -#define MUT_VAR_DIRTY 51 -#define WEAK 52 -#define PRIM 53 -#define MUT_PRIM 54 -#define TSO 55 -#define TREC_CHUNK 56 -#define ATOMICALLY_FRAME 57 -#define CATCH_RETRY_FRAME 58 -#define CATCH_STM_FRAME 59 -#define WHITEHOLE 60 -#define N_CLOSURE_TYPES 61 +#define IND_PERM 29 +#define IND_STATIC 30 +#define RET_BCO 31 +#define RET_SMALL 32 +#define RET_BIG 33 +#define RET_DYN 34 +#define RET_FUN 35 +#define UPDATE_FRAME 36 +#define CATCH_FRAME 37 +#define STOP_FRAME 38 +#define BLOCKING_QUEUE 39 +#define BLACKHOLE 40 +#define MVAR_CLEAN 41 +#define MVAR_DIRTY 42 +#define ARR_WORDS 43 +#define MUT_ARR_PTRS_CLEAN 44 +#define MUT_ARR_PTRS_DIRTY 45 +#define MUT_ARR_PTRS_FROZEN0 46 +#define MUT_ARR_PTRS_FROZEN 47 +#define MUT_VAR_CLEAN 48 +#define MUT_VAR_DIRTY 49 +#define WEAK 50 +#define PRIM 51 +#define MUT_PRIM 52 +#define TSO 53 +#define TREC_CHUNK 54 +#define ATOMICALLY_FRAME 55 +#define CATCH_RETRY_FRAME 56 +#define CATCH_STM_FRAME 57 +#define WHITEHOLE 58 +#define N_CLOSURE_TYPES 59 #endif /* RTS_STORAGE_CLOSURETYPES_H */ diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h index 0aa6f99675..9b2bb600da 100644 --- a/includes/stg/MiscClosures.h +++ b/includes/stg/MiscClosures.h @@ -83,8 +83,6 @@ RTS_ENTRY(stg_IND); RTS_ENTRY(stg_IND_direct); RTS_ENTRY(stg_IND_STATIC); RTS_ENTRY(stg_IND_PERM); -RTS_ENTRY(stg_IND_OLDGEN); -RTS_ENTRY(stg_IND_OLDGEN_PERM); RTS_ENTRY(stg_BLACKHOLE); RTS_ENTRY(stg_CAF_BLACKHOLE); RTS_ENTRY(__stg_EAGER_BLACKHOLE); |