X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FClosureFlags.c;h=05baad72d4f827f0e071fb3c2f1e2454c2eb3aaf;hp=5545693362e89b96557c8d03b73889659ed7a120;hb=de75026f5a48d3d052135a973ab4dff76c5b20f5;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/rts/ClosureFlags.c b/rts/ClosureFlags.c
index 5545693..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                           	 ),
@@ -33,8 +33,6 @@ StgWord16 closure_flags[] = {
 /* CONSTR_2_0	   	= */ (_HNF|     _NS                           	 ),
 /* CONSTR_1_1	   	= */ (_HNF|     _NS                           	 ),
 /* CONSTR_0_2	   	= */ (_HNF|     _NS                           	 ),
-/* CONSTR_INTLIKE 	= */ (_HNF|     _NS|_STA                      	 ),
-/* CONSTR_CHARLIKE  	= */ (_HNF|     _NS|_STA                      	 ),
 /* CONSTR_STATIC	= */ (_HNF|     _NS|_STA                      	 ),
 /* CONSTR_NOCAF_STATIC  = */ (_HNF|     _NS|_STA                      	 ),
 /* FUN		   	= */ (_HNF|     _NS|                  _SRT    	 ),
@@ -63,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                                  ),
@@ -73,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           ),
@@ -90,18 +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 != 73
+#if N_CLOSURE_TYPES != 70
 #error Closure types changed: update ClosureFlags.c!
 #endif
-