[project @ 2002-04-19 12:23:11 by simonmar]
authorsimonmar <unknown>
Fri, 19 Apr 2002 12:23:11 +0000 (12:23 +0000)
committersimonmar <unknown>
Fri, 19 Apr 2002 12:23:11 +0000 (12:23 +0000)
Update this file to not use ISO C99 labelled initializers - this means
it will compile on MacOS/X.

ghc/rts/ClosureFlags.c

index 314d5f5..abcab5a 100644 (file)
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: ClosureFlags.c,v 1.11 2001/08/14 13:40:09 sewardj Exp $
+ * $Id: ClosureFlags.c,v 1.12 2002/04/19 12:23:11 simonmar Exp $
  *
  * (c) The GHC Team 1998-1999
  *
@@ -24,74 +24,72 @@ 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 */
+/*                           HNF  BTM   NS  STA  THU MUT UPT 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_INTLIKE        ] = (_HNF|     _NS|_STA                         ),
-[CONSTR_CHARLIKE       ] = (_HNF|     _NS|_STA                         ),
-[CONSTR_STATIC         ] = (_HNF|     _NS|_STA                         ),
-[CONSTR_NOCAF_STATIC    ] = (_HNF|     _NS|_STA                        ),
-[FUN                   ] = (_HNF|     _NS|                  _SRT       ),
-[FUN_1_0               ] = (_HNF|     _NS                              ),
-[FUN_0_1               ] = (_HNF|     _NS                              ),
-[FUN_2_0               ] = (_HNF|     _NS                              ),
-[FUN_1_1               ] = (_HNF|     _NS                              ),
-[FUN_0_2               ] = (_HNF|     _NS                              ),
-[FUN_STATIC            ] = (_HNF|     _NS|_STA|             _SRT       ),
-[THUNK                 ] = (     _BTM|         _THU|        _SRT       ),
-[THUNK_1_0             ] = (     _BTM|         _THU|        _SRT       ),
-[THUNK_0_1             ] = (     _BTM|         _THU|        _SRT       ),
-[THUNK_2_0             ] = (     _BTM|         _THU|        _SRT       ),
-[THUNK_1_1             ] = (     _BTM|         _THU|        _SRT       ),
-[THUNK_0_2             ] = (     _BTM|         _THU|        _SRT       ),
-[THUNK_STATIC          ] = (     _BTM|    _STA|_THU|        _SRT       ),
-[THUNK_SELECTOR                ] = (     _BTM|         _THU|        _SRT       ),
-[BCO                   ] = (_HNF|     _NS                              ),
-[AP_UPD                        ] = (     _BTM|         _THU                    ),
-[PAP                   ] = (_HNF|     _NS                              ),
-[IND                   ] = (          _NS                        |_IND ),
-[IND_OLDGEN            ] = (          _NS                        |_IND ),
-[IND_PERM              ] = (          _NS                        |_IND ),
-[IND_OLDGEN_PERM       ] = (          _NS                        |_IND ),
-[IND_STATIC            ] = (          _NS|_STA                   |_IND ),
-[CAF_BLACKHOLE         ] = (     _BTM|_NS|              _UPT           ),
-[RET_BCO               ] = (     _BTM                                  ),
-[RET_SMALL             ] = (     _BTM|                       _SRT      ),
-[RET_VEC_SMALL         ] = (     _BTM|                       _SRT      ),
-[RET_BIG               ] = (                                 _SRT      ),
-[RET_VEC_BIG           ] = (                                 _SRT      ),
-[RET_DYN               ] = (                                 _SRT      ),
-[UPDATE_FRAME          ] = (     _BTM                                  ),
-[CATCH_FRAME           ] = (     _BTM                                  ),
-[STOP_FRAME            ] = (     _BTM                                  ),
-[SEQ_FRAME             ] = (     _BTM                                  ),
-[BLACKHOLE             ] = (          _NS|              _UPT           ),
-[BLACKHOLE_BQ          ] = (          _NS|         _MUT|_UPT           ),
-[SE_BLACKHOLE          ] = (          _NS|              _UPT           ),
-[SE_CAF_BLACKHOLE      ] = (          _NS|              _UPT           ),
-[MVAR                  ] = (_HNF|     _NS|         _MUT|_UPT           ),
-[ARR_WORDS             ] = (_HNF|     _NS|              _UPT           ),
-[MUT_ARR_PTRS          ] = (_HNF|     _NS|         _MUT|_UPT           ),
-[MUT_ARR_PTRS_FROZEN   ] = (_HNF|     _NS|              _UPT           ),
-[MUT_VAR               ] = (_HNF|     _NS|         _MUT|_UPT           ),
-[MUT_CONS              ] = (_HNF|     _NS|              _UPT           ),
-[WEAK                  ] = (_HNF|     _NS|              _UPT           ),
-[FOREIGN               ] = (_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           ),
-[EVACUATED             ] = ( 0                                         ),
-[REMOTE_REF            ] = (_HNF|     _NS|              _UPT           ),
-
-[N_CLOSURE_TYPES        ] = ( 0                                   )
+/* 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_INTLIKE      = */ (_HNF|     _NS|_STA                         ),
+/* CONSTR_CHARLIKE     = */ (_HNF|     _NS|_STA                         ),
+/* 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               = */ (     _BTM|         _THU|        _SRT       ),
+/* THUNK_1_0           = */ (     _BTM|         _THU|        _SRT       ),
+/* THUNK_0_1           = */ (     _BTM|         _THU|        _SRT       ),
+/* THUNK_2_0           = */ (     _BTM|         _THU|        _SRT       ),
+/* THUNK_1_1           = */ (     _BTM|         _THU|        _SRT       ),
+/* THUNK_0_2           = */ (     _BTM|         _THU|        _SRT       ),
+/* THUNK_STATIC                = */ (     _BTM|    _STA|_THU|        _SRT       ),
+/* THUNK_SELECTOR      = */ (     _BTM|         _THU|        _SRT       ),
+/* BCO                 = */ (_HNF|     _NS                              ),
+/* AP_UPD              = */ (     _BTM|         _THU                    ),
+/* PAP                 = */ (_HNF|     _NS                              ),
+/* IND                 = */ (          _NS|                        _IND ),
+/* IND_OLDGEN          = */ (          _NS|                        _IND ),
+/* IND_PERM            = */ (          _NS|                        _IND ),
+/* IND_OLDGEN_PERM     = */ (          _NS|                        _IND ),
+/* 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      ),
+/* UPDATE_FRAME                = */ (     _BTM                                  ),
+/* CATCH_FRAME         = */ (     _BTM                                  ),
+/* STOP_FRAME          = */ (     _BTM                                  ),
+/* SEQ_FRAME           = */ (     _BTM                                  ),
+/* CAF_BLACKHOLE       = */ (     _BTM|_NS|              _UPT           ),
+/* BLACKHOLE           = */ (          _NS|              _UPT           ),
+/* BLACKHOLE_BQ                = */ (          _NS|         _MUT|_UPT           ),
+/* SE_BLACKHOLE                = */ (          _NS|              _UPT           ),
+/* SE_CAF_BLACKHOLE    = */ (          _NS|              _UPT           ),
+/* MVAR                        = */ (_HNF|     _NS|         _MUT|_UPT           ),
+/* ARR_WORDS           = */ (_HNF|     _NS|              _UPT           ),
+/* MUT_ARR_PTRS                = */ (_HNF|     _NS|         _MUT|_UPT           ),
+/* MUT_ARR_PTRS_FROZEN         = */ (_HNF|     _NS|              _UPT           ),
+/* MUT_VAR             = */ (_HNF|     _NS|         _MUT|_UPT           ),
+/* MUT_CONS            = */ (_HNF|     _NS|              _UPT           ),
+/* WEAK                        = */ (_HNF|     _NS|              _UPT           ),
+/* FOREIGN             = */ (_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           ),
+/* EVACUATED           = */ ( 0                                         ),
+/* REMOTE_REF          = */ (_HNF|     _NS|              _UPT           )
 };