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-07-16 12:05:37 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
InfoMacros.h
diff --git
a/ghc/includes/InfoMacros.h
b/ghc/includes/InfoMacros.h
index
0c1c593
..
1280bad
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.19 2002/06/03 12:56:41 matthewc Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-35,12
+35,6
@@
#define PROF_INFO(type_str, desc_str)
#endif
#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):
/*
On the GranSim/GUM specific parts of the InfoTables (GRAN/PAR):
@@
-87,7
+81,6
@@
INFO_TABLE_SRT(info, /* info-table label */ \
SRT_INFO(RBH,srt_,srt_off_,srt_len_), \
INCLUDE_RBH_INFO(info), \
INIT_ENTRY(stg_RBH_##entry), \
SRT_INFO(RBH,srt_,srt_off_,srt_len_), \
INCLUDE_RBH_INFO(info), \
INIT_ENTRY(stg_RBH_##entry), \
- INIT_VECTOR \
} ; \
StgFunPtr stg_RBH_##entry (void) { \
FB_ \
} ; \
StgFunPtr stg_RBH_##entry (void) { \
FB_ \
@@
-100,7
+93,6
@@
INFO_TABLE_SRT(info, /* info-table label */ \
SRT_INFO(type,srt_,srt_off_,srt_len_), \
INCLUDE_RBH_INFO(stg_RBH_##info), \
INIT_ENTRY(entry), \
SRT_INFO(type,srt_,srt_off_,srt_len_), \
INCLUDE_RBH_INFO(stg_RBH_##info), \
INIT_ENTRY(entry), \
- INIT_VECTOR \
}
#else
}
#else
@@
-119,7
+111,6
@@
INFO_TABLE_SRT(info, /* info-table label */ \
PROF_INFO(prof_type, prof_descr) \
SRT_INFO(type,srt_,srt_off_,srt_len_), \
INIT_ENTRY(entry), \
PROF_INFO(prof_type, prof_descr) \
SRT_INFO(type,srt_,srt_off_,srt_len_), \
INIT_ENTRY(entry), \
- INIT_VECTOR \
}
#endif
}
#endif
@@
-141,7
+132,6
@@
INFO_TABLE_SRT_BITMAP(info, entry, bitmap_, srt_, srt_off_, srt_len_, \
SRT_INFO(RBH,srt_,srt_off_,srt_len_), \
INCLUDE_RBH_INFO(info), \
INIT_ENTRY(stg_RBH_##entry), \
SRT_INFO(RBH,srt_,srt_off_,srt_len_), \
INCLUDE_RBH_INFO(info), \
INIT_ENTRY(stg_RBH_##entry), \
- INIT_VECTOR \
}; \
StgFunPtr stg_RBH_##entry (void) { \
FB_ \
}; \
StgFunPtr stg_RBH_##entry (void) { \
FB_ \
@@
-154,7
+144,6
@@
INFO_TABLE_SRT_BITMAP(info, entry, bitmap_, srt_, srt_off_, srt_len_, \
SRT_INFO(type,srt_,srt_off_,srt_len_), \
INCLUDE_RBH_INFO(stg_RBH_##info), \
INIT_ENTRY(entry), \
SRT_INFO(type,srt_,srt_off_,srt_len_), \
INCLUDE_RBH_INFO(stg_RBH_##info), \
INIT_ENTRY(entry), \
- INIT_VECTOR \
}
#else
}
#else
@@
-169,7
+158,6
@@
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_), \
INIT_ENTRY(entry), \
PROF_INFO(prof_type, prof_descr) \
SRT_INFO(type,srt_,srt_off_,srt_len_), \
INIT_ENTRY(entry), \
- INIT_VECTOR \
}
#endif
}
#endif
@@
-189,7
+177,6
@@
INFO_TABLE(info, entry, ptrs, nptrs, type, info_class, \
STD_INFO(RBH), \
INCLUDE_RBH_INFO(info), \
INIT_ENTRY(stg_RBH_##entry), \
STD_INFO(RBH), \
INCLUDE_RBH_INFO(info), \
INIT_ENTRY(stg_RBH_##entry), \
- INIT_VECTOR \
} ; \
StgFunPtr stg_RBH_##entry (void) { \
FB_ \
} ; \
StgFunPtr stg_RBH_##entry (void) { \
FB_ \
@@
-202,7
+189,6
@@
INFO_TABLE(info, entry, ptrs, nptrs, type, info_class, \
STD_INFO(type), \
INCLUDE_RBH_INFO(stg_RBH_##info), \
INIT_ENTRY(entry), \
STD_INFO(type), \
INCLUDE_RBH_INFO(stg_RBH_##info), \
INIT_ENTRY(entry), \
- INIT_VECTOR \
}
#else
}
#else
@@
-216,7
+202,6
@@
INFO_TABLE(info, entry, ptrs, nptrs, type, info_class, \
PROF_INFO(prof_type, prof_descr) \
STD_INFO(type), \
INIT_ENTRY(entry), \
PROF_INFO(prof_type, prof_descr) \
STD_INFO(type), \
INIT_ENTRY(entry), \
- INIT_VECTOR \
}
#endif
}
#endif
@@
-237,7
+222,6
@@
INFO_TABLE_SELECTOR(info, entry, offset, info_class, \
STD_INFO(RBH), \
INCLUDE_RBH_INFO(info), \
INIT_ENTRY(stg_RBH_##entry), \
STD_INFO(RBH), \
INCLUDE_RBH_INFO(info), \
INIT_ENTRY(stg_RBH_##entry), \
- INIT_VECTOR \
}; \
StgFunPtr stg_RBH_##entry (void) { \
FB_ \
}; \
StgFunPtr stg_RBH_##entry (void) { \
FB_ \
@@
-250,7
+234,6
@@
INFO_TABLE_SELECTOR(info, entry, offset, info_class, \
STD_INFO(THUNK_SELECTOR), \
INCLUDE_RBH_INFO(stg_RBH_##info), \
INIT_ENTRY(entry), \
STD_INFO(THUNK_SELECTOR), \
INCLUDE_RBH_INFO(stg_RBH_##info), \
INIT_ENTRY(entry), \
- INIT_VECTOR \
}
#else
}
#else
@@
-264,7
+247,6
@@
INFO_TABLE_SELECTOR(info, entry, offset, info_class, \
PROF_INFO(prof_type, prof_descr) \
STD_INFO(THUNK_SELECTOR), \
INIT_ENTRY(entry), \
PROF_INFO(prof_type, prof_descr) \
STD_INFO(THUNK_SELECTOR), \
INIT_ENTRY(entry), \
- INIT_VECTOR \
}
#endif
}
#endif
@@
-280,7
+262,6
@@
INFO_TABLE_CONSTR(info, entry, ptrs, nptrs, tag_,type_,info_class, \
PROF_INFO(prof_type, prof_descr) \
CONSTR_INFO(type_,tag_), \
INIT_ENTRY(entry), \
PROF_INFO(prof_type, prof_descr) \
CONSTR_INFO(type_,tag_), \
INIT_ENTRY(entry), \
- INIT_VECTOR \
}
#define constrTag(con) (get_itbl(con)->srt_len)
}
#define constrTag(con) (get_itbl(con)->srt_len)
@@
-575,7
+556,6
@@
typedef vec_info_8 StgPolyInfoTable;
i : { layout : { bitmap : (StgWord)bitmap_ }, \
SRT_INFO(type,srt_,srt_off_,srt_len_), \
INIT_ENTRY(nm##_entry), \
i : { layout : { bitmap : (StgWord)bitmap_ }, \
SRT_INFO(type,srt_,srt_off_,srt_len_), \
INIT_ENTRY(nm##_entry), \
- INIT_VECTOR \
}, \
vec : { \
(F_) nm##_0_entry, \
}, \
vec : { \
(F_) nm##_0_entry, \