gdb:

	* tui/tui-hooks.c: Include observer.h.
	(tui_event_default, tui_old_event_hooks, tui_event_hooks):
	Remove.
	(tui_bp_created_observer, tui_bp_deleted_observer,
	tui_bp_modified_observer): New globals.
	(tui_install_hooks): Use observers, not events.
	(tui_remove_hooks): Likewise.
	* mi/mi-cmd-break.c: Include observer.h, not gdb-events.h.
	(mi_breakpoint_observers_installed, mi_can_breakpoint_notify): New
	globals.
	(breakpoint_notify): Check mi_can_breakpoint_notify.
	(breakpoint_hooks): Remove.
	(mi_cmd_break_insert): Attach observers.  Don't use events.
	* tracepoint.c: Include observer.h, not gdb-events.h.
	(tracepoint_operation, trace_pass_command): Notify observer.
	* interps.c: Don't include gdb-events.h.
	(clear_interpreter_hooks): Don't call clear_gdb_event_hooks.
	* gdbarch.c: Rebuild.
	* gdbarch.sh: Emit include for observer.h, not gdb-events.h.
	(deprecated_current_gdbarch_select_hack): Notify observer.
	* breakpoint.h: Don't include gdb-events.h.
	* breakpoint.c: Don't include gdb-events.h.
	(condition_command): Notify observer.
	(commands_command): Likewise.
	(commands_from_control_command): Likewise.
	(mention, delete_breakpoint, set_ignore_count): Likewise.
	(disable_breakpoint, do_enable_breakpoint): Likewise.
	* Makefile.in (gdb_events_h): Remove.
	(breakpoint_h): Update.
	(COMMON_OBS): Remove gdb-events.o.
	(gdb-events.o): Remove.
	(breakpoint.o, gdbarch.o, interps.o, tracepoint.o, gdbtk-bp.o,
	gdbtk-hooks.o, mi-cmd-break.o, tui-hooks.o): Update.
	* gdb-events.c: Remove.
	* gdb-events.h: Remove.
	* gdb-events.sh: Remove.
gdb/doc:
	* observer.texi (GDB Observers): Document new observers:
	breakpoint_created, breakpoint_deleted, breakpoint_modified,
	tracepoint_created, tracepoint_deleted, tracepoint_modified,
	architecture_changed.
gdb/gdbtk:
	* generic/gdbtk-hooks.c: Include observer.h, not gdb-events.h.
	(gdbtk_add_hooks): Use observers, not events.
	(gdbtk_architecture_changed): Add argument, for observer.
	* generic/gdbtk-bp.c: Include observer.h.
	(gdb_set_bp): Notify observer.
	(gdb_set_bp_addr): Likewise.

3 files changed, 24 insertions, 17 deletions

diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index 6df5d05baea..b3de92f43ab 100644
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-25  Tom Tromey  <tromey@redhat.com>
+
+	* generic/gdbtk-hooks.c: Include observer.h, not gdb-events.h.
+	(gdbtk_add_hooks): Use observers, not events.
+	(gdbtk_architecture_changed): Add argument, for observer.
+	* generic/gdbtk-bp.c: Include observer.h.
+	(gdb_set_bp): Notify observer.
+	(gdb_set_bp_addr): Likewise.
+
 2008-07-14  Keith Seitz  <keiths@redhat.com>
 
 	* generic/gdbtk-stack.c (gdb_block_args): Remove deprecated values
diff --git a/gdb/gdbtk/generic/gdbtk-bp.c b/gdb/gdbtk/generic/gdbtk-bp.c
index 932ec1510aa..2d56a433066 100644
--- a/gdb/gdbtk/generic/gdbtk-bp.c
+++ b/gdb/gdbtk/generic/gdbtk-bp.c
@@ -1,5 +1,5 @@
 /* Tcl/Tk command definitions for Insight - Breakpoints.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2008 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -29,6 +29,7 @@
 #include <tcl.h>
 #include "gdbtk.h"
 #include "gdbtk-cmds.h"
+#include "observer.h"
 
 /* From breakpoint.c */
 extern struct breakpoint *breakpoint_chain;
@@ -541,7 +542,7 @@ gdb_set_bp (ClientData clientData, Tcl_Interp *interp,
   free(buf);
 
   /* now send notification command back to GUI */
-  breakpoint_create_event (b->number);
+  observer_notify_breakpoint_created (b->number);
   return TCL_OK;
 }
 
@@ -609,7 +610,7 @@ gdb_set_bp_addr (ClientData clientData, Tcl_Interp *interp, int objc,
   b->addr_string = xstrdup (saddr);
 
   /* now send notification command back to GUI */
-  breakpoint_create_event (b->number);
+  observer_notify_breakpoint_created (b->number);
   return TCL_OK;
 }
 
diff --git a/gdb/gdbtk/generic/gdbtk-hooks.c b/gdb/gdbtk/generic/gdbtk-hooks.c
index a34acff7230..cf7403469a4 100644
--- a/gdb/gdbtk/generic/gdbtk-hooks.c
+++ b/gdb/gdbtk/generic/gdbtk-hooks.c
@@ -29,10 +29,10 @@
 #include "gdbcore.h"
 #include "tracepoint.h"
 #include "demangle.h"
-#include "gdb-events.h"
 #include "top.h"
 #include "annotate.h"
 #include "cli/cli-decode.h"
+#include "observer.h"
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
@@ -75,7 +75,7 @@ extern void gdbtk_create_tracepoint (int);
 extern void gdbtk_delete_tracepoint (int);
 extern void gdbtk_modify_tracepoint (int);
 
-static void gdbtk_architecture_changed (void);
+static void gdbtk_architecture_changed (struct gdbarch *);
 static void gdbtk_trace_find (char *arg, int from_tty);
 static void gdbtk_trace_start_stop (int, int);
 static void gdbtk_attach (void);
@@ -121,17 +121,14 @@ static ptid_t gdbtk_ptid;
 void
 gdbtk_add_hooks (void)
 {
-  static struct gdb_events handlers;
-
-  /* Gdb event handlers */
-  handlers.breakpoint_create = gdbtk_create_breakpoint;
-  handlers.breakpoint_modify = gdbtk_modify_breakpoint;
-  handlers.breakpoint_delete = gdbtk_delete_breakpoint;
-  handlers.tracepoint_create = gdbtk_create_tracepoint;
-  handlers.tracepoint_modify = gdbtk_modify_tracepoint;
-  handlers.tracepoint_delete = gdbtk_delete_tracepoint;
-  handlers.architecture_changed = gdbtk_architecture_changed;
-  deprecated_set_gdb_event_hooks (&handlers);
+  /* Gdb observers */
+  observer_attach_breakpoint_created (gdbtk_create_breakpoint);
+  observer_attach_breakpoint_modified (gdbtk_modify_breakpoint);
+  observer_attach_breakpoint_deleted (gdbtk_delete_breakpoint);
+  observer_attach_tracepoint_created (gdbtk_create_tracepoint);
+  observer_attach_tracepoint_modified (gdbtk_modify_tracepoint);
+  observer_attach_tracepoint_deleted (gdbtk_delete_tracepoint);
+  observer_attach_architecture_changed (gdbtk_architecture_changed);
 
   /* Hooks */
   deprecated_call_command_hook = gdbtk_call_command;
@@ -835,7 +832,7 @@ gdbtk_detach ()
 
 /* Called from gdbarch_update_p whenever the architecture changes. */
 static void
-gdbtk_architecture_changed (void)
+gdbtk_architecture_changed (struct gdbarch *ignore)
 {
   Tcl_Eval (gdbtk_interp, "gdbtk_tcl_architecture_changed");
 }