X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FClosureTypes.h;h=99aaf9ffe50036379f73c97d66ecc667ec3fabda;hb=701d72574685d7e884728375eaeb6b6b52f6c749;hp=1d46c004178502e2781475231d8990d159804de3;hpb=dfd7d6d02a597949b08161ae3d49dc6dfc9e812d;p=ghc-hetmet.git

diff --git a/ghc/includes/ClosureTypes.h b/ghc/includes/ClosureTypes.h
index 1d46c00..99aaf9f 100644
--- a/ghc/includes/ClosureTypes.h
+++ b/ghc/includes/ClosureTypes.h
@@ -1,16 +1,24 @@
 /* ----------------------------------------------------------------------------
- * $Id: ClosureTypes.h,v 1.16 2001/07/23 17:23:19 simonmar Exp $
  * 
- * (c) The GHC Team, 1998-1999
+ * (c) The GHC Team, 1998-2005
  *
- * Closure Type Constants
+ * Closure Type Constants: out here because the native code generator
+ * needs to get at them.
  *
  * -------------------------------------------------------------------------- */
 
 #ifndef CLOSURETYPES_H
 #define CLOSURETYPES_H
 
-/* Out here because the native code generator needs to get at them. */
+/* 
+ * WARNING WARNING WARNING
+ *
+ * Keep the closure tags contiguous: rts/ClosureFlags.c relies on
+ * this.
+ *
+ * If you add or delete any closure types, don't forget to update
+ * the closure flags table in rts/ClosureFlags.c.
+ */
 
 /* Object tag 0 raises an internal error */
 #define INVALID_OBJECT          0
@@ -40,48 +48,50 @@
 #define THUNK_STATIC	        24
 #define THUNK_SELECTOR	        25
 #define BCO		        26
-#define AP_UPD		        27
+#define AP		        27
 #define PAP			28
-#define IND		        29
-#define IND_OLDGEN	        30
-#define IND_PERM	        31
-#define IND_OLDGEN_PERM	        32
-#define IND_STATIC	        33
-#define RET_BCO                 36
-#define RET_SMALL	        37
-#define RET_VEC_SMALL	        38
-#define RET_BIG		        39
-#define RET_VEC_BIG	        40
-#define RET_DYN		        41
+#define AP_STACK                29
+#define IND		        30
+#define IND_OLDGEN	        31
+#define IND_PERM	        32
+#define IND_OLDGEN_PERM	        33
+#define IND_STATIC	        34
+#define RET_BCO                 35
+#define RET_SMALL	        36
+#define RET_VEC_SMALL	        37
+#define RET_BIG		        38
+#define RET_VEC_BIG	        39
+#define RET_DYN		        40
+#define RET_FUN                 41
 #define UPDATE_FRAME	        42
 #define CATCH_FRAME	        43
 #define STOP_FRAME	        44
-#define SEQ_FRAME	        45
-#define CAF_BLACKHOLE		46
-#define BLACKHOLE	        47
-#define BLACKHOLE_BQ	        48
-#define SE_BLACKHOLE		49
-#define SE_CAF_BLACKHOLE	50
-#define MVAR		        51
-#define ARR_WORDS	        52
-#define MUT_ARR_PTRS	        53
-#define MUT_ARR_PTRS_FROZEN     54
-#define MUT_VAR		        55
-#define MUT_CONS                56
-#define WEAK		        57
-#define FOREIGN		        58
-#define STABLE_NAME	        59
-
-#define TSO		        60
-#define BLOCKED_FETCH	        61
-#define FETCH_ME                62
-#define FETCH_ME_BQ             63
-#define RBH                     64
-
-#define EVACUATED               65
-
-#define REMOTE_REF              66
-
-#define N_CLOSURE_TYPES         67
+#define CAF_BLACKHOLE		45
+#define BLACKHOLE	        46
+#define SE_BLACKHOLE		47
+#define SE_CAF_BLACKHOLE	48
+#define MVAR		        59
+#define ARR_WORDS	        50
+#define MUT_ARR_PTRS	        51
+#define MUT_ARR_PTRS_FROZEN0    52
+#define MUT_ARR_PTRS_FROZEN     53
+#define MUT_VAR		        54
+#define WEAK		        55
+#define STABLE_NAME	        56
+#define TSO		        57
+#define BLOCKED_FETCH	        68
+#define FETCH_ME                69
+#define FETCH_ME_BQ             60
+#define RBH                     61
+#define EVACUATED               62
+#define REMOTE_REF              63
+#define TVAR_WAIT_QUEUE         64
+#define TVAR                    65
+#define TREC_CHUNK              66
+#define TREC_HEADER             67
+#define ATOMICALLY_FRAME        78
+#define CATCH_RETRY_FRAME       79
+#define CATCH_STM_FRAME         70
+#define N_CLOSURE_TYPES         71
 
 #endif /* CLOSURETYPES_H */