From: Simon Marlow <marlowsd@gmail.com>
Date: Mon, 3 Aug 2009 20:21:51 +0000 (+0000)
Subject: remove the GUM closure types
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=02ec05e6564d9bbb536c5c0f3cd3c1b5503e3aea

remove the GUM closure types
---

diff --git a/includes/rts/storage/ClosureTypes.h b/includes/rts/storage/ClosureTypes.h
index 3415d42..508dce2 100644
--- a/includes/rts/storage/ClosureTypes.h
+++ b/includes/rts/storage/ClosureTypes.h
@@ -76,21 +76,16 @@
 #define WEAK		        52
 #define STABLE_NAME	        53
 #define TSO		        54
-#define BLOCKED_FETCH	        55
-#define FETCH_ME                56
-#define FETCH_ME_BQ             57
-#define RBH                     58
-#define REMOTE_REF              59
-#define TVAR_WATCH_QUEUE        60
-#define INVARIANT_CHECK_QUEUE   61
-#define ATOMIC_INVARIANT        62
-#define TVAR                    63
-#define TREC_CHUNK              64
-#define TREC_HEADER             65
-#define ATOMICALLY_FRAME        66
-#define CATCH_RETRY_FRAME       67
-#define CATCH_STM_FRAME         68
-#define WHITEHOLE               69
-#define N_CLOSURE_TYPES         70
+#define TVAR_WATCH_QUEUE        55
+#define INVARIANT_CHECK_QUEUE   56
+#define ATOMIC_INVARIANT        57
+#define TVAR                    58
+#define TREC_CHUNK              59
+#define TREC_HEADER             60
+#define ATOMICALLY_FRAME        61
+#define CATCH_RETRY_FRAME       62
+#define CATCH_STM_FRAME         63
+#define WHITEHOLE               64
+#define N_CLOSURE_TYPES         65
 
 #endif /* RTS_STORAGE_CLOSURETYPES_H */
diff --git a/rts/ClosureFlags.c b/rts/ClosureFlags.c
index bbe0e8f..477a892 100644
--- a/rts/ClosureFlags.c
+++ b/rts/ClosureFlags.c
@@ -76,11 +76,6 @@ StgWord16 closure_flags[] = {
  [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           ),
@@ -93,6 +88,6 @@ StgWord16 closure_flags[] = {
  [WHITEHOLE]		=  ( 0                                         )
 };
 
-#if N_CLOSURE_TYPES != 70
+#if N_CLOSURE_TYPES != 65
 #error Closure types changed: update ClosureFlags.c!
 #endif
diff --git a/rts/LdvProfile.c b/rts/LdvProfile.c
index c97187a..3a160de 100644
--- a/rts/LdvProfile.c
+++ b/rts/LdvProfile.c
@@ -179,11 +179,6 @@ processHeapClosureForDead( StgClosure *c )
     case RET_SMALL:
     case RET_BIG:
 	// others
-    case BLOCKED_FETCH:
-    case FETCH_ME:
-    case FETCH_ME_BQ:
-    case RBH:
-    case REMOTE_REF:
     case INVALID_OBJECT:
     default:
 	barf("Invalid object in processHeapClosureForDead(): %d", info->type);
diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c
index fa12637..4441749 100644
--- a/rts/RetainerProfile.c
+++ b/rts/RetainerProfile.c
@@ -620,11 +620,6 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child )
     case RET_BIG:
 	// invalid objects
     case IND:
-    case BLOCKED_FETCH:
-    case FETCH_ME:
-    case FETCH_ME_BQ:
-    case RBH:
-    case REMOTE_REF:
     case INVALID_OBJECT:
     default:
 	barf("Invalid object *c in push()");
@@ -983,11 +978,6 @@ pop( StgClosure **c, StgClosure **cp, retainer *r )
 	case RET_BIG:
 	    // invalid objects
 	case IND:
-	case BLOCKED_FETCH:
-	case FETCH_ME:
-	case FETCH_ME_BQ:
-	case RBH:
-	case REMOTE_REF:
 	case INVALID_OBJECT:
 	default:
 	    barf("Invalid object *c in pop()");
@@ -1145,11 +1135,6 @@ isRetainer( StgClosure *c )
     case RET_BIG:
 	// other cases
     case IND:
-    case BLOCKED_FETCH:
-    case FETCH_ME:
-    case FETCH_ME_BQ:
-    case RBH:
-    case REMOTE_REF:
     case INVALID_OBJECT:
     default:
 	barf("Invalid object in isRetainer(): %d", get_itbl(c)->type);