diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-03-14 12:56:00 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-03-14 12:56:58 +0000 |
| commit | e562e59a7662010202fafb2edbd34edcaa06e5d2 (patch) | |
| tree | fd8e3fdd21c1d0cdeaecf6d9f61cac9e64a15198 | |
| parent | 93299cce9a4f7bc65b8164f779a37ef7f9f7c4a0 (diff) | |
| download | haskell-e562e59a7662010202fafb2edbd34edcaa06e5d2.tar.gz | |
fix _BTM field of closureFlags[], and document what it means (#5923)
| -rw-r--r-- | includes/rts/storage/InfoTables.h | 2 | ||||
| -rw-r--r-- | rts/ClosureFlags.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/includes/rts/storage/InfoTables.h b/includes/rts/storage/InfoTables.h index e4397f2ee3..3fbeed2450 100644 --- a/includes/rts/storage/InfoTables.h +++ b/includes/rts/storage/InfoTables.h @@ -77,7 +77,7 @@ typedef struct { /* The type flags provide quick access to certain properties of a closure. */ #define _HNF (1<<0) /* head normal form? */ -#define _BTM (1<<1) /* bitmap-style layout? */ +#define _BTM (1<<1) /* uses info->layout.bitmap */ #define _NS (1<<2) /* non-sparkable */ #define _STA (1<<3) /* static? */ #define _THU (1<<4) /* thunk? */ diff --git a/rts/ClosureFlags.c b/rts/ClosureFlags.c index 41810f4025..0ab8b45669 100644 --- a/rts/ClosureFlags.c +++ b/rts/ClosureFlags.c @@ -37,14 +37,14 @@ StgWord16 closure_flags[] = { [FUN_1_1] = (_HNF| _NS| _SRT ), [FUN_0_2] = (_HNF| _NS| _SRT ), [FUN_STATIC] = (_HNF| _NS|_STA| _SRT ), - [THUNK] = ( _BTM| _THU| _SRT ), - [THUNK_1_0] = ( _BTM| _THU| _SRT ), - [THUNK_0_1] = ( _BTM| _THU| _SRT ), - [THUNK_2_0] = ( _BTM| _THU| _SRT ), - [THUNK_1_1] = ( _BTM| _THU| _SRT ), - [THUNK_0_2] = ( _BTM| _THU| _SRT ), - [THUNK_STATIC] = ( _BTM| _STA|_THU| _SRT ), - [THUNK_SELECTOR] = ( _BTM| _THU| _SRT ), + [THUNK] = ( _THU| _SRT ), + [THUNK_1_0] = ( _THU| _SRT ), + [THUNK_0_1] = ( _THU| _SRT ), + [THUNK_2_0] = ( _THU| _SRT ), + [THUNK_1_1] = ( _THU| _SRT ), + [THUNK_0_2] = ( _THU| _SRT ), + [THUNK_STATIC] = ( _STA|_THU| _SRT ), + [THUNK_SELECTOR] = ( _THU| _SRT ), [BCO] = (_HNF| _NS ), [AP] = ( _THU ), [PAP] = (_HNF| _NS ), @@ -52,7 +52,7 @@ StgWord16 closure_flags[] = { [IND] = ( _NS| _IND ), [IND_PERM] = ( _NS| _IND ), [IND_STATIC] = ( _NS|_STA| _IND ), - [RET_BCO] = ( _BTM ), + [RET_BCO] = ( 0 ), [RET_SMALL] = ( _BTM| _SRT ), [RET_BIG] = ( _SRT ), [RET_DYN] = ( _SRT ), |