X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FInfoTables.h;h=f9b97eb402cee3c3a3aca24c0f063b09db64eb78;hb=cf3860cc1a9715218f1f1e3b62e767a988472576;hp=c1e28d6eea5d765c9b4943816cd0a3c963826c73;hpb=030a1217712fb01f9feeee436efd6c0523aa3b43;p=ghc-hetmet.git diff --git a/ghc/includes/InfoTables.h b/ghc/includes/InfoTables.h index c1e28d6..f9b97eb 100644 --- a/ghc/includes/InfoTables.h +++ b/ghc/includes/InfoTables.h @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: InfoTables.h,v 1.13 1999/03/15 16:30:25 simonm Exp $ + * $Id: InfoTables.h,v 1.21 2001/03/22 03:51:09 hwloidl Exp $ * * (c) The GHC Team, 1998-1999 * @@ -16,16 +16,13 @@ #ifdef PROFILING -#define PROF_INFO_WORDS n - typedef struct { - /* nothing yet */ + char *closure_type; + char *closure_desc; } StgProfInfo; #else /* !PROFILING */ -#define PROF_INFO_WORDS 0 - typedef struct { /* empty */ } StgProfInfo; @@ -36,40 +33,82 @@ typedef struct { Parallelism info -------------------------------------------------------------------------- */ -#ifdef PAR +#if 0 && (defined(PAR) || defined(GRAN)) -#define PAR_INFO_WORDS 0 +// CURRENTLY UNUSED +// ToDo: use this in StgInfoTable (mutually recursive) -- HWL typedef struct { - /* empty */ + StgInfoTable *rbh_infoptr; /* infoptr to the RBH */ } StgParInfo; #else /* !PAR */ -#define PAR_INFO_WORDS 0 - typedef struct { /* empty */ } StgParInfo; #endif /* PAR */ +/* + Copied from ghc-0.29; ToDo: check this code -- HWL + + In the parallel system, all updatable closures have corresponding + revertible black holes. When we are assembly-mangling, we guarantee + that the revertible black hole code precedes the normal entry code, so + that the RBH info table resides at a fixed offset from the normal info + table. Otherwise, we add the RBH info table pointer to the end of the + normal info table and vice versa. + + Currently has to use a !RBH_MAGIC_OFFSET setting. + Still todo: init of par.infoptr field in all infotables!! +*/ + +#if defined(PAR) || defined(GRAN) + +# ifdef RBH_MAGIC_OFFSET + +# error magic offset not yet implemented + +# define RBH_INFO_WORDS 0 +# define INCLUDE_RBH_INFO(infoptr) + +# define RBH_INFOPTR(infoptr) (((P_)infoptr) - RBH_MAGIC_OFFSET) +# define REVERT_INFOPTR(infoptr) (((P_)infoptr) + RBH_MAGIC_OFFSET) + +# else + +# define RBH_INFO_WORDS 1 +# define INCLUDE_RBH_INFO(info) rbh_infoptr : &(info) + +# define RBH_INFOPTR(infoptr) (((StgInfoTable *)(infoptr))->rbh_infoptr) +# define REVERT_INFOPTR(infoptr) (((StgInfoTable *)(infoptr))->rbh_infoptr) + +# endif + +/* see ParallelRts.h */ +// EXTFUN(RBH_entry); +//StgClosure *convertToRBH(StgClosure *closure); +//#if defined(GRAN) +//void convertFromRBH(StgClosure *closure); +//#elif defined(PAR) +//void convertToFetchMe(StgPtr closure, globalAddr *ga); +//#endif + +#endif + /* ----------------------------------------------------------------------------- Debugging info -------------------------------------------------------------------------- */ #ifdef DEBUG_CLOSURE -#define DEBUG_INFO_WORDS n - typedef struct { ... whatever ... } StgDebugInfo; #else /* !DEBUG_CLOSURE */ -#define DEBUG_INFO_WORDS 0 - typedef struct { /* empty */ } StgDebugInfo; @@ -78,14 +117,15 @@ typedef struct { /* The type flags provide quick access to certain properties of a closure. */ -#define _HNF (1<<0) /* head normal form? */ +#define _HNF (1<<0) /* head normal form? */ #define _BTM (1<<1) /* bitmap-style layout? */ -#define _NS (1<<2) /* non-sparkable */ -#define _STA (1<<3) /* static? */ -#define _THU (1<<4) /* thunk? */ -#define _MUT (1<<5) /* mutable? */ -#define _UPT (1<<6) /* unpointed? */ -#define _SRT (1<<7) /* has an SRT? */ +#define _NS (1<<2) /* non-sparkable */ +#define _STA (1<<3) /* static? */ +#define _THU (1<<4) /* thunk? */ +#define _MUT (1<<5) /* mutable? */ +#define _UPT (1<<6) /* unpointed? */ +#define _SRT (1<<7) /* has an SRT? */ +#define _IND (1<<8) /* is an indirection? */ #define isSTATIC(flags) ((flags) &_STA) #define isMUTABLE(flags) ((flags) &_MUT) @@ -98,11 +138,29 @@ extern StgWord16 closure_flags[]; #define closureFlags(c) (closure_flags[get_itbl(c)->type]) -#define closure_STATIC(c) ( closureFlags(c) & _STA) +#define closure_HNF(c) ( closureFlags(c) & _HNF) +#define closure_BITMAP(c) ( closureFlags(c) & _BTM) +#define closure_NON_SPARK(c) ( (closureFlags(c) & _NS)) #define closure_SHOULD_SPARK(c) (!(closureFlags(c) & _NS)) +#define closure_STATIC(c) ( closureFlags(c) & _STA) +#define closure_THUNK(c) ( closureFlags(c) & _THU) #define closure_MUTABLE(c) ( closureFlags(c) & _MUT) #define closure_UNPOINTED(c) ( closureFlags(c) & _UPT) - +#define closure_SRT(c) ( closureFlags(c) & _SRT) +#define closure_IND(c) ( closureFlags(c) & _IND) + +/* same as above but for info-ptr rather than closure */ +#define ipFlags(ip) (closure_flags[ip->type]) + +#define ip_HNF(ip) ( ipFlags(ip) & _HNF) +#define ip_BITMAP(ip) ( ipFlags(ip) & _BTM) +#define ip_SHOULD_SPARK(ip) (!(ipFlags(ip) & _NS)) +#define ip_STATIC(ip) ( ipFlags(ip) & _STA) +#define ip_THUNK(ip) ( ipFlags(ip) & _THU) +#define ip_MUTABLE(ip) ( ipFlags(ip) & _MUT) +#define ip_UNPOINTED(ip) ( ipFlags(ip) & _UPT) +#define ip_SRT(ip) ( ipFlags(ip) & _SRT) +#define ip_IND(ip) ( ipFlags(ip) & _IND) /* ----------------------------------------------------------------------------- Info Tables @@ -126,22 +184,19 @@ typedef struct { */ typedef union { -#if SIZEOF_VOID_P == 8 struct { +#if SIZEOF_VOID_P == 8 StgWord32 ptrs; /* number of pointers */ StgWord32 nptrs; /* number of non-pointers */ - } payload; #else - struct { StgWord16 ptrs; /* number of pointers */ StgWord16 nptrs; /* number of non-pointers */ +#endif } payload; StgWord bitmap; /* bit pattern, 1 = pointer, 0 = non-pointer */ StgWord selector_offset; /* used in THUNK_SELECTORs */ StgLargeBitmap* large_bitmap; /* pointer to large bitmap structure */ - -#endif } StgClosureInfo; @@ -156,8 +211,8 @@ typedef StgClosure* StgSRT[]; typedef struct _StgInfoTable { StgSRT *srt; /* pointer to the SRT table */ -#ifdef PAR - StgParInfo par; +#if defined(PAR) || defined(GRAN) + struct _StgInfoTable *rbh_infoptr; #endif #ifdef PROFILING StgProfInfo prof; @@ -173,12 +228,22 @@ typedef struct _StgInfoTable { StgWord type : 16; /* } These 2 elements fit into 32 bits */ StgWord srt_len : 16; /* } */ #endif -#if USE_MINIINTERPRETER - StgFunPtr (*vector)[]; - StgFunPtr entry; -#else +#ifdef TABLES_NEXT_TO_CODE StgCode code[0]; +#else + StgFunPtr entry; + StgFunPtr vector[0]; #endif } StgInfoTable; +/* Info tables are read-only, therefore we uniformly declare them with + * C's const attribute. This isn't just a nice thing to do: it's + * necessary because the garbage collector has to distinguish between + * closure pointers and info table pointers when traversing the + * stack. We distinguish the two by checking whether the pointer is + * into text-space or not. + */ + +#define INFO_TBL_CONST const + #endif /* INFOTABLES_H */