X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FClosureFlags.c;h=41810f4025a07d45000926e1ed18e1968df45ffc;hp=bbe0e8ffed52f80aedb9baa8a61742c38b07bda1;hb=e5c3b478b3cd1707cf122833822f44b2ac09b8e9;hpb=9b266fba8f18f9f8a469bbe0b51b80a91217f1ab

diff --git a/rts/ClosureFlags.c b/rts/ClosureFlags.c
index bbe0e8f..41810f4 100644
--- a/rts/ClosureFlags.c
+++ b/rts/ClosureFlags.c
@@ -50,9 +50,7 @@ StgWord16 closure_flags[] = {
  [PAP]		   	=  (_HNF|     _NS				 ),
  [AP_STACK]	   	=  (          	       _THU			 ),
  [IND]		   	=  (          _NS|			  _IND ),
- [IND_OLDGEN]	   	=  (          _NS|			  _IND ),
  [IND_PERM]		=  (          _NS|			  _IND ),
- [IND_OLDGEN_PERM]	=  (          _NS|			  _IND ),
  [IND_STATIC]	   	=  (          _NS|_STA|                   _IND ),
  [RET_BCO]		=  (     _BTM                                  ),
  [RET_SMALL]		=  (     _BTM|                       _SRT      ),
@@ -61,9 +59,10 @@ StgWord16 closure_flags[] = {
  [RET_FUN]		=  ( 0                                         ),
  [UPDATE_FRAME]        	=  (     _BTM                                  ),
  [CATCH_FRAME]	   	=  (     _BTM                                  ),
- [STOP_FRAME]	   	=  (     _BTM                                  ),
- [CAF_BLACKHOLE]   	=  ( 	 _BTM|_NS|              _UPT           ),
- [BLACKHOLE]		=  ( 	      _NS|              _UPT           ),
+ [UNDERFLOW_FRAME]      =  (     _BTM                                  ),
+ [STOP_FRAME]           =  (     _BTM                                  ),
+ [BLACKHOLE]            =  (          _NS|              _UPT           ),
+ [BLOCKING_QUEUE]	=  ( 	      _NS|         _MUT|_UPT           ),
  [MVAR_CLEAN]	   	=  (_HNF|     _NS|         _MUT|_UPT           ),
  [MVAR_DIRTY]	   	=  (_HNF|     _NS|         _MUT|_UPT           ),
  [ARR_WORDS]		=  (_HNF|     _NS|              _UPT           ),
@@ -74,25 +73,17 @@ StgWord16 closure_flags[] = {
  [MUT_VAR_CLEAN]	=  (_HNF|     _NS|         _MUT|_UPT           ),
  [MUT_VAR_DIRTY]	=  (_HNF|     _NS|         _MUT|_UPT           ),
  [WEAK]		   	=  (_HNF|     _NS|              _UPT           ),
- [STABLE_NAME]	   	=  (_HNF|     _NS|              _UPT           ),
- [TSO]                 	=  (_HNF|     _NS|         _MUT|_UPT           ),
- [BLOCKED_FETCH]	=  (_HNF|     _NS|         _MUT|_UPT           ),
- [FETCH_ME]		=  (_HNF|     _NS|         _MUT|_UPT           ),
- [FETCH_ME_BQ]          =  ( 	      _NS|         _MUT|_UPT           ),
- [RBH]                  =  ( 	      _NS|         _MUT|_UPT           ),
- [REMOTE_REF]		=  (_HNF|     _NS|              _UPT           ),
- [TVAR_WATCH_QUEUE]     =  (          _NS|         _MUT|_UPT           ),
- [INVARIANT_CHECK_QUEUE]=  (          _NS|         _MUT|_UPT           ),
- [ATOMIC_INVARIANT]     =  (          _NS|         _MUT|_UPT           ),
- [TVAR]                 =  (_HNF|     _NS|         _MUT|_UPT           ), 
+ [PRIM]  	   	=  (_HNF|     _NS|              _UPT           ),
+ [MUT_PRIM]  	   	=  (_HNF|     _NS|         _MUT|_UPT           ),
+ [TSO]                  =  (_HNF|     _NS|         _MUT|_UPT           ),
+ [STACK]                =  (_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                                  ),
  [WHITEHOLE]		=  ( 0                                         )
 };
 
-#if N_CLOSURE_TYPES != 70
+#if N_CLOSURE_TYPES != 61
 #error Closure types changed: update ClosureFlags.c!
 #endif