[project @ 1999-06-25 09:13:37 by simonmar]

[ghc-hetmet.git] / ghc / includes / InfoTables.h

diff --git a/ghc/includes/InfoTables.h b/ghc/includes/InfoTables.h
index 9873302..6e3908d 100644 (file)
--- a/ghc/includes/InfoTables.h
+++ b/ghc/includes/InfoTables.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: InfoTables.h,v 1.14 1999/03/18 17:57:19 simonm Exp $
+ * $Id: InfoTables.h,v 1.16 1999/06/25 09:13:37 simonmar Exp $
  * 
  * (c) The GHC Team, 1998-1999
  *
@@ -173,12 +173,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 */