[m-rev.] diff: part 2 of the change to fix failures involving type_ctor_descs
Zoltan Somogyi
zs at cs.mu.OZ.AU
Mon May 6 18:23:13 AEST 2002
Part 2 of the change to fix test case failures involving type_ctor_descs.
runtime/mercury_type_info.h:
Delete the code required to bootstrap the first part of this change.
Increase the minimum RTTI version number.
runtime/mercury_grade.h:
Increase the binary compatibility version number, as required by
the increase in the minimum RTTI version number.
Zoltan.
cvs diff: Diffing .
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing java
cvs diff: Diffing java/library
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
Index: runtime/mercury_grade.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_grade.h,v
retrieving revision 1.36
diff -u -b -r1.36 mercury_grade.h
--- runtime/mercury_grade.h 2002/02/26 09:28:48 1.36
+++ runtime/mercury_grade.h 2002/04/21 04:43:03
@@ -52,7 +52,7 @@
** RTTI version number.
*/
-#define MR_GRADE_PART_0 v5_
+#define MR_GRADE_PART_0 v6_
#ifdef MR_HIGHLEVEL_CODE
Index: runtime/mercury_type_info.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_type_info.h,v
retrieving revision 1.90
diff -u -b -r1.90 mercury_type_info.h
--- runtime/mercury_type_info.h 2002/04/24 07:37:38 1.90
+++ runtime/mercury_type_info.h 2002/05/03 09:44:37
@@ -90,18 +90,8 @@
*/
#define MR_TYPE_CTOR_INFO_CHECK_RTTI_VERSION_RANGE(typector) \
- ( assert(typector->MR_type_ctor_version == MR_RTTI_VERSION__COMPACT) \
- || assert(typector->MR_type_ctor_version == MR_RTTI_VERSION__REP))
+ assert(typector->MR_type_ctor_version == MR_RTTI_VERSION__REP)
-#ifdef MR_BOOTSTRAP_TYPE_CTOR_REP
- #define MR_TypeCtorInfo_Struct MR_NewTypeCtorInfo_Struct
-#else
- #define MR_TypeCtorInfo_Struct MR_OldTypeCtorInfo_Struct
-#endif
-
-typedef const struct MR_NewTypeCtorInfo_Struct *MR_NewTypeCtorInfo;
-typedef const struct MR_OldTypeCtorInfo_Struct *MR_OldTypeCtorInfo;
-
/*---------------------------------------------------------------------------*/
/* Forward declarations */
@@ -537,11 +527,7 @@
** value.
*/
-#ifdef MR_BOOTSTRAP_TYPE_CTOR_REP
- typedef MR_int_least16_t MR_TypeCtorRepInt;
-#else
- typedef MR_int_least8_t MR_TypeCtorRepInt;
-#endif
+typedef MR_int_least16_t MR_TypeCtorRepInt;
/*
** This macro is intended to be used for the initialization of an array
@@ -967,32 +953,12 @@
** files listed at the top of this file, as well as in the macros below.
*/
-struct MR_OldTypeCtorInfo_Struct {
- MR_Integer MR_type_ctor_arity;
- MR_int_least8_t MR_type_ctor_version;
- MR_TypeCtorRepInt MR_type_ctor_rep_CAST_ME;
- MR_int_least8_t MR_type_ctor_num_ptags; /* if DU */
- MR_ProcAddr MR_type_ctor_unify_pred;
- MR_ProcAddr MR_type_ctor_compare_pred;
- MR_ConstString MR_type_ctor_module_name;
- MR_ConstString MR_type_ctor_name;
- MR_TypeFunctors MR_type_ctor_functors;
- MR_TypeLayout MR_type_ctor_layout;
- MR_int_least32_t MR_type_ctor_num_functors;
-
-/*
-** The following fields will be added later, once we can exploit them:
-** union MR_TableNode_Union **type_std_table;
-** MR_ProcAddr prettyprinter;
-*/
-};
-
/*
** The type of the MR_type_ctor_rep_CAST_ME field should be returned
** to MR_TypeCtorRepInt when bootstrapping is complete.
*/
-struct MR_NewTypeCtorInfo_Struct {
+struct MR_TypeCtorInfo_Struct {
MR_Integer MR_type_ctor_arity;
MR_int_least8_t MR_type_ctor_version;
MR_int_least8_t MR_type_ctor_num_ptags; /* if DU */
@@ -1013,15 +979,10 @@
};
#define MR_type_ctor_rep(tci) \
- ((MR_TypeCtorRep) \
- ((tci)->MR_type_ctor_version == MR_RTTI_VERSION__REP) ? \
- (((MR_NewTypeCtorInfo) (tci))->MR_type_ctor_rep_CAST_ME) : \
- (((MR_OldTypeCtorInfo) (tci))->MR_type_ctor_rep_CAST_ME))
+ ((MR_TypeCtorRep) ((tci)->MR_type_ctor_rep_CAST_ME))
#define MR_type_ctor_num_ptags(tci) \
- (((tci)->MR_type_ctor_version == MR_RTTI_VERSION__REP) ? \
- (((MR_NewTypeCtorInfo) (tci))->MR_type_ctor_num_ptags) : \
- (((MR_OldTypeCtorInfo) (tci))->MR_type_ctor_num_ptags))
+ ((tci)->MR_type_ctor_num_ptags)
#define MR_type_ctor_module_name(tci) \
((tci)->MR_type_ctor_module_name)
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
post: mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------
More information about the reviews
mailing list