projects / ghc-hetmet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[project @ 2002-11-22 06:54:05 by matthewc]
[ghc-hetmet.git] / ghc / includes / InfoMacros.h
diff --git a/ghc/includes/InfoMacros.h b/ghc/includes/InfoMacros.h
index 0c1c593..ecbd793 100644 (file)
--- a/ghc/includes/InfoMacros.h
+++ b/ghc/includes/InfoMacros.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: InfoMacros.h,v 1.17 2001/09/17 22:46:59 ken Exp $
+ * $Id: InfoMacros.h,v 1.20 2002/09/25 20:43:34 wolfgang Exp $
  * 
  * (c) The GHC Team, 1998-1999
  *
@@ -35,12 +35,6 @@
 #define PROF_INFO(type_str, desc_str)
 #endif
 
-#ifdef USE_MINIINTERPRETER
-#define INIT_VECTOR {}
-#else
-#define INIT_VECTOR
-#endif
-
 /*
   On the GranSim/GUM specific parts of the InfoTables (GRAN/PAR):
 
@@ -86,8 +80,7 @@ INFO_TABLE_SRT(info,                          /* info-table label */  \
                 PROF_INFO(prof_type, prof_descr)                       \
                SRT_INFO(RBH,srt_,srt_off_,srt_len_),                   \
                 INCLUDE_RBH_INFO(info),                                        \
-                INIT_ENTRY(stg_RBH_##entry),                                   \
-                INIT_VECTOR                                             \
+                INIT_ENTRY(stg_RBH_##entry)                            \
        } ;                                                             \
         StgFunPtr stg_RBH_##entry (void) {                                  \
           FB_                                                           \
@@ -99,8 +92,7 @@ INFO_TABLE_SRT(info,                          /* info-table label */  \
                 PROF_INFO(prof_type, prof_descr)                       \
                SRT_INFO(type,srt_,srt_off_,srt_len_),                  \
                 INCLUDE_RBH_INFO(stg_RBH_##info),                              \
-                INIT_ENTRY(entry),                                      \
-                INIT_VECTOR                                             \
+                INIT_ENTRY(entry)                                       \
        }
 
 #else
@@ -118,8 +110,7 @@ INFO_TABLE_SRT(info,                                /* info-table label */  \
                layout : { payload : {ptrs,nptrs} },                    \
                 PROF_INFO(prof_type, prof_descr)                       \
                SRT_INFO(type,srt_,srt_off_,srt_len_),                  \
-                INIT_ENTRY(entry),                                      \
-                INIT_VECTOR                                             \
+                INIT_ENTRY(entry)                                       \
        }
 
 #endif
@@ -140,8 +131,7 @@ INFO_TABLE_SRT_BITMAP(info, entry, bitmap_, srt_, srt_off_, srt_len_,       \
                 PROF_INFO(prof_type, prof_descr)                       \
                SRT_INFO(RBH,srt_,srt_off_,srt_len_),                   \
                 INCLUDE_RBH_INFO(info),                                        \
-                INIT_ENTRY(stg_RBH_##entry),                           \
-                INIT_VECTOR                                            \
+                INIT_ENTRY(stg_RBH_##entry)                            \
        };                                                              \
         StgFunPtr stg_RBH_##entry (void) {                              \
           FB_                                                           \
@@ -153,8 +143,7 @@ INFO_TABLE_SRT_BITMAP(info, entry, bitmap_, srt_, srt_off_, srt_len_,       \
                 PROF_INFO(prof_type, prof_descr)                       \
                SRT_INFO(type,srt_,srt_off_,srt_len_),                  \
                 INCLUDE_RBH_INFO(stg_RBH_##info),                      \
-                INIT_ENTRY(entry),                                     \
-                INIT_VECTOR                                            \
+                INIT_ENTRY(entry)                                      \
        }
 
 #else
@@ -168,8 +157,7 @@ INFO_TABLE_SRT_BITMAP(info, entry, bitmap_, srt_, srt_off_, srt_len_,       \
                layout : { bitmap : (StgWord)bitmap_ },                 \
                 PROF_INFO(prof_type, prof_descr)                       \
                SRT_INFO(type,srt_,srt_off_,srt_len_),                  \
-                INIT_ENTRY(entry),                                     \
-                INIT_VECTOR                                            \
+                INIT_ENTRY(entry)                                      \
        }
 #endif
 
@@ -188,8 +176,7 @@ INFO_TABLE(info, entry, ptrs, nptrs, type, info_class,              \
                 PROF_INFO(prof_type, prof_descr)               \
                STD_INFO(RBH),                                  \
                 INCLUDE_RBH_INFO(info),                                \
-                INIT_ENTRY(stg_RBH_##entry),                   \
-                INIT_VECTOR                                    \
+                INIT_ENTRY(stg_RBH_##entry)                    \
        } ;                                                     \
         StgFunPtr stg_RBH_##entry (void) {                          \
           FB_                                                   \
@@ -201,8 +188,7 @@ INFO_TABLE(info, entry, ptrs, nptrs, type, info_class,              \
                 PROF_INFO(prof_type, prof_descr)               \
                STD_INFO(type),                                 \
                 INCLUDE_RBH_INFO(stg_RBH_##info),                      \
-                INIT_ENTRY(entry),                             \
-                INIT_VECTOR                                    \
+                INIT_ENTRY(entry)                              \
        }
 
 #else
@@ -215,8 +201,7 @@ INFO_TABLE(info, entry, ptrs, nptrs, type, info_class,      \
                layout : { payload : {ptrs,nptrs} },    \
                 PROF_INFO(prof_type, prof_descr)       \
                STD_INFO(type),                         \
-                INIT_ENTRY(entry),                     \
-                INIT_VECTOR                            \
+                INIT_ENTRY(entry)                      \
        }
 
 #endif
@@ -236,8 +221,7 @@ INFO_TABLE_SELECTOR(info, entry, offset, info_class,                \
                 PROF_INFO(prof_type, prof_descr)               \
                STD_INFO(RBH),                                  \
                 INCLUDE_RBH_INFO(info),                                \
-                INIT_ENTRY(stg_RBH_##entry),                   \
-                INIT_VECTOR                                    \
+                INIT_ENTRY(stg_RBH_##entry)                    \
        };                                                      \
         StgFunPtr stg_RBH_##entry (void) {                          \
           FB_                                                   \
@@ -249,8 +233,7 @@ INFO_TABLE_SELECTOR(info, entry, offset, info_class,                \
                 PROF_INFO(prof_type, prof_descr)               \
                STD_INFO(THUNK_SELECTOR),                       \
                 INCLUDE_RBH_INFO(stg_RBH_##info),                      \
-                INIT_ENTRY(entry),                             \
-                INIT_VECTOR                                    \
+                INIT_ENTRY(entry)                              \
        }
 
 #else
@@ -263,8 +246,7 @@ INFO_TABLE_SELECTOR(info, entry, offset, info_class,        \
                layout : { selector_offset : offset },  \
                 PROF_INFO(prof_type, prof_descr)       \
                STD_INFO(THUNK_SELECTOR),               \
-                INIT_ENTRY(entry),                     \
-                INIT_VECTOR                            \
+                INIT_ENTRY(entry)                      \
        }
 
 #endif
@@ -279,8 +261,7 @@ INFO_TABLE_CONSTR(info, entry, ptrs, nptrs, tag_,type_,info_class,  \
                layout : { payload : {ptrs,nptrs} },                    \
                 PROF_INFO(prof_type, prof_descr)                       \
                 CONSTR_INFO(type_,tag_),                               \
-                INIT_ENTRY(entry),                                     \
-                INIT_VECTOR                                            \
+                INIT_ENTRY(entry)                                      \
        }
 
 #define constrTag(con) (get_itbl(con)->srt_len)
@@ -472,7 +453,7 @@ typedef struct {
        info_class INFO_TBL_CONST vec_info_2 info = {           \
                i : { layout : { bitmap : (StgWord)bitmap_ },   \
                      SRT_INFO(type,srt_,srt_off_,srt_len_),    \
-                     INIT_ENTRY(NULL),                         \
+                     INIT_ENTRY(NULL)                          \
                },                                              \
                vec : { alt_1, alt_2 }                          \
        }
@@ -484,7 +465,7 @@ typedef struct {
        info_class INFO_TBL_CONST vec_info_3 info = {           \
                i : { layout : { bitmap : (StgWord)bitmap_ },   \
                      SRT_INFO(type,srt_,srt_off_,srt_len_),    \
-                     INIT_ENTRY(NULL),                         \
+                     INIT_ENTRY(NULL)                          \
                },                                              \
                 vec : { alt_1, alt_2, alt_3 }                  \
        }
@@ -496,7 +477,7 @@ typedef struct {
        info_class INFO_TBL_CONST vec_info_4 info = {           \
                i : { layout : { bitmap : (StgWord)bitmap_ },   \
                      SRT_INFO(type,srt_,srt_off_,srt_len_),    \
-                     INIT_ENTRY(NULL),                         \
+                     INIT_ENTRY(NULL)                          \
                },                                              \
                 vec : { alt_1, alt_2, alt_3, alt_4 }           \
        }
@@ -509,7 +490,7 @@ typedef struct {
        info_class INFO_TBL_CONST vec_info_5 info = {           \
                i : { layout : { bitmap : (StgWord)bitmap_ },   \
                      SRT_INFO(type,srt_,srt_off_,srt_len_),    \
-                     INIT_ENTRY(NULL),                         \
+                     INIT_ENTRY(NULL)                          \
                },                                              \
                 vec : { alt_1, alt_2, alt_3, alt_4,            \
                        alt_5 }                                 \
@@ -523,7 +504,7 @@ typedef struct {
        info_class INFO_TBL_CONST vec_info_6 info = {           \
                i : { layout : { bitmap : (StgWord)bitmap_ },   \
                      SRT_INFO(type,srt_,srt_off_,srt_len_),    \
-                     INIT_ENTRY(NULL),                         \
+                     INIT_ENTRY(NULL)                          \
                },                                              \
                 vec : { alt_1, alt_2, alt_3, alt_4,            \
                        alt_5, alt_6 }                          \
@@ -537,7 +518,7 @@ typedef struct {
        info_class INFO_TBL_CONST vec_info_7 info = {           \
                i : { layout : { bitmap : (StgWord)bitmap_ },   \
                      SRT_INFO(type,srt_,srt_off_,srt_len_),    \
-                     INIT_ENTRY(NULL),                         \
+                     INIT_ENTRY(NULL)                          \
                },                                              \
                 vec : { alt_1, alt_2, alt_3, alt_4,            \
                        alt_5, alt_6, alt_7 }                   \
@@ -551,7 +532,7 @@ typedef struct {
        info_class INFO_TBL_CONST vec_info_8 info = {           \
                i : { layout : { bitmap : (StgWord)bitmap_ },   \
                      SRT_INFO(type,srt_,srt_off_,srt_len_),    \
-                     INIT_ENTRY(NULL),                         \
+                     INIT_ENTRY(NULL)                          \
                },                                              \
                 vec : { alt_1, alt_2, alt_3, alt_4,            \
                        alt_5, alt_6, alt_7, alt_8 }            \
@@ -574,8 +555,7 @@ typedef vec_info_8 StgPolyInfoTable;
   info_class INFO_TBL_CONST vec_info_8 nm##_info = {           \
                i : { layout : { bitmap : (StgWord)bitmap_ },   \
                      SRT_INFO(type,srt_,srt_off_,srt_len_),    \
-                      INIT_ENTRY(nm##_entry),                  \
-                     INIT_VECTOR                               \
+                      INIT_ENTRY(nm##_entry)                   \
                },                                              \
                vec : {                                         \
                        (F_) nm##_0_entry,                      \
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)