for review: delete MR_USE_REDOFR

[Fergus Henderson]

Zoltan, can you please review this one?

runtime/mercury_grade.h:
runtime/mercury_imp.h:
runtime/mercury_stack_trace.c:
	Delete unnecessary references to MR_USE_REDOFR.  There's no point
	in having that macro, since we always use a redofr now.

Index: runtime/mercury_grade.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_grade.h,v
retrieving revision 1.10
diff -u -r1.10 mercury_grade.h
--- mercury_grade.h	1998/07/20 10:03:26	1.10
+++ mercury_grade.h	1998/07/21 14:04:22
@@ -45,11 +45,7 @@
 ** changes to compiler/handle_options.m and scripts/mgnuc.in.
 */
 
-#ifdef MR_USE_REDOFR
-  #define MR_GRADE_PART_0	redofr_
-#else
-  #define MR_GRADE_PART_0
-#endif
+#define MR_GRADE_PART_0		redofr_
 
 #ifdef USE_ASM_LABELS
   #define MR_GRADE_PART_1	asm_
Index: runtime/mercury_imp.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_imp.h,v
retrieving revision 1.8
diff -u -r1.8 mercury_imp.h
--- mercury_imp.h	1998/07/20 10:03:27	1.8
+++ mercury_imp.h	1998/07/21 14:03:54
@@ -19,8 +19,6 @@
 #ifndef MERCURY_IMP_H
 #define MERCURY_IMP_H
 
-#define	MR_USE_REDOFR
-
 /*
 ** The #include of "mercury_conf.h" must come before the `#ifdef USE_DLLS',
 ** because mercury_conf.h defines the USE_DLLS macro.
Index: runtime/mercury_stack_trace.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_stack_trace.c,v
retrieving revision 1.13
diff -u -r1.13 mercury_stack_trace.c
--- mercury_stack_trace.c	1998/07/20 10:03:31	1.13
+++ mercury_stack_trace.c	1998/07/21 14:05:20
@@ -218,21 +218,16 @@
 	*/
 
 	while (base_maxfr >= MR_nondet_stack_trace_bottom) {
-#ifdef	MR_USE_REDOFR
 		if ((base_maxfr - bt_prevfr(base_maxfr)) < NONDET_FIXED_SIZE) {
 			fprintf(fp, "%p: temp\n", base_maxfr);
 			fprintf(fp, " redoip: ");
 			printlabel(bt_redoip(base_maxfr));
 			fprintf(fp, " redofr: %p\n", bt_redofr(base_maxfr));
-		} else
-#endif
-		{
+		} else {
 			fprintf(fp, "%p: ordinary\n", base_maxfr);
 			fprintf(fp, " redoip: ");
 			printlabel(bt_redoip(base_maxfr));
-#ifdef	MR_USE_REDOFR
 			fprintf(fp, " redofr: %p\n", bt_redofr(base_maxfr));
-#endif
 			fprintf(fp, " succip: ");
 			printlabel(bt_succip(base_maxfr));
 			fprintf(fp, " succfr: %p\n", bt_succfr(base_maxfr));

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.