X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FInfoTables.h;h=a605ba2c177ccdfd0f16e1f6476f3b45c6980ddd;hb=95ca6bff6fc9918203173b442192d9298ef9757a;hp=b3db5e5ca568db2eac2c7ed915bf5d09ebd32ebc;hpb=1b28d4e1f43185ad8c8e7407c66413e1b358402b;p=ghc-hetmet.git diff --git a/ghc/includes/InfoTables.h b/ghc/includes/InfoTables.h index b3db5e5..a605ba2 100644 --- a/ghc/includes/InfoTables.h +++ b/ghc/includes/InfoTables.h @@ -1,7 +1,7 @@ /* ---------------------------------------------------------------------------- - * $Id: InfoTables.h,v 1.18 2000/01/13 14:34:00 hwloidl Exp $ + * $Id: InfoTables.h,v 1.33 2004/08/13 13:09:17 simonmar Exp $ * - * (c) The GHC Team, 1998-1999 + * (c) The GHC Team, 1998-2002 * * Info Tables * @@ -14,24 +14,11 @@ Profiling info -------------------------------------------------------------------------- */ -#ifdef PROFILING - -#define PROF_INFO_WORDS n - -typedef struct { - /* nothing yet */ -} StgProfInfo; - -#else /* !PROFILING */ - -#define PROF_INFO_WORDS 0 - typedef struct { - /* empty */ + char *closure_type; + char *closure_desc; } StgProfInfo; -#endif /* PROFILING */ - /* ----------------------------------------------------------------------------- Parallelism info -------------------------------------------------------------------------- */ @@ -41,21 +28,11 @@ typedef struct { // CURRENTLY UNUSED // ToDo: use this in StgInfoTable (mutually recursive) -- HWL -#define PAR_INFO_WORDS 1 - typedef struct { StgInfoTable *rbh_infoptr; /* infoptr to the RBH */ } StgParInfo; -#else /* !PAR */ - -#define PAR_INFO_WORDS 0 - -typedef struct { - /* empty */ -} StgParInfo; - -#endif /* PAR */ +#endif /* 0 */ /* Copied from ghc-0.29; ToDo: check this code -- HWL @@ -72,7 +49,6 @@ typedef struct { */ #if defined(PAR) || defined(GRAN) -# define RBH_INFO_OFFSET (GEN_INFO_OFFSET+GEN_INFO_WORDS) # ifdef RBH_MAGIC_OFFSET @@ -106,37 +82,50 @@ typedef struct { #endif /* ----------------------------------------------------------------------------- + Ticky info + -------------------------------------------------------------------------- */ + +#if defined(SUPPORTS_EMPTY_STRUCTS) +typedef struct { + /* empty */ +} StgTickyInfo; +#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 { +# if defined(SUPPORTS_EMPTY_STRUCTS) +typedef struct StgDebugInfo { /* empty */ } StgDebugInfo; +# endif #endif /* DEBUG_CLOSURE */ +/* ----------------------------------------------------------------------------- + Closure flags + -------------------------------------------------------------------------- */ + /* 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) @@ -158,6 +147,7 @@ extern StgWord16 closure_flags[]; #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]) @@ -170,90 +160,192 @@ extern StgWord16 closure_flags[]; #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 + Bitmaps + + These are used to describe the pointerhood of a sequence of words + (usually on the stack) to the garbage collector. The two primary + uses are for stack frames, and functions (where we need to describe + the layout of a PAP to the GC). + + In these bitmaps: 0 == ptr, 1 == non-ptr. -------------------------------------------------------------------------- */ -/* A large bitmap. Small 32-bit ones live in the info table, but sometimes - * 32 bits isn't enough and we have to generate a larger one. (sizes - * differ for 64-bit machines. - */ +// +// Small bitmaps: for a small bitmap, we store the size and bitmap in +// the same word, using the following macros. If the bitmap doesn't +// fit in a single word, we use a pointer to an StgLargeBitmap below. +// +#define MK_SMALL_BITMAP(size,bits) (((bits)<> BITMAP_BITS_SHIFT) +// +// A large bitmap. +// typedef struct { StgWord size; - StgWord bitmap[0]; + StgWord bitmap[FLEXIBLE_ARRAY]; } StgLargeBitmap; -/* - * Stuff describing the closure layout. Well, actually, it might - * contain the selector index for a THUNK_SELECTOR. If we're on a - * 64-bit architecture then we can enlarge some of these fields, since - * the union contains a pointer field. - */ +/* ----------------------------------------------------------------------------- + SRTs (Static Reference Tables) + + These tables are used to keep track of the static objects referred + to by the code for a closure or stack frame, so that we can follow + static data references from code and thus accurately + garbage-collect CAFs. + -------------------------------------------------------------------------- */ + +// An SRT is just an array of closure pointers: +typedef StgClosure* StgSRT[]; + +// Each info table refers to some subset of the closure pointers in an +// SRT. It does this using a pair of an StgSRT pointer and a +// half-word bitmap. If the half-word bitmap isn't large enough, then +// we fall back to a large SRT, including an unbounded bitmap. If the +// half-word bitmap is set to all ones (0xffff), then the StgSRT +// pointer instead points to an StgLargeSRT: +typedef struct StgLargeSRT_ { + StgSRT *srt; + StgLargeBitmap l; +} StgLargeSRT; +/* ---------------------------------------------------------------------------- + Info Tables + ------------------------------------------------------------------------- */ + +// +// Stuff describing the closure layout. Well, actually, it might +// contain the selector index for a THUNK_SELECTOR. This union is one +// word long. +// typedef union { - struct { -#if SIZEOF_VOID_P == 8 - StgWord32 ptrs; /* number of pointers */ - StgWord32 nptrs; /* number of non-pointers */ -#else - StgWord16 ptrs; /* number of pointers */ - StgWord16 nptrs; /* number of non-pointers */ -#endif - } payload; + struct { // Heap closure payload layout: + StgHalfWord ptrs; // number of pointers + StgHalfWord nptrs; // number of non-pointers + } payload; + + StgWord bitmap; // word-sized bit pattern describing + // a stack frame: see below + + StgLargeBitmap* large_bitmap; // pointer to large bitmap structure + + StgWord selector_offset; // used in THUNK_SELECTORs - StgWord bitmap; /* bit pattern, 1 = pointer, 0 = non-pointer */ - StgWord selector_offset; /* used in THUNK_SELECTORs */ - StgLargeBitmap* large_bitmap; /* pointer to large bitmap structure */ - } StgClosureInfo; -/* - * Info tables. All info tables are the same type, to simplify code - * generation. However, the mangler removes any unused SRT fields - * from the asm to save space (convention: if srt_len is zero, or the - * type is a CONSTR_ type, then the SRT field isn't present. - */ - -typedef StgClosure* StgSRT[]; +// +// The "standard" part of an info table. Every info table has this bit. +// typedef struct _StgInfoTable { - StgSRT *srt; /* pointer to the SRT table */ + +#ifndef TABLES_NEXT_TO_CODE + StgFunPtr entry; // pointer to the entry code +#endif + #if defined(PAR) || defined(GRAN) - // StgParInfo par; struct _StgInfoTable *rbh_infoptr; #endif #ifdef PROFILING - /* StgProfInfo prof; */ + StgProfInfo prof; +#endif +#ifdef TICKY + MAYBE_EMPTY_STRUCT(StgTickyInfo,ticky) #endif #ifdef DEBUG_CLOSURE - StgDebugInfo debug; + MAYBE_EMPTY_STRUCT(StgDebugInfo,debug) +#endif + + StgClosureInfo layout; // closure layout info (one word) + + StgHalfWord type; // closure type + StgHalfWord srt_bitmap; // number of entries in SRT (or constructor tag) + +#ifdef TABLES_NEXT_TO_CODE + StgCode code[FLEXIBLE_ARRAY]; #endif - StgClosureInfo layout; /* closure layout info (pointer-sized) */ -#if SIZEOF_VOID_P == 8 - StgWord32 type; /* } These 2 elements fit into 64 bits */ - StgWord32 srt_len; /* } */ +} StgInfoTable; + + +/* ----------------------------------------------------------------------------- + Function info tables + + This is the general form of function info tables. The compiler + will omit some of the fields in common cases: + + - If fun_type is not ARG_GEN or ARG_GEN_BIG, then the slow_apply + and bitmap fields may be left out (they are at the end, so omitting + them doesn't affect the layout). + + - If srt_bitmap (in the std info table part) is zero, then the srt + field may be omitted. This only applies if the slow_apply and + bitmap fields have also been omitted. + -------------------------------------------------------------------------- */ + +typedef struct _StgFunInfoExtraRev { + StgFun *slow_apply; // apply to args on the stack + StgWord bitmap; // arg ptr/nonptr bitmap + StgSRT *srt; // pointer to the SRT table + StgHalfWord fun_type; // function type + StgHalfWord arity; // function arity +} StgFunInfoExtraRev; + +typedef struct _StgFunInfoExtraFwd { + StgHalfWord fun_type; // function type + StgHalfWord arity; // function arity + StgSRT *srt; // pointer to the SRT table + StgWord bitmap; // arg ptr/nonptr bitmap + StgFun *slow_apply; // apply to args on the stack +} StgFunInfoExtraFwd; + +typedef struct { +#if defined(TABLES_NEXT_TO_CODE) + StgFunInfoExtraRev f; + StgInfoTable i; #else - StgWord type : 16; /* } These 2 elements fit into 32 bits */ - StgWord srt_len : 16; /* } */ + StgInfoTable i; + StgFunInfoExtraFwd f; #endif -#ifdef TABLES_NEXT_TO_CODE - StgCode code[0]; +} StgFunInfoTable; + +/* ----------------------------------------------------------------------------- + Return info tables + -------------------------------------------------------------------------- */ + +// When info tables are laid out backwards, we can omit the SRT +// pointer iff srt_bitmap is zero. + +typedef struct { +#if defined(TABLES_NEXT_TO_CODE) + StgSRT *srt; // pointer to the SRT table + StgInfoTable i; #else - StgFunPtr entry; - StgFunPtr vector[0]; + StgInfoTable i; + StgSRT *srt; // pointer to the SRT table + StgFunPtr vector[FLEXIBLE_ARRAY]; #endif -} StgInfoTable; +} StgRetInfoTable; -/* 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 +/* ----------------------------------------------------------------------------- + Thunk info tables + -------------------------------------------------------------------------- */ + +// When info tables are laid out backwards, we can omit the SRT +// pointer iff srt_bitmap is zero. + +typedef struct _StgThunkInfoTable { +#if !defined(TABLES_NEXT_TO_CODE) + StgInfoTable i; +#endif + StgSRT *srt; // pointer to the SRT table +#if defined(TABLES_NEXT_TO_CODE) + StgInfoTable i; +#endif +} StgThunkInfoTable; #endif /* INFOTABLES_H */