[m-rev.] diff: remove --disable-decl-debug configure option

[Mark Brown]

Hi,

This change was requested by Zoltan at Monday's meeting.

Cheers,
Mark.

Estimated hours taken: 0.25
Branches: main

Remove the --disable-decl-debug configuration option, and all conditional
compilation of the declarative debugging implementation.

configure.in:
	Remove the configuration option.

runtime/mercury_conf.h.in:
	Don't document the configuration macro.

runtime/mercury_conf_param.h:
	Don't calculate the conditional compilation macro.

trace/mercury_trace_declarative.c:
trace/mercury_trace_declarative.h:
trace/mercury_trace_internal.c:
trace/mercury_trace_internal.h:
	Compile the declarative debugging code unconditionally.

Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.326
diff -u -r1.326 configure.in
--- configure.in	15 Oct 2002 16:23:49 -0000	1.326
+++ configure.in	16 Oct 2002 01:28:58 -0000
@@ -2309,17 +2309,6 @@
 AC_SUBST(LIBGRADE_OPTS)
 
 #-----------------------------------------------------------------------------#
-#
-# Add an option that disables declarative debugging support in the internal
-# debugger.  It is enabled by default.
-#
-AC_ARG_ENABLE(decl-debug,
-[  --disable-decl-debug    disable the declarative debugger],
-mercury_cv_enable_decl_debug="$enableval",mercury_cv_enable_decl_debug=yes)
-if test "$mercury_cv_enable_decl_debug" = "no"; then
-	AC_DEFINE(MR_DISABLE_DECLARATIVE_DEBUGGER)
-fi
-#-----------------------------------------------------------------------------#
 
 # Determine how many of the r registers (r1, r2, ...) are real registers.
 # Determine how many temporaries may be allocated real registers.
Index: runtime/mercury_conf.h.in
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf.h.in,v
retrieving revision 1.44
diff -u -r1.44 mercury_conf.h.in
--- runtime/mercury_conf.h.in	15 Sep 2002 10:05:58 -0000	1.44
+++ runtime/mercury_conf.h.in	16 Oct 2002 05:36:54 -0000
@@ -389,15 +389,6 @@
 #undef  MR_USE_EXTERNAL_DEBUGGER
 
 /*
-** MR_DISABLE_DECLARATIVE_DEBUGGER:
-**	Remove declarative debugging support from the internal
-**	debugger, even if it is compatible with the current grade.
-**	Whether the declarative debugger can be used or not is
-**	determined in runtime/mercury_conf_param.h.
-*/
-#undef	MR_DISABLE_DECLARATIVE_DEBUGGER
-
-/*
 ** MR_NO_USE_READLINE
 **	Set this if you want to prevent the debugger from using the GNU
 **	readline library for the command-line prompt.
Index: runtime/mercury_conf_param.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.65
diff -u -r1.65 mercury_conf_param.h
--- runtime/mercury_conf_param.h	1 Sep 2002 06:05:18 -0000	1.65
+++ runtime/mercury_conf_param.h	16 Oct 2002 01:30:33 -0000
@@ -558,15 +558,6 @@
   #define MR_MAY_NEED_INITIALIZATION
 #endif
 
-/*
-** MR_USE_DECLARATIVE_DEBUGGER -- include support for declarative
-**				  debugging in the internal debugger.
-*/
-
-#if defined(MR_CONSERVATIVE_GC) && !defined(MR_DISABLE_DECLARATIVE_DEBUGGER)
-  #define MR_USE_DECLARATIVE_DEBUGGER
-#endif
-
 /*---------------------------------------------------------------------------*/
 
 /*
Index: trace/mercury_trace_declarative.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_declarative.c,v
retrieving revision 1.58
diff -u -r1.58 mercury_trace_declarative.c
--- trace/mercury_trace_declarative.c	3 Oct 2002 07:34:43 -0000	1.58
+++ trace/mercury_trace_declarative.c	16 Oct 2002 01:31:34 -0000
@@ -30,8 +30,6 @@
 #include "mercury_imp.h"
 #include "mercury_trace_declarative.h"
 
-#ifdef MR_USE_DECLARATIVE_DEBUGGER
-
 #include "mercury_trace.h"
 #include "mercury_trace_browse.h"
 #include "mercury_trace_internal.h"
@@ -1516,5 +1514,3 @@
 }
 
 #endif /* MR_DEBUG_DD_BACK_END */
-
-#endif /* defined(MR_USE_DECLARATIVE_DEBUGGER) */
Index: trace/mercury_trace_declarative.h
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_declarative.h,v
retrieving revision 1.14
diff -u -r1.14 mercury_trace_declarative.h
--- trace/mercury_trace_declarative.h	18 Feb 2002 07:01:29 -0000	1.14
+++ trace/mercury_trace_declarative.h	16 Oct 2002 01:31:48 -0000
@@ -11,8 +11,6 @@
 #include "mercury_trace.h"
 #include "mercury_trace_internal.h"
 
-#ifdef MR_USE_DECLARATIVE_DEBUGGER
-
 /*
 ** When in declarative debugging mode, the internal debugger calls
 ** MR_trace_decl_debug for each event.  
@@ -45,5 +43,4 @@
 #define MR_TRACE_STATUS_FAILED		(MR_Word) 1
 #define MR_TRACE_STATUS_UNDECIDED	(MR_Word) 2
 
-#endif  /* MR_USE_DECLARATIVE_DEBUGGER */
 #endif	/* MERCURY_TRACE_DECLARATIVE_H */
Index: trace/mercury_trace_internal.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_internal.c,v
retrieving revision 1.142
diff -u -r1.142 mercury_trace_internal.c
--- trace/mercury_trace_internal.c	14 Oct 2002 09:03:07 -0000	1.142
+++ trace/mercury_trace_internal.c	16 Oct 2002 01:34:18 -0000
@@ -206,12 +206,8 @@
 	"MDB INTERNAL ERROR: scope set to MR_SPY_LINENO",
 };
 
-#ifdef	MR_USE_DECLARATIVE_DEBUGGER
-
 MR_Trace_Mode MR_trace_decl_mode = MR_TRACE_INTERACTIVE;
 
-#endif	/* MR_USE_DECLARATIVE_DEBUGGER */
-
 typedef enum {
 	MR_MULTIMATCH_ASK, MR_MULTIMATCH_ALL, MR_MULTIMATCH_ONE
 } MR_MultiMatch;
@@ -447,14 +443,12 @@
 			MR_Trace_Cmd_Info *cmd, MR_Event_Info *event_info,
 			MR_Event_Details *event_details, MR_Code **jumpaddr);
 
-#ifdef MR_USE_DECLARATIVE_DEBUGGER
 static MR_Next	MR_trace_cmd_dd(char **words, int word_count,
 			MR_Trace_Cmd_Info *cmd, MR_Event_Info *event_info,
 			MR_Event_Details *event_details, MR_Code **jumpaddr);
 static MR_Next	MR_trace_cmd_dd_dd(char **words, int word_count,
 			MR_Trace_Cmd_Info *cmd, MR_Event_Info *event_info,
 			MR_Event_Details *event_details, MR_Code **jumpaddr);
-#endif /* MR_USE_DECLARATIVE_DEBUGGER */
 
 static	void	MR_maybe_print_spy_point(int slot, const char *problem);
 static	void	MR_print_unsigned_var(FILE *fp, const char *var,
@@ -555,11 +549,9 @@
 		return MR_trace_event_internal_report(cmd, event_info);
 	}
 
-#ifdef	MR_USE_DECLARATIVE_DEBUGGER
 	if (MR_trace_decl_mode != MR_TRACE_INTERACTIVE) {
 		return MR_trace_decl_debug(cmd, event_info);
 	}
-#endif	/* MR_USE_DECLARATIVE_DEBUGGER */
 
 	/*
 	** We want to make sure that the Mercury code used to implement some
@@ -3499,8 +3491,6 @@
 	return KEEP_INTERACTING;
 }
 
-#ifdef	MR_USE_DECLARATIVE_DEBUGGER
-
 static MR_Next
 MR_trace_cmd_dd(char **words, int word_count, MR_Trace_Cmd_Info *cmd,
 	MR_Event_Info *event_info, MR_Event_Details *event_details,
@@ -3559,8 +3549,6 @@
 	return KEEP_INTERACTING;
 }
 
-#endif  /* MR_USE_DECLARATIVE_DEBUGGER */
-
 static void
 MR_maybe_print_spy_point(int slot, const char *problem)
 {
@@ -5163,12 +5151,10 @@
 	{ "misc", "quit", MR_trace_cmd_quit,
 		MR_trace_quit_cmd_args, NULL},
 
-#ifdef MR_USE_DECLARATIVE_DEBUGGER
 	{ "dd", "dd", MR_trace_cmd_dd,
 		NULL, MR_trace_null_completer},
 	{ "dd", "dd_dd", MR_trace_cmd_dd_dd,
 		NULL, MR_trace_filename_completer},
-#endif
 
 	/* End of doc/mdb_command_list. */
 	{ NULL, "NUMBER", NULL,
Index: trace/mercury_trace_internal.h
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_internal.h,v
retrieving revision 1.16
diff -u -r1.16 mercury_trace_internal.h
--- trace/mercury_trace_internal.h	6 Mar 2002 14:35:05 -0000	1.16
+++ trace/mercury_trace_internal.h	16 Oct 2002 01:39:00 -0000
@@ -7,7 +7,6 @@
 #ifndef	MERCURY_TRACE_INTERNAL_H
 #define	MERCURY_TRACE_INTERNAL_H
 
-#include "mercury_conf.h"	/* for MR_USE_DECLARATIVE_DEBUGGER */
 #include "mercury_types.h"	/* for MR_Code */
 #include "mercury_trace.h"	/* for MR_Event_Info, etc. */
 #include "mercury_std.h"	/* for MR_bool */
@@ -15,8 +14,6 @@
 
 #include <stdio.h>		/* for FILE */
 
-#ifdef  MR_USE_DECLARATIVE_DEBUGGER
-
 /*
 ** The following enum gives the possible modes that the declarative
 ** debugger can be in (see trace/mercury_trace_declarative.{c,h}).
@@ -41,8 +38,6 @@
 */
 
 extern	MR_Trace_Mode	MR_trace_decl_mode;
-
-#endif	/* MR_USE_DECLARATIVE_DEBUGGER */
 
 extern	MR_Code	*MR_trace_event_internal(MR_Trace_Cmd_Info *cmd,
 			MR_bool interactive, MR_Event_Info *event_info);
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------