Untab ClosureTypes.h and ClosureFlags.c
authorPatrick Palka <patrick@parcs.ath.cx>
Tue, 3 Dec 2013 15:27:14 +0000 (10:27 -0500)
committerPatrick Palka <patrick@parcs.ath.cx>
Wed, 4 Dec 2013 15:46:23 +0000 (10:46 -0500)
includes/rts/storage/ClosureTypes.h
rts/ClosureFlags.c

index d878e96..73a7311 100644 (file)
 /* Object tag 0 raises an internal error */
 #define INVALID_OBJECT          0
 #define CONSTR                  1
 /* Object tag 0 raises an internal error */
 #define INVALID_OBJECT          0
 #define CONSTR                  1
-#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_STATIC          7
+#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_STATIC           7
 #define CONSTR_NOCAF_STATIC     8
 #define CONSTR_NOCAF_STATIC     8
-#define FUN                    
-#define        FUN_1_0                 10
-#define        FUN_0_1                 11
-#define        FUN_2_0                 12
-#define        FUN_1_1                 13
-#define        FUN_0_2                 14
-#define FUN_STATIC             15
-#define THUNK                  16
-#define        THUNK_1_0               17
-#define        THUNK_0_1               18
-#define        THUNK_2_0               19
-#define        THUNK_1_1               20
-#define        THUNK_0_2               21
-#define THUNK_STATIC           22
-#define THUNK_SELECTOR         23
-#define BCO                    24
-#define AP                     25
-#define PAP                    26
+#define FUN                     9
+#define FUN_1_0                 10
+#define FUN_0_1                 11
+#define FUN_2_0                 12
+#define FUN_1_1                 13
+#define FUN_0_2                 14
+#define FUN_STATIC              15
+#define THUNK                   16
+#define THUNK_1_0               17
+#define THUNK_0_1               18
+#define THUNK_2_0               19
+#define THUNK_1_1               20
+#define THUNK_0_2               21
+#define THUNK_STATIC            22
+#define THUNK_SELECTOR          23
+#define BCO                     24
+#define AP                      25
+#define PAP                     26
 #define AP_STACK                27
 #define AP_STACK                27
-#define IND                    28
-#define IND_PERM               29
-#define IND_STATIC             30
+#define IND                     28
+#define IND_PERM                29
+#define IND_STATIC              30
 #define RET_BCO                 31
 #define RET_BCO                 31
-#define RET_SMALL              32
-#define RET_BIG                        33
+#define RET_SMALL               32
+#define RET_BIG                 33
 #define RET_FUN                 34
 #define RET_FUN                 34
-#define UPDATE_FRAME           35
-#define CATCH_FRAME            36
+#define UPDATE_FRAME            35
+#define CATCH_FRAME             36
 #define UNDERFLOW_FRAME         37
 #define STOP_FRAME              38
 #define BLOCKING_QUEUE          39
 #define UNDERFLOW_FRAME         37
 #define STOP_FRAME              38
 #define BLOCKING_QUEUE          39
-#define BLACKHOLE              40
-#define MVAR_CLEAN             41
-#define MVAR_DIRTY             42
+#define BLACKHOLE               40
+#define MVAR_CLEAN              41
+#define MVAR_DIRTY              42
 #define TVAR                    43
 #define ARR_WORDS               44
 #define MUT_ARR_PTRS_CLEAN      45
 #define MUT_ARR_PTRS_DIRTY      46
 #define MUT_ARR_PTRS_FROZEN0    47
 #define MUT_ARR_PTRS_FROZEN     48
 #define TVAR                    43
 #define ARR_WORDS               44
 #define MUT_ARR_PTRS_CLEAN      45
 #define MUT_ARR_PTRS_DIRTY      46
 #define MUT_ARR_PTRS_FROZEN0    47
 #define MUT_ARR_PTRS_FROZEN     48
-#define MUT_VAR_CLEAN          49
+#define MUT_VAR_CLEAN           49
 #define MUT_VAR_DIRTY           50
 #define MUT_VAR_DIRTY           50
-#define WEAK                   51
-#define PRIM                   52
+#define WEAK                    51
+#define PRIM                    52
 #define MUT_PRIM                53
 #define MUT_PRIM                53
-#define TSO                    54
+#define TSO                     54
 #define STACK                   55
 #define TREC_CHUNK              56
 #define ATOMICALLY_FRAME        57
 #define STACK                   55
 #define TREC_CHUNK              56
 #define ATOMICALLY_FRAME        57
index 886288d..020f284 100644 (file)
@@ -19,24 +19,24 @@ StgWord16 closure_flags[] = {
  */
 
 /*                              0    1    2    3    4   5   6   7     8 */
  */
 
 /*                              0    1    2    3    4   5   6   7     8 */
-/*                           HNF  BTM   NS  STA  THU MUT UPT SRT   IND */
+/*                            HNF  BTM   NS  STA  THU MUT UPT SRT   IND */
 
 
- [INVALID_OBJECT]       =  ( 0                                          ),
- [CONSTR]              =  (_HNF|     _NS                                ),
- [CONSTR_1_0]          =  (_HNF|     _NS                                ),
- [CONSTR_0_1]          =  (_HNF|     _NS                                ),
- [CONSTR_2_0]          =  (_HNF|     _NS                                ),
- [CONSTR_1_1]          =  (_HNF|     _NS                                ),
- [CONSTR_0_2]          =  (_HNF|     _NS                                ),
- [CONSTR_STATIC]       =  (_HNF|     _NS|_STA                           ),
- [CONSTR_NOCAF_STATIC]  =  (_HNF|     _NS|_STA                          ),
- [FUN]                 =  (_HNF|     _NS|                  _SRT         ),
- [FUN_1_0]             =  (_HNF|     _NS|                  _SRT         ),
- [FUN_0_1]             =  (_HNF|     _NS|                  _SRT         ),
- [FUN_2_0]             =  (_HNF|     _NS|                  _SRT         ),
- [FUN_1_1]             =  (_HNF|     _NS|                  _SRT         ),
- [FUN_0_2]             =  (_HNF|     _NS|                  _SRT         ),
- [FUN_STATIC]          =  (_HNF|     _NS|_STA|             _SRT         ),
+ [INVALID_OBJECT]       =  ( 0                                           ),
+ [CONSTR]               =  (_HNF|     _NS                                ),
+ [CONSTR_1_0]           =  (_HNF|     _NS                                ),
+ [CONSTR_0_1]           =  (_HNF|     _NS                                ),
+ [CONSTR_2_0]           =  (_HNF|     _NS                                ),
+ [CONSTR_1_1]           =  (_HNF|     _NS                                ),
+ [CONSTR_0_2]           =  (_HNF|     _NS                                ),
+ [CONSTR_STATIC]        =  (_HNF|     _NS|_STA                           ),
+ [CONSTR_NOCAF_STATIC]  =  (_HNF|     _NS|_STA                           ),
+ [FUN]                  =  (_HNF|     _NS|                  _SRT         ),
+ [FUN_1_0]              =  (_HNF|     _NS|                  _SRT         ),
+ [FUN_0_1]              =  (_HNF|     _NS|                  _SRT         ),
+ [FUN_2_0]              =  (_HNF|     _NS|                  _SRT         ),
+ [FUN_1_1]              =  (_HNF|     _NS|                  _SRT         ),
+ [FUN_0_2]              =  (_HNF|     _NS|                  _SRT         ),
+ [FUN_STATIC]           =  (_HNF|     _NS|_STA|             _SRT         ),
  [THUNK]                =  (                   _THU|        _SRT         ),
  [THUNK_1_0]            =  (                   _THU|        _SRT         ),
  [THUNK_0_1]            =  (                   _THU|        _SRT         ),
  [THUNK]                =  (                   _THU|        _SRT         ),
  [THUNK_1_0]            =  (                   _THU|        _SRT         ),
  [THUNK_0_1]            =  (                   _THU|        _SRT         ),
@@ -45,43 +45,43 @@ StgWord16 closure_flags[] = {
  [THUNK_0_2]            =  (                   _THU|        _SRT         ),
  [THUNK_STATIC]         =  (              _STA|_THU|        _SRT         ),
  [THUNK_SELECTOR]       =  (                   _THU|        _SRT         ),
  [THUNK_0_2]            =  (                   _THU|        _SRT         ),
  [THUNK_STATIC]         =  (              _STA|_THU|        _SRT         ),
  [THUNK_SELECTOR]       =  (                   _THU|        _SRT         ),
- [BCO]                 =  (_HNF|     _NS                                ),
- [AP]                  =  (                   _THU                      ),
- [PAP]                 =  (_HNF|     _NS                                ),
- [AP_STACK]            =  (                   _THU                      ),
- [IND]                 =  (          _NS|                        _IND ),
- [IND_PERM]            =  (          _NS|                        _IND ),
- [IND_STATIC]          =  (          _NS|_STA|                   _IND ),
+ [BCO]                  =  (_HNF|     _NS                                ),
+ [AP]                   =  (                   _THU                      ),
+ [PAP]                  =  (_HNF|     _NS                                ),
+ [AP_STACK]             =  (                   _THU                      ),
+ [IND]                  =  (          _NS|                        _IND ),
+ [IND_PERM]             =  (          _NS|                        _IND ),
+ [IND_STATIC]           =  (          _NS|_STA|                   _IND ),
  [RET_BCO]              =  ( 0                                         ),
  [RET_BCO]              =  ( 0                                         ),
- [RET_SMALL]           =  (     _BTM|                       _SRT      ),
- [RET_BIG]             =  (                                 _SRT      ),
+ [RET_SMALL]            =  (     _BTM|                       _SRT      ),
+ [RET_BIG]              =  (                                 _SRT      ),
  [RET_FUN]              =  ( 0                                         ),
  [RET_FUN]              =  ( 0                                         ),
- [UPDATE_FRAME]                =  (     _BTM                                  ),
- [CATCH_FRAME]         =  (     _BTM                                  ),
+ [UPDATE_FRAME]         =  (     _BTM                                  ),
+ [CATCH_FRAME]          =  (     _BTM                                  ),
  [UNDERFLOW_FRAME]      =  (     _BTM                                  ),
  [STOP_FRAME]           =  (     _BTM                                  ),
  [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           ),
+ [BLOCKING_QUEUE]       =  (          _NS|         _MUT|_UPT           ),
+ [MVAR_CLEAN]           =  (_HNF|     _NS|         _MUT|_UPT           ),
+ [MVAR_DIRTY]           =  (_HNF|     _NS|         _MUT|_UPT           ),
  [TVAR]                 =  (_HNF|     _NS|         _MUT|_UPT           ),
  [ARR_WORDS]            =  (_HNF|     _NS|              _UPT           ),
  [TVAR]                 =  (_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           ),
- [MUT_ARR_PTRS_FROZEN0]        =  (_HNF|     _NS|         _MUT|_UPT           ),
- [MUT_ARR_PTRS_FROZEN]         =  (_HNF|     _NS|              _UPT           ),
- [MUT_VAR_CLEAN]       =  (_HNF|     _NS|         _MUT|_UPT           ),
- [MUT_VAR_DIRTY]       =  (_HNF|     _NS|         _MUT|_UPT           ),
- [WEAK]                        =  (_HNF|     _NS|              _UPT           ),
- [PRIM]                =  (_HNF|     _NS|              _UPT           ),
- [MUT_PRIM]            =  (_HNF|     _NS|         _MUT|_UPT           ),
+ [MUT_ARR_PTRS_CLEAN]   =  (_HNF|     _NS|         _MUT|_UPT           ),
+ [MUT_ARR_PTRS_DIRTY]   =  (_HNF|     _NS|         _MUT|_UPT           ),
+ [MUT_ARR_PTRS_FROZEN0] =  (_HNF|     _NS|         _MUT|_UPT           ),
+ [MUT_ARR_PTRS_FROZEN]  =  (_HNF|     _NS|              _UPT           ),
+ [MUT_VAR_CLEAN]        =  (_HNF|     _NS|         _MUT|_UPT           ),
+ [MUT_VAR_DIRTY]        =  (_HNF|     _NS|         _MUT|_UPT           ),
+ [WEAK]                 =  (_HNF|     _NS|              _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           ),
  [ATOMICALLY_FRAME]     =  (     _BTM                                  ),
  [CATCH_RETRY_FRAME]    =  (     _BTM                                  ),
  [CATCH_STM_FRAME]      =  (     _BTM                                  ),
  [TSO]                  =  (_HNF|     _NS|         _MUT|_UPT           ),
  [STACK]                =  (_HNF|     _NS|         _MUT|_UPT           ),
  [TREC_CHUNK]           =  (          _NS|         _MUT|_UPT           ),
  [ATOMICALLY_FRAME]     =  (     _BTM                                  ),
  [CATCH_RETRY_FRAME]    =  (     _BTM                                  ),
  [CATCH_STM_FRAME]      =  (     _BTM                                  ),
- [WHITEHOLE]           =  ( 0                                         )
+ [WHITEHOLE]            =  ( 0                                         )
 };
 
 #if N_CLOSURE_TYPES != 61
 };
 
 #if N_CLOSURE_TYPES != 61