X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FClosureTypes.h;h=c384ded7ed8c6a66f1de4b8ca6b7db83377085a7;hb=0f9750be555082f42ac65a5e8029947bf23fc9e2;hp=495ca27d00429f192faf58e5076d0ceac865e750;hpb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;p=ghc-hetmet.git

diff --git a/ghc/includes/ClosureTypes.h b/ghc/includes/ClosureTypes.h
index 495ca27..c384ded 100644
--- a/ghc/includes/ClosureTypes.h
+++ b/ghc/includes/ClosureTypes.h
@@ -1,6 +1,8 @@
 /* ----------------------------------------------------------------------------
- * $Id: ClosureTypes.h,v 1.2 1998/12/02 13:20:58 simonm Exp $
+ * $Id: ClosureTypes.h,v 1.18 2002/12/11 15:36:37 simonmar Exp $
  * 
+ * (c) The GHC Team, 1998-1999
+ *
  * Closure Type Constants
  *
  * -------------------------------------------------------------------------- */
@@ -12,66 +14,71 @@
 
 /* Object tag 0 raises an internal error */
 #define INVALID_OBJECT          0
-
 #define CONSTR                  1
-/* #define CONSTR_p_np */       
-#define CONSTR_INTLIKE	        2
-#define CONSTR_CHARLIKE	        3
-#define CONSTR_STATIC	        4
-#define CONSTR_NOCAF_STATIC     5
-
-#define FUN		        6
-#define FUN_STATIC	        7
-
-#define THUNK		        8
-/* #define THUNK_p_np */        
-#define THUNK_STATIC	        9
-#define THUNK_SELECTOR	        10
-
-#define BCO		        11
-
-#define AP_UPD		        12
-#define PAP			13
-
-#define IND		        14
-#define IND_OLDGEN	        15
-#define IND_PERM	        16
-#define IND_OLDGEN_PERM	        17
-#define IND_STATIC	        18
-
-#define CAF_UNENTERED           19
-#define CAF_ENTERED		20
-#define CAF_BLACKHOLE		21
-
-#define RET_BCO                 22
-#define RET_SMALL	        23
-#define RET_VEC_SMALL	        24
-#define RET_BIG		        25
-#define RET_VEC_BIG	        26
-#define RET_DYN		        27
-#define UPDATE_FRAME	        28
-#define CATCH_FRAME	        29
-#define STOP_FRAME	        30
-#define SEQ_FRAME	        31
-
-#define BLACKHOLE	        32
-#define MVAR		        33
-
-#define ARR_WORDS	        34
-#define ARR_PTRS	        35
-
-#define MUT_ARR_WORDS	        36
-#define MUT_ARR_PTRS	        37
-#define MUT_ARR_PTRS_FROZEN     38
-#define MUT_VAR		        39
-
-#define WEAK		        40
-#define FOREIGN		        41
-
-#define TSO		        42
-#define BLOCKED_FETCH	        43
-#define FETCH_ME                44
-
-#define EVACUATED               45
-
-#endif CLOSURETYPES_H
+#define	CONSTR_1_0		2
+#define	CONSTR_0_1		3
+#define	CONSTR_2_0		4
+#define	CONSTR_1_1		5
+#define	CONSTR_0_2		6
+#define CONSTR_INTLIKE	        7 
+#define CONSTR_CHARLIKE	        8 
+#define CONSTR_STATIC	        9 
+#define CONSTR_NOCAF_STATIC     10
+#define FUN		        11
+#define	FUN_1_0		  	12
+#define	FUN_0_1		  	13
+#define	FUN_2_0		  	14
+#define	FUN_1_1		  	15
+#define	FUN_0_2			16
+#define FUN_STATIC	        17
+#define THUNK		        18
+#define	THUNK_1_0	  	19
+#define	THUNK_0_1	  	20
+#define	THUNK_2_0	  	21
+#define	THUNK_1_1	  	22
+#define	THUNK_0_2		23
+#define THUNK_STATIC	        24
+#define THUNK_SELECTOR	        25
+#define BCO		        26
+#define AP		        27
+#define PAP			28
+#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 CAF_BLACKHOLE		45
+#define BLACKHOLE	        46
+#define BLACKHOLE_BQ	        47
+#define SE_BLACKHOLE		48
+#define SE_CAF_BLACKHOLE	49
+#define MVAR		        50
+#define ARR_WORDS	        51
+#define MUT_ARR_PTRS	        52
+#define MUT_ARR_PTRS_FROZEN     53
+#define MUT_VAR		        54
+#define MUT_CONS                55
+#define WEAK		        56
+#define FOREIGN		        57
+#define STABLE_NAME	        58
+#define TSO		        59
+#define BLOCKED_FETCH	        60
+#define FETCH_ME                61
+#define FETCH_ME_BQ             62
+#define RBH                     63
+#define EVACUATED               64
+#define REMOTE_REF              65
+#define N_CLOSURE_TYPES         66
+				
+#endif /* CLOSURETYPES_H */