[m-rev.] diff: remove obsolete variables

[Zoltan Somogyi]

util/mkinit.c:
	Do not generate assignments to the variables that used to hold the
	address of the type_ctor_infos of the variable arity type_ctor_infos,
	since those variables aren't needed anymore.

runtime/mercury_wrapper.[ch]:
	Delete those variables.

Zoltan.

cvs diff: Diffing .
cvs diff: Diffing bench
cvs diff: Diffing bench/progs
cvs diff: Diffing bench/progs/compress
cvs diff: Diffing bench/progs/icfp2000
cvs diff: Diffing bench/progs/icfp2001
cvs diff: Diffing bench/progs/nuc
cvs diff: Diffing bench/progs/ray
cvs diff: Diffing bench/progs/tree234
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_wrapper.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_wrapper.c,v
retrieving revision 1.110
diff -u -b -r1.110 mercury_wrapper.c
--- runtime/mercury_wrapper.c	11 Sep 2002 07:20:28 -0000	1.110
+++ runtime/mercury_wrapper.c	19 Sep 2002 05:37:34 -0000
@@ -264,10 +264,6 @@
 
 int	(*MR_address_of_do_load_aditi_rl_code)(void);
 
-MR_TypeCtorInfo	MR_address_of_type_ctor_info_for_func;
-MR_TypeCtorInfo	MR_address_of_type_ctor_info_for_pred;
-MR_TypeCtorInfo	MR_address_of_type_ctor_info_for_tuple;
-
 char	*(*MR_address_of_trace_getline)(const char *, FILE *, FILE *);
 char	*(*MR_address_of_trace_get_command)(const char *, FILE *, FILE *);
 const char *
Index: runtime/mercury_wrapper.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_wrapper.h,v
retrieving revision 1.54
diff -u -b -r1.54 mercury_wrapper.h
--- runtime/mercury_wrapper.h	21 Aug 2002 11:27:44 -0000	1.54
+++ runtime/mercury_wrapper.h	19 Sep 2002 05:37:37 -0000
@@ -99,10 +99,6 @@
 
 extern	int		(*MR_address_of_do_load_aditi_rl_code)(void);
 
-extern	MR_TypeCtorInfo	MR_address_of_type_ctor_info_for_func;
-extern	MR_TypeCtorInfo	MR_address_of_type_ctor_info_for_pred;
-extern	MR_TypeCtorInfo	MR_address_of_type_ctor_info_for_tuple;
-
 /*
 ** MR_trace_getline(const char *, FILE *, FILE *) and
 ** MR_trace_get_command(const char *, FILE *, FILE *) are defined in
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
Index: util/mkinit.c
===================================================================
RCS file: /home/mercury1/repository/mercury/util/mkinit.c,v
retrieving revision 1.88
diff -u -b -r1.88 mkinit.c
--- util/mkinit.c	21 Aug 2002 16:01:45 -0000	1.88
+++ util/mkinit.c	19 Sep 2002 05:37:05 -0000
@@ -249,22 +249,6 @@
 	"  #endif\n"
 	"#endif\n"
 	"\n"
-	"#ifdef MR_HIGHLEVEL_CODE\n"
-	"extern const struct MR_TypeCtorInfo_Struct\n"
-	"		mercury__builtin__builtin__type_ctor_info_func_0;\n"
-	"extern const struct MR_TypeCtorInfo_Struct\n"
-	"		mercury__builtin__builtin__type_ctor_info_pred_0;\n"
-	"extern const struct MR_TypeCtorInfo_Struct\n"
-	"		mercury__builtin__builtin__type_ctor_info_tuple_0;\n"
-	"#else\n"
-	"extern const struct MR_TypeCtorInfo_Struct\n"
-	"		mercury_data_builtin__type_ctor_info_func_0;\n"
-	"extern const struct MR_TypeCtorInfo_Struct\n"
-	"		mercury_data_builtin__type_ctor_info_pred_0;\n"
-	"extern const struct MR_TypeCtorInfo_Struct\n"
-	"		mercury_data_builtin__type_ctor_info_tuple_0;\n"
-	"#endif\n"
-	"\n"
 	"void\n"
 	"mercury_init(int argc, char **argv, void *stackbottom)\n"
 	"{\n"
@@ -304,21 +288,6 @@
 	"		write_out_proc_statics;\n"
 	"#endif\n"
 	"	MR_address_of_do_load_aditi_rl_code = %s;\n"
-	"#ifdef MR_HIGHLEVEL_CODE\n"
-	"	MR_address_of_type_ctor_info_for_func ="
-	"		&mercury__builtin__builtin__type_ctor_info_func_0;\n"
-	"	MR_address_of_type_ctor_info_for_pred ="
-	"		&mercury__builtin__builtin__type_ctor_info_pred_0;\n"
-	"	MR_address_of_type_ctor_info_for_tuple ="
-	"		&mercury__builtin__builtin__type_ctor_info_tuple_0;\n"
-	"#else\n"
-	"	MR_address_of_type_ctor_info_for_func ="
-	"		&mercury_data_builtin__type_ctor_info_func_0;\n"
-	"	MR_address_of_type_ctor_info_for_pred ="
-	"		&mercury_data_builtin__type_ctor_info_pred_0;\n"
-	"	MR_address_of_type_ctor_info_for_tuple ="
-	"		&mercury_data_builtin__type_ctor_info_tuple_0;\n"
-	"#endif\n"
 	"#ifdef MR_CONSERVATIVE_GC\n"
 	"	MR_address_of_init_gc = init_gc;\n"
 	"#endif\n"
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
--------------------------------------------------------------------------