2004-04-29 Andrew Cagney <cagney@redhat.com>

	* gdb-events.sh (WITH_GDB_EVENTS): Delete macro and references.
	Delete all disabled code.
	* gdb-events.h, gdb-events.c: Re-generate.

4 files changed, 8 insertions, 151 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc8d338a108..0f76ad3562b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-29  Andrew Cagney  <cagney@redhat.com>
+
+	* gdb-events.sh (WITH_GDB_EVENTS): Delete macro and references.
+	Delete all disabled code.
+	* gdb-events.h, gdb-events.c: Re-generate.
+	
 2004-04-19  Jerome Guitton  <guitton@gnat.com>
 	    Mark Kettenis  <kettenis@gnu.org>
 
diff --git a/gdb/gdb-events.c b/gdb/gdb-events.c
index 63ee3bc400b..573df1fd458 100644
--- a/gdb/gdb-events.c
+++ b/gdb/gdb-events.c
@@ -1,6 +1,6 @@
 /* User Interface Events.
 
-   Copyright 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1999, 2001, 2002, 2004 Free Software Foundation, Inc.
 
    Contributed by Cygnus Solutions.
 
@@ -39,16 +39,12 @@
 #include "gdb-events.h"
 #include "gdbcmd.h"
 
-#if WITH_GDB_EVENTS
 static struct gdb_events null_event_hooks;
 static struct gdb_events queue_event_hooks;
 static struct gdb_events *current_event_hooks = &null_event_hooks;
-#endif
 
 int gdb_events_debug;
 
-#if WITH_GDB_EVENTS
-
 void
 breakpoint_create_event (int b)
 {
@@ -149,9 +145,6 @@ selected_thread_changed_event (int thread_num)
   current_event_hooks->selected_thread_changed (thread_num);
 }
 
-#endif
-
-#if WITH_GDB_EVENTS
 struct gdb_events *
 set_gdb_event_hooks (struct gdb_events *vector)
 {
@@ -162,15 +155,12 @@ set_gdb_event_hooks (struct gdb_events *vector)
     current_event_hooks = vector;
   return old_events;
 }
-#endif
 
-#if WITH_GDB_EVENTS
 void
 clear_gdb_event_hooks (void)
 {
   set_gdb_event_hooks (&null_event_hooks);
 }
-#endif
 
 enum gdb_event
 {
@@ -415,7 +405,6 @@ void
 _initialize_gdb_events (void)
 {
   struct cmd_list_element *c;
-#if WITH_GDB_EVENTS
   queue_event_hooks.breakpoint_create = queue_breakpoint_create;
   queue_event_hooks.breakpoint_delete = queue_breakpoint_delete;
   queue_event_hooks.breakpoint_modify = queue_breakpoint_modify;
@@ -426,7 +415,6 @@ _initialize_gdb_events (void)
   queue_event_hooks.target_changed = queue_target_changed;
   queue_event_hooks.selected_frame_level_changed = queue_selected_frame_level_changed;
   queue_event_hooks.selected_thread_changed = queue_selected_thread_changed;
-#endif
 
   c = add_set_cmd ("eventdebug", class_maintenance, var_zinteger,
 		   (char *) (&gdb_events_debug), "Set event debugging.\n\
diff --git a/gdb/gdb-events.h b/gdb/gdb-events.h
index 2ce193f19ea..7f0d1cb602e 100644
--- a/gdb/gdb-events.h
+++ b/gdb/gdb-events.h
@@ -38,10 +38,6 @@
 #ifndef GDB_EVENTS_H
 #define GDB_EVENTS_H
 
-#ifndef WITH_GDB_EVENTS
-#define WITH_GDB_EVENTS 1
-#endif
-
 
 /* COMPAT: pointer variables for old, unconverted events.
    A call to set_gdb_events() will automatically update these. */
@@ -95,22 +91,6 @@ extern void target_changed_event (void);
 extern void selected_frame_level_changed_event (int level);
 extern void selected_thread_changed_event (int thread_num);
 
-
-/* When GDB_EVENTS are not being used, completely disable them. */
-
-#if !WITH_GDB_EVENTS
-#define breakpoint_create_event(b) 0
-#define breakpoint_delete_event(b) 0
-#define breakpoint_modify_event(b) 0
-#define tracepoint_create_event(number) 0
-#define tracepoint_delete_event(number) 0
-#define tracepoint_modify_event(number) 0
-#define architecture_changed_event() 0
-#define target_changed_event() 0
-#define selected_frame_level_changed_event(level) 0
-#define selected_thread_changed_event(thread_num) 0
-#endif
-
 /* Install custom gdb-events hooks. */
 extern struct gdb_events *set_gdb_event_hooks (struct gdb_events *vector);
 
@@ -120,10 +100,4 @@ extern void gdb_events_deliver (struct gdb_events *vector);
 /* Clear event handlers */
 extern void clear_gdb_event_hooks (void);
 
-#if !WITH_GDB_EVENTS
-#define set_gdb_events(x) 0
-#define set_gdb_event_hooks(x) 0
-#define gdb_events_deliver(x) 0
-#endif
-
 #endif
diff --git a/gdb/gdb-events.sh b/gdb/gdb-events.sh
index bd0779404cd..e1e26ac20c8 100755
--- a/gdb/gdb-events.sh
+++ b/gdb/gdb-events.sh
@@ -21,24 +21,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#
-# What happens next:
-#
-
-# The gdb-events.h/gdb-events.c files this script generates are commited
-# and published.
-
-# Any UI module that is installing events is changed so that the
-# events are installed using the ``set_gdb_events()'' and
-# ``gdb_event_hooks()'' interfaces.  There could prove to be an issue
-# here with respect to annotate.  We might need to accomodate a hook
-# stack that allows several ui blocks to install their own events.
-
-# Each of the variable events (as currently generated) is converted
-# to either a straight function call or a function call with a
-# predicate.
-
-
 IFS=:
 
 read="class returntype function formal actual attrib"
@@ -68,43 +50,6 @@ f:void:architecture_changed:void
 f:void:target_changed:void
 f:void:selected_frame_level_changed:int level:level
 f:void:selected_thread_changed:int thread_num:thread_num
-#*:void:annotate_starting_hook:void
-#*:void:annotate_stopped_hook:void
-#*:void:annotate_signalled_hook:void
-#*:void:annotate_signal_hook:void
-#*:void:annotate_exited_hook:void
-##*:void:print_register_hook:int
-##*:CORE_ADDR:find_toc_address_hook:CORE_ADDR
-##*:void:sparc_print_register_hook:int regno:regno
-#*:void:target_resume_hook:void
-#*:void:target_wait_loop_hook:void
-#*:void:init_gdb_hook:char *argv0:argv0
-#*:void:command_loop_hook:void
-#*:void:fputs_unfiltered_hook:const char *linebuff,struct ui_file *stream:linebuff, stream
-#*:void:print_frame_info_listing_hook:struct symtab *s, int line, int stopline, int noerror:s, line, stopline, noerror
-#*:int:query_hook:const char *query, va_list args:query, args
-#*:void:warning_hook:const char *string, va_list args:string, args
-#*:void:target_output_hook:char *b:b
-#*:void:interactive_hook:void
-#*:void:registers_changed_hook:void
-#*:void:readline_begin_hook:char *format, ...:format
-#*:char *:readline_hook:char *prompt:prompt
-#*:void:readline_end_hook:void
-#*:int:target_wait_hook:int pid, struct target_waitstatus *status:pid, status
-#*:void:call_command_hook:struct cmd_list_element *c, char *cmd, int from_tty:c, cmd, from_tty
-#*:NORETURN void:error_hook:void:: ATTR_NORETURN
-#*:void:error_begin_hook:void
-##*:int:target_architecture_hook:const struct bfd_arch_info *
-#*:void:exec_file_display_hook:char *filename:filename
-#*:void:file_changed_hook:char *filename:filename
-##*:void:specify_exec_file_hook:
-#*:int:gdb_load_progress_hook:char *section, unsigned long num:section, num
-#*:void:pre_add_symbol_hook:char *name:name
-#*:void:post_add_symbol_hook:void
-#*:void:selected_frame_level_changed_hook:int level:level
-#*:int:gdb_loop_hook:int signo:signo
-##*:void:solib_create_inferior_hook:void
-##*:void:xcoff_relocate_symtab_hook:unsigned int
 EOF
   grep -v '^#'
 }
@@ -114,7 +59,7 @@ copyright ()
   cat <<EOF
 /* User Interface Events.
 
-   Copyright 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1999, 2001, 2002, 2004 Free Software Foundation, Inc.
 
    Contributed by Cygnus Solutions.
 
@@ -161,10 +106,6 @@ cat <<EOF
 
 #ifndef GDB_EVENTS_H
 #define GDB_EVENTS_H
-
-#ifndef WITH_GDB_EVENTS
-#define WITH_GDB_EVENTS 1
-#endif
 EOF
 
 # pointer declarations
@@ -235,29 +176,6 @@ do
   esac
 done
 
-# function macros
-echo ""
-echo ""
-cat <<EOF
-/* When GDB_EVENTS are not being used, completely disable them. */
-EOF
-echo ""
-echo "#if !WITH_GDB_EVENTS"
-function_list | while eval read $read
-do
-  case "${class}" in
-    "*" ) continue ;;
-    "?" )
-	echo "#define ${function}_event_p() 0"
-	echo "#define ${function}_event(${actual}) 0"
-	;;
-    "f" )
-	echo "#define ${function}_event(${actual}) 0"
-	;;
-  esac
-done
-echo "#endif"
-
 # our set function
 cat <<EOF
 
@@ -269,12 +187,6 @@ extern void gdb_events_deliver (struct gdb_events *vector);
 
 /* Clear event handlers */
 extern void clear_gdb_event_hooks (void);
-
-#if !WITH_GDB_EVENTS
-#define set_gdb_events(x) 0
-#define set_gdb_event_hooks(x) 0
-#define gdb_events_deliver(x) 0
-#endif
 EOF
 
 # close it off
@@ -307,29 +219,14 @@ cat <<EOF
 #include "gdb-events.h"
 #include "gdbcmd.h"
 
-#if WITH_GDB_EVENTS
 static struct gdb_events null_event_hooks;
 static struct gdb_events queue_event_hooks;
 static struct gdb_events *current_event_hooks = &null_event_hooks;
-#endif
 
 int gdb_events_debug;
 EOF
 
-# global pointer variables - always have this
-#echo ""
-#function_list | while eval read $read
-#do
-#  case "${class}" in
-#    "*" )
-#	echo "${returntype} (*${function}_event) (${formal})${attrib} = 0;"
-#	;;
-#  esac
-#done
-
 # function bodies
-echo ""
-echo "#if WITH_GDB_EVENTS"
 function_list | while eval read $read
 do
   case "${class}" in
@@ -366,13 +263,10 @@ EOF
 	;;
   esac
 done
-echo ""
-echo "#endif"
 
 # Set hooks function
 echo ""
 cat <<EOF
-#if WITH_GDB_EVENTS
 struct gdb_events *
 set_gdb_event_hooks (struct gdb_events *vector)
 {
@@ -393,19 +287,16 @@ do
 done
 cat <<EOF
 }
-#endif
 EOF
 
 # Clear hooks function
 echo ""
 cat <<EOF
-#if WITH_GDB_EVENTS
 void
 clear_gdb_event_hooks (void)
 {
   set_gdb_event_hooks (&null_event_hooks);
 }
-#endif
 EOF
 
 # event type
@@ -571,7 +462,6 @@ void
 _initialize_gdb_events (void)
 {
   struct cmd_list_element *c;
-#if WITH_GDB_EVENTS
 EOF
 function_list | while eval read $read
 do
@@ -582,7 +472,6 @@ do
   esac
 done
 cat <<EOF
-#endif
 
   c = add_set_cmd ("eventdebug", class_maintenance, var_zinteger,
 		   (char *) (&gdb_events_debug), "Set event debugging.\n\\