X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FClosures.h;h=3e8f2347df73e2d8f03a18eb80d9521895a9f598;hb=0a3915c94f4c26539475047b83ac6853f1a233fb;hp=17bcbf2762224ed38ea19c389099be4179a3e550;hpb=46a9181dbd6a9ef8b327d280607d8777cd622e10;p=ghc-hetmet.git diff --git a/ghc/includes/Closures.h b/ghc/includes/Closures.h index 17bcbf2..3e8f234 100644 --- a/ghc/includes/Closures.h +++ b/ghc/includes/Closures.h @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: Closures.h,v 1.12 1999/03/25 13:01:44 simonm Exp $ + * $Id: Closures.h,v 1.31 2002/01/29 16:52:46 simonmar Exp $ * * (c) The GHC Team, 1998-1999 * @@ -19,71 +19,22 @@ The profiling header -------------------------------------------------------------------------- */ -#ifdef PROFILING - -typedef struct { - CostCentreStack *ccs; -} StgProfHeader; - -#else /* !PROFILING */ - typedef struct { - /* empty */ + CostCentreStack *ccs; + union { + struct _RetainerSet *rs; // Retainer Set + StgWord ldvw; // Lag/Drag/Void Word + } hp; } StgProfHeader; -#endif /* PROFILING */ - /* ----------------------------------------------------------------------------- - The parallel header + The GranSim header -------------------------------------------------------------------------- */ -#ifdef GRAN - typedef struct { - W_ procs; + StgWord procs; /* bitmask indicating on which PEs this closure resides */ } StgGranHeader; -#else /* !PAR */ - -typedef struct { - /* empty */ -} StgGranHeader; - -#endif /* PAR */ - -/* ----------------------------------------------------------------------------- - The ticky-ticky header - - Comment from old Ticky.h: - - This is used to record if a closure has been updated but not yet - entered. It is set when the closure is updated and cleared when - subsequently entered. - - NB: It is {\em not} an ``entry count'', it is an - ``entries-after-update count.'' - - The commoning up of @CONST@, @CHARLIKE@ and @INTLIKE@ closures is - turned off(?) if this is required. This has only been done for 2s - collection. It is done using a nasty hack which defines the - @_Evacuate@ and @_Scavenge@ code for @CONST@, @CHARLIKE@ and @INTLIKE@ - info tables to be @_Evacuate_1@ and @_Scavenge_1_0@. - -------------------------------------------------------------------------- */ - -#ifdef TICKY - -typedef struct { - W_ updated; -} StgTickyHeader; - -#else /* !TICKY */ - -typedef struct { - /* empty */ -} StgTickyHeader; - -#endif /* TICKY */ - /* ----------------------------------------------------------------------------- The full fixed-size closure header @@ -97,10 +48,7 @@ typedef struct { StgProfHeader prof; #endif #ifdef GRAN - StgGranHeader par; -#endif -#ifdef TICKY - StgTickyHeader ticky; + StgGranHeader gran; #endif } StgHeader; @@ -116,10 +64,10 @@ typedef struct { /* All closures follow the generic format */ -typedef struct StgClosure_ { +struct StgClosure_ { StgHeader header; - struct StgClosure_ *payload[0]; -} StgClosure; + struct StgClosure_ *payload[FLEXIBLE_ARRAY]; +}; /* What a stroke of luck - all our mutable closures follow the same * basic layout, with the mutable link field as the second field after @@ -129,9 +77,9 @@ typedef struct StgClosure_ { typedef struct StgMutClosure_ { StgHeader header; - StgPtr *padding; + StgWord padding; struct StgMutClosure_ *mut_link; - struct StgClosure_ *payload[0]; + struct StgClosure_ *payload[FLEXIBLE_ARRAY]; } StgMutClosure; typedef struct { @@ -143,26 +91,17 @@ typedef struct { StgHeader header; StgWord n_args; StgClosure *fun; - StgPtr payload[0]; + StgClosure *payload[FLEXIBLE_ARRAY]; } StgPAP; typedef struct { StgHeader header; StgWord n_args; StgClosure *fun; - StgPtr payload[0]; + StgClosure *payload[FLEXIBLE_ARRAY]; } StgAP_UPD; typedef struct { - StgHeader header; - StgWord n_ptrs; - StgWord n_words; - StgWord n_instrs; - StgWord stgexpr; - StgPtr payload[0]; -} StgBCO; - -typedef struct { StgHeader header; StgClosure *indirectee; } StgInd; @@ -174,36 +113,23 @@ typedef struct { } StgIndOldGen; typedef struct { - StgHeader header; - StgClosure *indirectee; - StgClosure *static_link; -} StgIndStatic; - -typedef struct StgCAF_ { StgHeader header; - StgClosure *body; - StgMutClosure *mut_link; - StgClosure *value; - struct StgCAF_ *link; -} StgCAF; - -typedef struct { - StgHeader header; - struct StgTSO_ *blocking_queue; - StgMutClosure *mut_link; -} StgBlockingQueue; + StgClosure *indirectee; + StgClosure *static_link; + struct _StgInfoTable *saved_info; +} StgIndStatic; typedef struct { StgHeader header; StgWord words; - StgWord payload[0]; + StgWord payload[FLEXIBLE_ARRAY]; } StgArrWords; typedef struct { StgHeader header; StgWord ptrs; StgMutClosure *mut_link; /* mutable list */ - StgClosure *payload[0]; + StgClosure *payload[FLEXIBLE_ARRAY]; } StgMutArrPtrs; typedef struct { @@ -212,6 +138,23 @@ typedef struct { StgMutClosure *mut_link; } StgMutVar; +typedef struct { + StgHeader header; + StgArrWords *instrs; /* a pointer to an ArrWords */ + StgArrWords *literals; /* a pointer to an ArrWords */ + StgMutArrPtrs *ptrs; /* a pointer to a MutArrPtrs */ + StgArrWords *itbls; /* a pointer to an ArrWords */ +} StgBCO; + +/* + A collective typedef for all linkable stack frames i.e. + StgUpdateFrame, StgSeqFrame, StgCatchFrame +*/ +typedef struct _StgFrame { + StgHeader header; + struct _StgFrame *link; +} StgFrame; + typedef struct _StgUpdateFrame { StgHeader header; struct _StgUpdateFrame *link; @@ -226,6 +169,7 @@ typedef struct { typedef struct { StgHeader header; struct _StgUpdateFrame *link; + StgInt exceptions_blocked; StgClosure *handler; } StgCatchFrame; @@ -257,7 +201,7 @@ typedef struct _StgStableName { StgHeader header; StgWord sn; } StgStableName; - + typedef struct _StgWeak { /* Weak v */ StgHeader header; StgClosure *key; @@ -280,7 +224,7 @@ typedef struct { const struct _StgInfoTable* info; StgWord liveness; StgWord ret_addr; - StgWord payload[0]; + StgWord payload[FLEXIBLE_ARRAY]; } StgRetDyn; /* Concurrent communication objects */ @@ -293,12 +237,82 @@ typedef struct { StgClosure* value; } StgMVar; -/* Parallel FETCH_ME closures */ -#ifdef PAR -typedef struct { +#if defined(PAR) || defined(GRAN) +/* + StgBlockingQueueElement is a ``collective type'' representing the types + of closures that can be found on a blocking queue: StgTSO, StgRBHSave, + StgBlockedFetch. (StgRBHSave can only appear at the end of a blocking + queue). Logically, this is a union type, but defining another struct + with a common layout is easier to handle in the code (same as for + StgMutClosures). + Note that in the standard setup only StgTSOs can be on a blocking queue. + This is one of the main reasons for slightly different code in files + such as Schedule.c. +*/ +typedef struct StgBlockingQueueElement_ { + StgHeader header; + struct StgBlockingQueueElement_ *link; /* next elem in BQ */ + StgMutClosure *mut_link; /* next elem in mutable list */ + struct StgClosure_ *payload[FLEXIBLE_ARRAY];/* contents of the closure */ +} StgBlockingQueueElement; + +/* only difference to std code is type of the elem in the BQ */ +typedef struct StgBlockingQueue_ { + StgHeader header; + struct StgBlockingQueueElement_ *blocking_queue; /* start of the BQ */ + StgMutClosure *mut_link; /* next elem in mutable list */ +} StgBlockingQueue; + +/* this closure is hanging at the end of a blocking queue in (see RBH.c) */ +typedef struct StgRBHSave_ { StgHeader header; - void *ga; /* type globalAddr is abstract here */ + StgClosure *payload[FLEXIBLE_ARRAY]; /* 2 words ripped out of the guts of the */ +} StgRBHSave; /* closure holding the blocking queue */ + +typedef struct StgRBH_ { + StgHeader header; + struct StgBlockingQueueElement_ *blocking_queue; /* start of the BQ */ + StgMutClosure *mut_link; /* next elem in mutable list */ +} StgRBH; + +#else + +typedef struct StgBlockingQueue_ { + StgHeader header; + struct StgTSO_ *blocking_queue; + StgMutClosure *mut_link; +} StgBlockingQueue; + +#endif + +#if defined(PAR) +/* global indirections aka FETCH_ME closures */ +typedef struct StgFetchMe_ { + StgHeader header; + globalAddr *ga; /* ptr to unique id for a closure */ + StgMutClosure *mut_link; /* next elem in mutable list */ } StgFetchMe; + +/* same contents as an ordinary StgBlockingQueue */ +typedef struct StgFetchMeBlockingQueue_ { + StgHeader header; + struct StgBlockingQueueElement_ *blocking_queue; /* start of the BQ */ + StgMutClosure *mut_link; /* next elem in mutable list */ +} StgFetchMeBlockingQueue; + +/* This is an entry in a blocking queue. It indicates a fetch request from a + TSO on another PE demanding the value of this closur. Note that a + StgBlockedFetch can only occur in a BQ. Once the node is evaluated and + updated with the result, the result will be sent back (the PE is encoded + in the globalAddr) and the StgBlockedFetch closure will be nuked. +*/ +typedef struct StgBlockedFetch_ { + StgHeader header; + struct StgBlockingQueueElement_ *link; /* next elem in the BQ */ + StgMutClosure *mut_link; /* next elem in mutable list */ + StgClosure *node; /* node to fetch */ + globalAddr ga; /* where to send the result to */ +} StgBlockedFetch; /* NB: not just a ptr to a GA */ #endif #endif /* CLOSURES_H */