X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgdb-events.sh;h=35279a75081d53cf47a0e921d84cb837a79d296a;hb=be85b69fc61880e3bde8d4df2bf6b4189c25d143;hp=2872b99c48c85998d13a4bf58b72a443ba4b3591;hpb=63d022e0ce7e1c7734aabff5b1e865cc8e1edf9e;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdb-events.sh b/gdb/gdb-events.sh
index 2872b99c48..35279a7508 100755
--- a/gdb/gdb-events.sh
+++ b/gdb/gdb-events.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # User Interface Events.
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+#
+# Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005 Free Software
+# Foundation, Inc.
 #
 # Contributed by Cygnus Solutions.
 #
@@ -19,25 +21,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # 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.
-
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 IFS=:
 
@@ -65,46 +50,6 @@ f:void:tracepoint_create:int number:number
 f:void:tracepoint_delete:int number:number
 f:void:tracepoint_modify:int number:number
 f:void:architecture_changed:void
-#*: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
-#*:void:register_changed_hook:int regno:regno
-#*:void:memory_changed_hook:CORE_ADDR addr, int len:addr, len
-#*:void:context_hook:int num:num
-#*: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,8 @@ copyright ()
   cat <<EOF
 /* User Interface Events.
 
-   Copyright 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2004, 2005 Free Software Foundation,
+   Inc.
 
    Contributed by Cygnus Solutions.
 
@@ -132,7 +78,8 @@ copyright ()
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* Work in progress */
 
@@ -146,7 +93,7 @@ copyright ()
    If editing this file, please also run gdb-events.sh and merge any
    changes into that script. Conversely, when making sweeping changes
    to this file, modifying gdb-events.sh and using its output may
-   prove easier. */
+   prove easier.  */
 
 EOF
 }
@@ -161,10 +108,6 @@ cat <<EOF
 
 #ifndef GDB_EVENTS_H
 #define GDB_EVENTS_H
-
-#ifndef WITH_GDB_EVENTS
-#define WITH_GDB_EVENTS 1
-#endif
 EOF
 
 # pointer declarations
@@ -188,9 +131,9 @@ done
 echo ""
 echo ""
 cat <<EOF
-/* Type definition of all hook functions.
-   Recommended pratice is to first declare each hook function using
-   the below ftype and then define it. */
+/* Type definition of all hook functions.  Recommended pratice is to
+   first declare each hook function using the below ftype and then
+   define it.  */
 EOF
 echo ""
 function_list | while eval read $read
@@ -219,7 +162,7 @@ echo ""
 cat <<EOF
 /* Interface into events functions.
    Where a *_p() predicate is present, it must be called before
-   calling the hook proper. */
+   calling the hook proper.  */
 EOF
 function_list | while eval read $read
 do
@@ -235,46 +178,17 @@ do
   esac
 done
 
-# function macros
-echo ""
-echo ""
-cat <<EOF
-/* When GDB_EVENTS are not being used, completly 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
 
-/* Install custom gdb-events hooks. */
-extern struct gdb_events *set_gdb_event_hooks (struct gdb_events *vector);
+/* Install custom gdb-events hooks.  */
+extern struct gdb_events *deprecated_set_gdb_event_hooks (struct gdb_events *vector);
 
-/* Deliver any pending events. */
+/* Deliver any pending events.  */
 extern void gdb_events_deliver (struct gdb_events *vector);
 
-/* Clear event handlers */
+/* 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 +221,21 @@ 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
+static void
+show_gdb_events_debug (struct ui_file *file, int from_tty,
+                       struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("Event debugging is %s.\\n"), value);
+}
 
-# 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
+EOF
 
 # function bodies
-echo ""
-echo "#if WITH_GDB_EVENTS"
 function_list | while eval read $read
 do
   case "${class}" in
@@ -366,15 +272,12 @@ 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)
+deprecated_set_gdb_event_hooks (struct gdb_events *vector)
 {
   struct gdb_events *old_events = current_event_hooks;
   if (vector == NULL)
@@ -393,19 +296,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);
+  deprecated_set_gdb_event_hooks (&null_event_hooks);
 }
-#endif
 EOF
 
 # event type
@@ -571,7 +471,6 @@ void
 _initialize_gdb_events (void)
 {
   struct cmd_list_element *c;
-#if WITH_GDB_EVENTS
 EOF
 function_list | while eval read $read
 do
@@ -582,21 +481,15 @@ do
   esac
 done
 cat <<EOF
-#endif
-
-  c = add_set_cmd ("eventdebug", class_maintenance, var_zinteger,
-		   (char *) (&gdb_events_debug), "Set event debugging.\n\\
-When non-zero, event/notify debugging is enabled.", &setlist);
-  deprecate_cmd (c, "set debug event");
-  deprecate_cmd (add_show_from_set (c, &showlist), "show debug event");
-
-  add_show_from_set (add_set_cmd ("event",
-                                  class_maintenance,
-                                  var_zinteger,
-                                  (char *) (&gdb_events_debug),
-                                  "Set event debugging.\n\\
-When non-zero, event/notify debugging is enabled.", &setdebuglist),
-		     &showdebuglist);
+
+  add_setshow_zinteger_cmd ("event", class_maintenance,
+                            &gdb_events_debug, _("\\
+Set event debugging."), _("\\
+Show event debugging."), _("\\
+When non-zero, event/notify debugging is enabled."),
+                            NULL,
+                            show_gdb_events_debug,
+                            &setdebuglist, &showdebuglist);
 }
 EOF