[m-dev.] diff: ignoring gc-only type_ctors

[Zoltan Somogyi]

Estimated hours taken: 0.1

library/builtin.m:
	Include type_ctor_infos for saved succips, hps, curfrs etc
	only when doing native gc.

trace/mercury_trace_vars.m:
	Ignore type_ctor_infos for saved succips, hps, curfrs etc
	only when doing native gc, since otherwise they cannot occur.

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/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
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/dynamic_linking
cvs diff: Diffing extras/exceptions
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/odbc
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing library
Index: library/builtin.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/builtin.m,v
retrieving revision 1.13
diff -u -b -u -r1.13 builtin.m
--- builtin.m	1999/05/27 10:40:37	1.13
+++ builtin.m	1999/05/28 07:16:26
@@ -296,6 +296,8 @@
 		mkbody(MR_TYPE_CTOR_LAYOUT_VOID_VALUE))
 };
 
+#ifdef	NATIVE_GC
+
 	/* type_ctor_layout for `succip' (only used by accurate gc) */
 
 MR_MODULE_STATIC_OR_EXTERN
@@ -356,6 +358,8 @@
 		mkbody(MR_TYPE_CTOR_LAYOUT_REDOIP_VALUE))
 };
 
+#endif /* NATIVE_GC */
+
 	/* type_ctor_functors definitions */
 
 	/* type_ctor_functors for `int' */
@@ -403,6 +407,8 @@
 	MR_TYPE_CTOR_FUNCTORS_SPECIAL
 };
 
+#ifdef	NATIVE_GC
+
 	/* type_ctor_functors for `succip' (only used by accurate gc) */
 
 MR_MODULE_STATIC_OR_EXTERN
@@ -457,6 +463,8 @@
 	MR_TYPE_CTOR_FUNCTORS_SPECIAL
 };
 
+#endif /* NATIVE_GC */
+
 #endif /* USE_TYPE_LAYOUT */
 
 	/* type_ctor_infos definitions */
@@ -615,6 +623,8 @@
 #endif
 };
 
+#ifdef	NATIVE_GC
+
 	/* type_ctor_info for `succip' (only used by accurate gc) */
 
 Declare_entry(mercury__unused_0_0);
@@ -788,6 +798,8 @@
 	(const Word *) string_const(""redofr"", 6)
 #endif
 };
+
+#endif /* NATIVE_GC */
 
 BEGIN_MODULE(builtin_types_module)
 
cvs diff: Diffing profiler
cvs diff: Diffing runtime
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 scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/misc_tests
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
Index: trace/mercury_trace_vars.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_vars.c,v
retrieving revision 1.4
diff -u -b -u -r1.4 mercury_trace_vars.c
--- mercury_trace_vars.c	1999/05/28 07:13:37	1.4
+++ mercury_trace_vars.c	1999/05/28 07:14:40
@@ -127,12 +127,15 @@
 extern	Word	mercury_data___type_ctor_info_func_0;
 extern	Word	mercury_data___type_ctor_info_pred_0;
 extern	Word	mercury_data___type_ctor_info_void_0;
+
+#ifdef	NATIVE_GC
 extern	Word	mercury_data___type_ctor_info_succip_0;
 extern	Word	mercury_data___type_ctor_info_hp_0;
 extern	Word	mercury_data___type_ctor_info_curfr_0;
 extern	Word	mercury_data___type_ctor_info_maxfr_0;
 extern	Word	mercury_data___type_ctor_info_redoip_0;
 extern	Word	mercury_data___type_ctor_info_redofr_0;
+#endif
 
 static	Word *
 MR_trace_ignored_type_ctors[] =
@@ -150,6 +153,7 @@
 	/* we ignore these because they should never be needed */
 	(Word *) &mercury_data___type_ctor_info_void_0,
 
+#ifdef	NATIVE_GC
 	/* we ignore these because they are not interesting */
 	(Word *) &mercury_data___type_ctor_info_succip_0,
 	(Word *) &mercury_data___type_ctor_info_hp_0,
@@ -157,6 +161,7 @@
 	(Word *) &mercury_data___type_ctor_info_maxfr_0,
 	(Word *) &mercury_data___type_ctor_info_redoip_0,
 	(Word *) &mercury_data___type_ctor_info_redofr_0,
+#endif
 };
 
 static bool
cvs diff: Diffing trial
cvs diff: Diffing util
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------