RTS tidyup sweep, first phase

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

diff --git a/includes/InfoTables.h b/includes/rts/storage/InfoTables.h
similarity index 97%
rename from includes/InfoTables.h
rename to includes/rts/storage/InfoTables.h
index 0c6ab52..4596ce2 100644 (file)
--- a/includes/InfoTables.h
+++ b/includes/rts/storage/InfoTables.h
@@ -6,8 +6,8 @@
  *
  * -------------------------------------------------------------------------- */
 
-#ifndef INFOTABLES_H
-#define INFOTABLES_H
+#ifndef RTS_STORAGE_INFOTABLES_H
+#define RTS_STORAGE_INFOTABLES_H
 
 /* ----------------------------------------------------------------------------
    Relative pointers
@@ -212,11 +212,7 @@ typedef union {
 /*
  * The "standard" part of an info table.  Every info table has this bit.
  */
-typedef struct _StgInfoTable {
-
-#ifndef TABLES_NEXT_TO_CODE
-    StgFunPtr       entry;     /* pointer to the entry code */
-#endif
+typedef struct StgInfoTable_ {
 
 #ifdef PROFILING
     StgProfInfo     prof;
@@ -236,7 +232,7 @@ typedef struct _StgInfoTable {
 #ifdef TABLES_NEXT_TO_CODE
     StgCode         code[FLEXIBLE_ARRAY];
 #endif
-} StgInfoTable;
+} *StgInfoTablePtr;
 
 
 /* -----------------------------------------------------------------------------
@@ -254,7 +250,7 @@ typedef struct _StgInfoTable {
       bitmap fields have also been omitted.
    -------------------------------------------------------------------------- */
 
-typedef struct _StgFunInfoExtraRev {
+typedef struct StgFunInfoExtraRev_ {
     OFFSET_FIELD ( slow_apply_offset ); /* apply to args on the stack */
     union { 
        StgWord bitmap;
@@ -265,7 +261,7 @@ typedef struct _StgFunInfoExtraRev {
     StgHalfWord    arity;       /* function arity */
 } StgFunInfoExtraRev;
 
-typedef struct _StgFunInfoExtraFwd {
+typedef struct StgFunInfoExtraFwd_ {
     StgHalfWord    fun_type;    /* function type */
     StgHalfWord    arity;       /* function arity */
     StgSRT         *srt;       /* pointer to the SRT table */
@@ -313,7 +309,7 @@ typedef struct {
  * pointer iff srt_bitmap is zero.
  */
 
-typedef struct _StgThunkInfoTable {
+typedef struct StgThunkInfoTable_ {
 #if !defined(TABLES_NEXT_TO_CODE)
     StgInfoTable i;
 #endif
@@ -331,7 +327,7 @@ typedef struct _StgThunkInfoTable {
    Constructor info tables
    -------------------------------------------------------------------------- */
 
-typedef struct _StgConInfoTable {
+typedef struct StgConInfoTable_ {
 #if !defined(TABLES_NEXT_TO_CODE)
     StgInfoTable i;
 #endif
@@ -410,4 +406,5 @@ typedef struct _StgConInfoTable {
 #else
 #define GET_PROF_DESC(info) ((info)->prof.closure_desc)
 #endif
-#endif /* INFOTABLES_H */
+
+#endif /* RTS_STORAGE_INFOTABLES_H */