X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FClosureFlags.c;h=05baad72d4f827f0e071fb3c2f1e2454c2eb3aaf;hb=cf96c6c8f2ead02205e509975282e212a5eb9aee;hp=260bf390d02796637376766c5e7721d39414792f;hpb=a0be7e7ccd602efd9b7d35b3e0747a2c4f155ce9;p=ghc-hetmet.git diff --git a/rts/ClosureFlags.c b/rts/ClosureFlags.c index 260bf39..05baad7 100644 --- a/rts/ClosureFlags.c +++ b/rts/ClosureFlags.c @@ -23,8 +23,8 @@ StgWord16 closure_flags[] = { * to thunks.) */ -/* 0 1 2 3 4 5 6 7 */ -/* HNF BTM NS STA THU MUT UPT SRT */ +/* 0 1 2 3 4 5 6 7 8 */ +/* HNF BTM NS STA THU MUT UPT SRT IND */ /* INVALID_OBJECT = */ ( 0 ), /* CONSTR = */ (_HNF| _NS ), @@ -61,9 +61,7 @@ StgWord16 closure_flags[] = { /* IND_STATIC = */ ( _NS|_STA| _IND ), /* RET_BCO = */ ( _BTM ), /* RET_SMALL = */ ( _BTM| _SRT ), -/* RET_VEC_SMALL = */ ( _BTM| _SRT ), /* RET_BIG = */ ( _SRT ), -/* RET_VEC_BIG = */ ( _SRT ), /* RET_DYN = */ ( _SRT ), /* RET_FUN = */ ( 0 ), /* UPDATE_FRAME = */ ( _BTM ), @@ -71,9 +69,8 @@ StgWord16 closure_flags[] = { /* STOP_FRAME = */ ( _BTM ), /* CAF_BLACKHOLE = */ ( _BTM|_NS| _UPT ), /* BLACKHOLE = */ ( _NS| _UPT ), -/* SE_BLACKHOLE = */ ( _NS| _UPT ), -/* SE_CAF_BLACKHOLE = */ ( _NS| _UPT ), -/* MVAR = */ (_HNF| _NS| _MUT|_UPT ), +/* MVAR_CLEAN = */ (_HNF| _NS| _MUT|_UPT ), +/* MVAR_DIRTY = */ (_HNF| _NS| _MUT|_UPT ), /* ARR_WORDS = */ (_HNF| _NS| _UPT ), /* MUT_ARR_PTRS_CLEAN = */ (_HNF| _NS| _MUT|_UPT ), /* MUT_ARR_PTRS_DIRTY = */ (_HNF| _NS| _MUT|_UPT ), @@ -88,17 +85,19 @@ StgWord16 closure_flags[] = { /* FETCH_ME = */ (_HNF| _NS| _MUT|_UPT ), /* FETCH_ME_BQ = */ ( _NS| _MUT|_UPT ), /* RBH = */ ( _NS| _MUT|_UPT ), -/* EVACUATED = */ ( 0 ), /* REMOTE_REF = */ (_HNF| _NS| _UPT ), -/* TVAR_WAIT_QUEUE = */ ( _NS| _MUT|_UPT ), +/* TVAR_WATCH_QUEUE = */ ( _NS| _MUT|_UPT ), +/* INVARIANT_CHECK_QUEUE= */ ( _NS| _MUT|_UPT ), +/* ATOMIC_INVARIANT = */ ( _NS| _MUT|_UPT ), /* TVAR = */ (_HNF| _NS| _MUT|_UPT ), /* TREC_CHUNK = */ ( _NS| _MUT|_UPT ), /* TREC_HEADER = */ ( _NS| _MUT|_UPT ), /* ATOMICALLY_FRAME = */ ( _BTM ), /* CATCH_RETRY_FRAME = */ ( _BTM ), -/* CATCH_STM_FRAME = */ ( _BTM ) +/* CATCH_STM_FRAME = */ ( _BTM ), +/* WHITEHOLE = */ ( 0 ) }; -#if N_CLOSURE_TYPES != 71 +#if N_CLOSURE_TYPES != 70 #error Closure types changed: update ClosureFlags.c! #endif