From b67f18569f3be1118d7325cde71c8a0bc1508655 Mon Sep 17 00:00:00 2001 From: stolz Date: Fri, 14 Nov 2003 14:28:08 +0000 Subject: [PATCH] [project @ 2003-11-14 14:28:07 by stolz] Revert previous commit on request --- ghc/includes/Closures.h | 26 ++++++------ ghc/includes/InfoTables.h | 100 ++++++++++++++++++++++----------------------- ghc/includes/Regs.h | 10 ++--- ghc/includes/Stg.h | 4 +- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/ghc/includes/Closures.h b/ghc/includes/Closures.h index 93fadd2..1b4fb0a 100644 --- a/ghc/includes/Closures.h +++ b/ghc/includes/Closures.h @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: Closures.h,v 1.34 2003/11/14 09:27:00 stolz Exp $ + * $Id: Closures.h,v 1.35 2003/11/14 14:28:07 stolz Exp $ * * (c) The GHC Team, 1998-1999 * @@ -22,8 +22,8 @@ typedef struct { CostCentreStack *ccs; union { - struct _RetainerSet *rs; /* Retainer Set */ - StgWord ldvw; /* Lag/Drag/Void Word */ + struct _RetainerSet *rs; // Retainer Set + StgWord ldvw; // Lag/Drag/Void Word } hp; } StgProfHeader; @@ -95,14 +95,14 @@ typedef struct { StgClosure *payload[FLEXIBLE_ARRAY]; } StgPAP; -/* AP closures have the same layout, for convenience */ +// AP closures have the same layout, for convenience typedef StgPAP StgAP; typedef struct { StgHeader header; - StgWord size; /* number of words in payload */ + StgWord size; // number of words in payload StgClosure *fun; - StgClosure *payload[FLEXIBLE_ARRAY]; /* contains a chunk of *stack* */ + StgClosure *payload[FLEXIBLE_ARRAY]; // contains a chunk of *stack* } StgAP_STACK; typedef struct { @@ -218,13 +218,13 @@ typedef struct _StgDeadWeak { /* Weak v */ 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 */ - StgHalfWord arity; /* arity of this BCO */ - StgHalfWord size; /* size of this BCO (in words) */ - StgWord bitmap[FLEXIBLE_ARRAY]; /* an StgLargeBitmap */ + 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 + StgHalfWord arity; // arity of this BCO + StgHalfWord size; // size of this BCO (in words) + StgWord bitmap[FLEXIBLE_ARRAY]; // an StgLargeBitmap } StgBCO; #define BCO_BITMAP(bco) ((StgLargeBitmap *)((StgBCO *)(bco))->bitmap) diff --git a/ghc/includes/InfoTables.h b/ghc/includes/InfoTables.h index 2c300cf..5284932 100644 --- a/ghc/includes/InfoTables.h +++ b/ghc/includes/InfoTables.h @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: InfoTables.h,v 1.31 2003/11/14 09:27:00 stolz Exp $ + * $Id: InfoTables.h,v 1.32 2003/11/14 14:28:08 stolz Exp $ * * (c) The GHC Team, 1998-2002 * @@ -171,19 +171,19 @@ extern StgWord16 closure_flags[]; the layout of a PAP to the GC). -------------------------------------------------------------------------- */ -/* - 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. -*/ +// +// 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. -*/ +// +// A large bitmap. +// typedef struct { StgWord size; StgWord bitmap[FLEXIBLE_ARRAY]; @@ -198,15 +198,15 @@ typedef struct { garbage-collect CAFs. -------------------------------------------------------------------------- */ -/* An SRT is just an array of closure pointers: */ +// 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: */ +// 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; @@ -216,30 +216,30 @@ typedef struct 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. -*/ +// +// 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 { /* Heap closure payload layout: */ - StgHalfWord ptrs; /* number of pointers */ - StgHalfWord nptrs; /* number of non-pointers */ + 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 */ + StgWord bitmap; // word-sized bit pattern describing + // a stack frame: see below - StgLargeBitmap* large_bitmap; /* pointer to large bitmap structure */ + StgLargeBitmap* large_bitmap; // pointer to large bitmap structure - StgWord selector_offset; /* used in THUNK_SELECTORs */ + StgWord selector_offset; // used in THUNK_SELECTORs } StgClosureInfo; -/* - The "standard" part of an info table. Every info table has this bit. -*/ +// +// The "standard" part of an info table. Every info table has this bit. +// typedef struct _StgInfoTable { #ifndef TABLES_NEXT_TO_CODE @@ -259,10 +259,10 @@ typedef struct _StgInfoTable { MAYBE_EMPTY_STRUCT(StgDebugInfo,debug) #endif - StgClosureInfo layout; /* closure layout info (one word) */ + StgClosureInfo layout; // closure layout info (one word) - StgHalfWord type; /* closure type */ - StgHalfWord srt_bitmap; /* number of entries in SRT (or constructor tag) */ + StgHalfWord type; // closure type + StgHalfWord srt_bitmap; // number of entries in SRT (or constructor tag) #ifdef TABLES_NEXT_TO_CODE StgCode code[FLEXIBLE_ARRAY]; @@ -287,19 +287,19 @@ typedef struct _StgInfoTable { typedef struct _StgFunInfoTable { #if defined(TABLES_NEXT_TO_CODE) - 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 */ + 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 StgInfoTable i; #else StgInfoTable i; - 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 */ + 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 #endif } StgFunInfoTable; @@ -307,14 +307,14 @@ typedef struct _StgFunInfoTable { Return info tables -------------------------------------------------------------------------- */ -/* When info tables are laid out backwards, we can omit the SRT - pointer iff srt_bitmap is zero. */ +// When info tables are laid out backwards, we can omit the SRT +// pointer iff srt_bitmap is zero. typedef struct _StgRetInfoTable { #if !defined(TABLES_NEXT_TO_CODE) StgInfoTable i; #endif - StgSRT *srt; /* pointer to the SRT table */ + StgSRT *srt; // pointer to the SRT table #if defined(TABLES_NEXT_TO_CODE) StgInfoTable i; #endif @@ -327,14 +327,14 @@ typedef struct _StgRetInfoTable { Thunk info tables -------------------------------------------------------------------------- */ -/* When info tables are laid out backwards, we can omit the SRT - pointer iff srt_bitmap is zero. */ +// 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 */ + StgSRT *srt; // pointer to the SRT table #if defined(TABLES_NEXT_TO_CODE) StgInfoTable i; #endif diff --git a/ghc/includes/Regs.h b/ghc/includes/Regs.h index 066c3b2..8afc6c9 100644 --- a/ghc/includes/Regs.h +++ b/ghc/includes/Regs.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Regs.h,v 1.13 2003/11/14 09:27:00 stolz Exp $ + * $Id: Regs.h,v 1.14 2003/11/14 14:28:08 stolz Exp $ * * (c) The GHC Team, 1998-1999 * @@ -46,8 +46,8 @@ typedef struct StgRegTable_ { StgUnion rR6; StgUnion rR7; StgUnion rR8; - StgUnion rR9; /* used occasionally by heap/stack checks */ - StgUnion rR10; /* used occasionally by heap/stack checks */ + StgUnion rR9; // used occasionally by heap/stack checks + StgUnion rR10; // used occasionally by heap/stack checks StgFloat rF1; StgFloat rF2; StgFloat rF3; @@ -62,9 +62,9 @@ typedef struct StgRegTable_ { StgTSO *rCurrentTSO; struct _bdescr *rNursery; struct _bdescr *rCurrentNursery; - StgWord rHpAlloc; /* number of words being allocated in heap */ + StgWord rHpAlloc; // number of words being allocated in heap #if defined(SMP) || defined(PAR) - StgSparkPool rSparks; /* per-task spark pool */ + StgSparkPool rSparks; // per-task spark pool #endif } StgRegTable; diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h index 5249d0f..f37c22f 100644 --- a/ghc/includes/Stg.h +++ b/ghc/includes/Stg.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Stg.h,v 1.58 2003/11/14 09:27:02 stolz Exp $ + * $Id: Stg.h,v 1.59 2003/11/14 14:28:08 stolz Exp $ * * (c) The GHC Team, 1998-1999 * @@ -105,7 +105,7 @@ /* * 'Portable' */ -#if defined(__GNUC__) || defined(__TenDRA__) +#if defined(__GNUC__) # define INLINE_HEADER static inline # define INLINE_ME inline # define STATIC_INLINE INLINE_HEADER -- 1.7.10.4