projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-11-19 11:14:50 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
InfoTables.h
diff --git
a/ghc/includes/InfoTables.h
b/ghc/includes/InfoTables.h
index
f9b97eb
..
1aff768
100644
(file)
--- a/
ghc/includes/InfoTables.h
+++ b/
ghc/includes/InfoTables.h
@@
-1,5
+1,5
@@
/* ----------------------------------------------------------------------------
/* ----------------------------------------------------------------------------
- * $Id: InfoTables.h,v 1.21 2001/03/22 03:51:09 hwloidl Exp $
+ * $Id: InfoTables.h,v 1.27 2002/05/14 08:15:49 matthewc Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-14,21
+14,11
@@
Profiling info
-------------------------------------------------------------------------- */
Profiling info
-------------------------------------------------------------------------- */
-#ifdef PROFILING
-
typedef struct {
char *closure_type;
char *closure_desc;
} StgProfInfo;
typedef struct {
char *closure_type;
char *closure_desc;
} StgProfInfo;
-#else /* !PROFILING */
-
-typedef struct {
- /* empty */
-} StgProfInfo;
-
-#endif /* PROFILING */
-
/* -----------------------------------------------------------------------------
Parallelism info
-------------------------------------------------------------------------- */
/* -----------------------------------------------------------------------------
Parallelism info
-------------------------------------------------------------------------- */
@@
-42,13
+32,7
@@
typedef struct {
StgInfoTable *rbh_infoptr; /* infoptr to the RBH */
} StgParInfo;
StgInfoTable *rbh_infoptr; /* infoptr to the RBH */
} StgParInfo;
-#else /* !PAR */
-
-typedef struct {
- /* empty */
-} StgParInfo;
-
-#endif /* PAR */
+#endif /* 0 */
/*
Copied from ghc-0.29; ToDo: check this code -- HWL
/*
Copied from ghc-0.29; ToDo: check this code -- HWL
@@
-98,6
+82,14
@@
typedef struct {
#endif
/* -----------------------------------------------------------------------------
#endif
/* -----------------------------------------------------------------------------
+ Ticky info
+ -------------------------------------------------------------------------- */
+
+typedef struct {
+ /* empty */
+} StgTickyInfo;
+
+/* -----------------------------------------------------------------------------
Debugging info
-------------------------------------------------------------------------- */
Debugging info
-------------------------------------------------------------------------- */
@@
-115,6
+107,10
@@
typedef struct {
#endif /* DEBUG_CLOSURE */
#endif /* DEBUG_CLOSURE */
+/* -----------------------------------------------------------------------------
+ Closure flags
+ -------------------------------------------------------------------------- */
+
/* The type flags provide quick access to certain properties of a closure. */
#define _HNF (1<<0) /* head normal form? */
/* The type flags provide quick access to certain properties of a closure. */
#define _HNF (1<<0) /* head normal form? */
@@
-173,7
+169,7
@@
extern StgWord16 closure_flags[];
typedef struct {
StgWord size;
typedef struct {
StgWord size;
- StgWord bitmap[0];
+ StgWord bitmap[FLEXIBLE_ARRAY];
} StgLargeBitmap;
/*
} StgLargeBitmap;
/*
@@
-209,7
+205,14
@@
typedef union {
typedef StgClosure* StgSRT[];
typedef StgClosure* StgSRT[];
+/*
+ * The entry code pointer must be the first word of an info table.
+ * See the comment in ghc/rts/Storage.h (Plan C) for details.
+ */
typedef struct _StgInfoTable {
typedef struct _StgInfoTable {
+#ifndef TABLES_NEXT_TO_CODE
+ StgFunPtr entry;
+#endif
StgSRT *srt; /* pointer to the SRT table */
#if defined(PAR) || defined(GRAN)
struct _StgInfoTable *rbh_infoptr;
StgSRT *srt; /* pointer to the SRT table */
#if defined(PAR) || defined(GRAN)
struct _StgInfoTable *rbh_infoptr;
@@
-217,6
+220,9
@@
typedef struct _StgInfoTable {
#ifdef PROFILING
StgProfInfo prof;
#endif
#ifdef PROFILING
StgProfInfo prof;
#endif
+#ifdef TICKY
+ StgTickyInfo ticky;
+#endif
#ifdef DEBUG_CLOSURE
StgDebugInfo debug;
#endif
#ifdef DEBUG_CLOSURE
StgDebugInfo debug;
#endif
@@
-229,10
+235,9
@@
typedef struct _StgInfoTable {
StgWord srt_len : 16; /* } */
#endif
#ifdef TABLES_NEXT_TO_CODE
StgWord srt_len : 16; /* } */
#endif
#ifdef TABLES_NEXT_TO_CODE
- StgCode code[0];
+ StgCode code[FLEXIBLE_ARRAY];
#else
#else
- StgFunPtr entry;
- StgFunPtr vector[0];
+ StgFunPtr vector[FLEXIBLE_ARRAY];
#endif
} StgInfoTable;
#endif
} StgInfoTable;
@@
-243,7
+248,12
@@
typedef struct _StgInfoTable {
* stack. We distinguish the two by checking whether the pointer is
* into text-space or not.
*/
* stack. We distinguish the two by checking whether the pointer is
* into text-space or not.
*/
-
+
+#if ia64_TARGET_ARCH
+/* We need to give the compiler a gentle hint to put it in text-space */
+#define INFO_TBL_CONST const __attribute__((section (".text")))
+#else
#define INFO_TBL_CONST const
#define INFO_TBL_CONST const
+#endif
#endif /* INFOTABLES_H */
#endif /* INFOTABLES_H */