Overhaul changelog entries.

15 files changed, 96 insertions, 624 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bd9722c1b6c..e266be760d8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,366 +1,29 @@
-2003-02-04  Andrew Cagney  <ac131313@redhat.com>
-
-	* interps.c (current_interp_command_loop): New function.
-
-	* main.c (captured_command_loop): Call current_interp_command_loop.
-
-	* interps.h (current_interp_command_loop): Declare.
-	(interp_command_loop_ftype): Define.
-	(struct interp_procs): Add command_loop_proc.
-
-2003-02-03  Andrew Cagney  <ac131313@redhat.com>
-
-	* interps.c (gdb_interpreter_get_procs): Delete function.
-	(gdb_interpreter_get_data): Delete function.
-
-	* interps.h (gdb_interpreter_get_procs): Delete declaration.
-	(gdb_interpreter_get_data): Delete declaration.
-
-	* cli/cli-interp.c (cli_interpreter_display_prompt_p): 
-
-	* interps.h (interp_prompt_ftype): Add data parameter.
-	* interps.c (gdb_interpreter_display_prompt_p): Update.
-
-	* top.c (gdb_init): Move interpreter init code from here ...
-	* main.c (captured_main): ... to here.  Include "interps.h".
-	(captured_main): Set interpreter_p to a default before parsing the
-	options.
-	* Makefile.in (main.o): Update dependencies.
-
-2002-11-05  Elena Zannoni  <ezannoni@redhat.com>
-
-        * defs.h (selected_frame_level_changed_hook): Removed.
-
-2002-11-05  Elena Zannoni  <ezannoni@redhat.com>
-        
-        * event-top.c: Reorg some code, to minimize diffs with mainline.
-
-2002-11-05  Elena Zannoni  <ezannoni@redhat.com>
-
-        * Makefile.in (event-loop.o): Remove dependency on interps.h.
-        * event-loop.c: Remove include of interps.h.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* interps.h (clear_interpreter_hooks): Add 'extern' keyword.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* cli/cli-interp.c (_initialize_cli_interp): Call
-	gdb_interpreter_new and gdb_interpreter_add.
-	* top.c (gdb_init): Call gdb_interpreter_lookup.
-	(gdb_init): Call gdb_interpreter_set.
-	* interps.c (gdb_interpreter_new): Renamed from
-	gdb_new_interpreter.
-	(gdb_interpreter_add): Renamed from gdb_add_interpreter.
-	(gdb_interpreter_set): Renamed from gdb_set_interpreter.
-	(gdb_interpreter_lookup): Renamed from gdb_lookup_interpreter.
-	(gdb_interpreter_current): Renamed from gdb_current_interpreter.
-	Update all callers.
-	* interps.h: Ditto.
-	
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* interps.h (gdb_interpreter_is_quiet_p): Rename from
-	gdb_interpreter_is_quiet.
-	* cli/cli-interp.c (cli_interpreter_display_prompt_p): Call
-	gdb_interpreter_is_quiet_p.
-	* interps.c (gdb_interpreter_is_quiet_p): Rename from
-	gdb_interpreter_is_quiet.
-	(gdb_set_interpreter): Call gdb_interpreter_is_quiet_p.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* event-top.c (display_gdb_prompt): Use
-	gdb_interpreter_display_prompt_p.
-	* cli/cli-interp.c (cli_interpreter_display_prompt_p): Rename from
-	cli_interpreter_display_prompt and rewrite.
-	(_initialize_cli_interp): New proc name is
-	cli_interpreter_display_prompt_p.
-	* interps.c (gdb_new_interpreter): Initialize prompt_proc_p
-	instead of prompt_proc.
-	(gdb_interpreter_display_prompt_p): Rewrite as a predicate.
-	(gdb_interpreter_is_quiet_p): Rename from gdb_interpreter_is_quiet.
-	(gdb_set_interpreter): Call gdb_interpreter_is_quiet_p.
-
-	* interps.h (interp_prompt_ftype): Update typedef.
-	(struct gdb_interpreter_procs): Rename prompt_proc to
-	prompt_proc_p.
-	(gdb_interpreter_display_prompt_p): Export this instead of old
-	function.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* interps.c (list_interpreter_cmd, do_set_interpreter): Remove
-	useless prototypes.
-	Update a few comments, remove gratuitous blank lines.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* cli/cli-interp.c (cli_interpreter_delete): Delete.
-	(_initialize_cli_interp): Remove delete_proc.
-
-	* interps.h (struct gdb_interpreter_procs): Remove delete_proc.
-	(interp_delete_ftype): Delete.
-	(gdb_delete_interpreter): Remove.
-
-	* interps.c (gdb_delete_interpreter): Remove.
-	(gdb_new_interpreter): Don't initialize delete_proc.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* interps.c (set_interpreter_cmd): Remove.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* interps.c (interpreter_completer): Initialize alloced.
-	(struct gdb_interpreter): Reformat.
-	(set_interpreter_cmd): Remove.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* interps.h (struct gdb_interpreter_procs): Remove do_one_event_proc.
-	(interp_do_one_event_ftype): Delete.
-	* interps.c (gdb_new_interpreter): Remove setup of do_one_event
-	procedure.
-	(interpreter_do_one_event): Delete.
-	* event-loop.c (start_event_loop): Remove no-op call to
-	interpreter_do_one_event.
-	* cli/cli-interps.c: (cli_interpreter_do_one_event): Delete.
-	
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-        * Makefile.in (mi-main.o, mi-cmd-break.o, event-loop.o): Update
-        dependencies on interps.h.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* interps.h (GDB_INTERPRETER_MI2): Define.
-	(GDB_INTERPRETER_MI0): Remove.
-
-2002-10-01  Keith Seitz  <keiths@redhat.com>
-
-	* interps.c (interpreter_exec_cmd): Remove mention of "mi" in
-	error message.
-	(list_interpreter_cmd): Removed.
-
-	* cli/cli-interp.c (do_captured_execute_command): New function.
-	(safe_execute_command): New function.
-	* Makefile.in (cli-interp.c): Depend on top_h.
-	* wrapper.c (do_captured_execute_command): Moved to cli/cli-interp.c.
-	(gdb_execute_command): Removed.
-	* wrapper.h (gdb_execute_command): Removed.
-
-2002-09-04  Keith Seitz  <keiths@redhat.com>
-
-	* thread.c (do_captured_list_thread_ids): Call prune_threads
-	and target_find_new_threads.
-
-2002-08-29  Keith Seitz  <keiths@redhat.com>
-
-	* gdb-events.sh (context_changed): Rename to selected_thread_changed
-	to parallel selected_frame_level_changed.
-	* thread.c (do_captured_thread_select): Ditto.
-	* gdb-events.c: Regenerate.
-	* gdb-events.h: Regenerate.
-
-2002-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* interps.c (interpreter_exec_cmd): Temporarily set
-	current interpreter to quiet, too, so that we don't get
-	too many prompts when switching interpreters.
-
-2002-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* thread.c (do_captured_thread_select): Add context-changed
-	notification.
-	* infrun.c (handle_inferior_event): Remove context-changed
-	notification. The stop result already has this information.
-
-	* thread.c (do_captured_list_thread_ids): Use ui_out_list_begin/end
-	instead of ui_out_tuple_begin/end.
-
-2002-08-22  Keith Seitz  <keiths@redhat.com>
-
-	* breakpoint.c (internal_breakpoint_number): Revert 2002-06-18 change.
-	(create_internal_breakpoint): Likewise.
-	(watch_command_1): Use create_internal_breakpoint to create
-	the watchpoint scope breakpoint.
-
-2002-08-21  Keith Seitz  <keiths@redhat.com>
-
-	* gdb-events.sh: Replace register_update with target-changed event.
-	* gdb-events.c: Regenerated.
-	* gdb-events.c: Regenerated.
-	* valops.c (value_assign): Use target_changed_event instead
-	of register_update_event and memory_changed.
-
-2002-08-19  Keith Seitz  <keiths@redhat.com>
-
-	* stack.c (select_frame_command): Send selected-frame-level-changed
-	event notification, but only if the level actually changed.
-	(up_silently_base): Add selected-frame-level-changed event
-	notification.
-	(down_silently_base): Likewise.
-	(frame_command): Revert 2002-07-25 changes.
-	(up_command): Likewise.
-	(down_command): Likewise.
-
-2002-08-13  Keith Seitz  <keiths@redhat.com>
-
-	* interps.c (_initialize_interpreter): Remove ability to set
-	the interpreter. This could really undermine MI clients.
-	* top.c (catcher): Don't worry about interpreter changes.
-
-2002-08-12  Keith Seitz  <keiths@redhat.com>
-
-	* interps.c (_initialize_interpreter): Add completer function
-	to "set interpreter" command.
-
-2002-08-12  Keith Seitz  <keiths@redhat.com>
-
-	* interps.c: Run through gdb_indent.sh
-	* interps.h: Ditto.
-
-2002-08-08  Keith Seitz  <keiths@redhat.com>
-
-	* infrun.c (handle_inferior_event): Add context_changed_event.
-	* gdb-events.sh (context_hook): Removed comment.
-	(context_changed): Add new event.
-	* gdb-events.c: Regenerate.
-	* gdb-events.h: Regenerate.
-
-2002-07-25  Keith Seitz  <keiths@redhat.com>
-
-	* stack.c (frame_command): If the frame level changed, issue
-	a selected_frame_level_changed event.
-	(up_command): Add selected_frame_level_changed event;
-	(down_command): Likewise.
-
-	* gdb-events.sh: Add selected_frame_level_changed event.
-	* gdb-events.c: Regenerate.
-	* gdb-events.h: Regenerate.
-	
-	* stack.c (print_frame_info_base): Always set current_source_symtab
-	and current_source_line.
-
-	* cli/cli-interp.c (cli_interpreter_exec): Pass from_tty=1 to
-	gdb_execute_command.
-
-2002-07-22  Keith Seitz  <keiths@redhat.com>
-
-	* gdb-events.sh (register_changed_hook): Remove comment.
-	(register_update): New event.
-	* gdb-events.c: Regenerated.
-	* gdb-events.h: Regenerated.
-
-2002-07-22  Keith Seitz  <keiths@redhat.com>
-
-	* valops.c (value_assign): Add register_update event notification
-	for lval_register and lval_reg_frame_relative.
-
-2002-06-24  Keith Seitz  <keiths@redhat.com>
-
-	* Makefile.in (interps.o): Add gdb-events.h as a dependency.
-
-	* gdb-events.sh (clear_gdb_event_hooks): New function.
-	* gdb-events.c: Regenerate.
-	* gdb-events.h: Regenerate.
-
-	* cli-out.h (cli_out_set_stream): New function.
+2003-02-04  Jim Ingham <jingham@apple.com>
+	    Keith Seitz  <keiths@redhat.com>
+            Elena Zannoni  <ezannoni@redhat.com>
+            Andrew Cagney  <ac131313@redhat.com>
+
+	* cli/cli-interp.c: New file.
+	* interps.h, interps.c: New files.
+	* top.c: (gdb_init): Don't install the default interpreter, handed
+	by captured_main.
+	* main.c: Include "interps.h".
+	(interpreter_p): Note that it should malloc'ed.
+	(captured_command_loop): Call current_interp_command_loop.
+	(captured_main): Initialize interpreter_p to INTERP_CONSOLE.  Use
+	xfree and xstrdup when updating interpreter_p.  Install the
+	default interpreter.  Add hack to stop mi1's copyright notice
+	being encoded.
+	* event-top.h (gdb_setup_readline): Declare.
+	(gdb_disable_readline): Declare.
+	* event-top.c: Include "interps.h".
+	(display_gdb_prompt): Call current_interp_display_prompt_p.
+	(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
+	gdb_stdlog, and gdb_stdtarg.
+	(_initialize_event_loop): Don't call gdb_setup_readline.
 	* cli-out.c (cli_out_set_stream): New function.
+	* cli-out.h (cli_out_set_stream): Declare.
 
-	* interps.c: Include gdb-events.h.
-	(clear_interpreter_hooks): Also clear out event handlers.
-	(gdb_set_interpreter): Clear out any hooks/event handlers that
-	may have been installed by old interpreter.
-
-	* cli/cli-interp.c (cli_interpreter_exec): Set the stream for the
-	cli's uiout to gdb_stdout, which has probably changed from it's
-	initialization. Restore the original stream when we're done executing
-	in the interpreter.
-
-2002-06-18  Keith Seitz  <keiths@redhat.com>
-
-	* breakpoint.c (internal_breakpoint_number): Make static global.
-	(condition_command): Add modify breakpoint event notification.
-	(commands_command): Likewise.
-	(create_internal_breakpoint): internal_breakpoint_number is now global.
-	Add create breakpoint event notification.
-	(create_fork_vfork_event_catchpoint): Likewise.
-	(create_exec_event_catchpoint): Likewise.
-	(mention): Remove FIXME and create breakpoint event.
-	(create_breakpoints): Add create breakpoint event notification.
-	(watch_command_1): Likewise.
-	(create_exception_catchpoint): Likewise.
-	(set_breakpoint_sal): Likewise.
-	(set_ignore_count): Add modify breakopint event notification.
-	
-	* interps.h: Add GDB_INTERPRETER_MI1. GDB_INTERPRETER_MI will
-	now be mi version 2.
-
-	* cli/cli-interp.c (cli_uiout): Make static.
-	(cli_interp): Make static.
-	(cli_interpreter_exec): Use cli_uiout instead of uiout.
-
-2002-05-28  Keith Seitz  <keiths@redhat.com>
-
-	* cli/cli-interp.c: New file. Almost entirely from Apple's
-	sources. Collected and moved here.
-	* Makefile.in: Add new files.
-	Update dependencies on interps.h.
-	* defs.h (selected_frame_level_changed_hook): Add declaration.
-	* wrapper.c (captured_execute_command): New function.
-	(do_captured_execute_command): New function.
-	* wrapper.h (captured_execute_command): Declare.
-	* top.c (catcher): If the caught command changes the uiout on us,
-	try to do something sane, like using the current interpreter's
-	uiout.
-
-        From Jim Ingham <jingham@apple.com>:
-	* event-loop.c (start_event_loop): Poll the interpreter's event loop
-	as well as gdb...
-	* event-top.c (gdb_setup_readline, gdb_disable_readline): New functions,
-	used by console & mi to grab & relinquish control of the readline input.
-	* event-top.h (gdb_setup_readline, gdb_disable_readline): Declare.
-	* main.c (captured_main): Copy the interpreter name, since we will
-	eventually use it as a set variable.
-	* top.c (gdb_init): Use the interpreter mechanism to startup the stdin
-	handling.
-	* interps.c: New file. (Originally called interpreter.c by Apple)
-	* interps.h: New file. (Originally called interpreter.h by Apple)
-	* mi/mi-cmds.c, mi/mi-cmds.h: Add mi commands -interpreter-set and
-	-interpreter-exec.
-	* mi/mi-main.c: Add the interpreter functions.
-	(mi_execute_command): Don't print the prompt if the command return
-	is MI_CMD_QUIET.
-
-2003-02-02  Elena Zannoni  <ezannoni@redhat.com>
-
-	Fix PR gdb/742 gdb/743 gdb/877
-	* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
-	(do_mixed_source_and_assembly): Use
-	make_cleanup_ui_out_tuple_begin_end and
-	make_cleanup_ui_out_tuple_begin_end.
-	(do_mixed_source_and_assembly): Ditto.
-	* thread.c (do_captured_list_thread_ids): Ditto.
-	* ui-out.h (ui_out_table_begin, ui_out_list_begin,
-	ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
-	ui_out_tuple_end): Delete prototypes.
-	* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
-	ui_out_list_end, ui_out_tuple_end): Delete.
-
-	From Kevin Buettner  <kevinb@redhat.com>:
-	* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
-        * ui-out.c (make_cleanup_ui_out_table_begin_end)
-        (do_cleanup_table_end):  New functions.
-        * breakpoint.c (print_it_typical, print_one_breakpoint, mention):
-        Use cleanups to invoke_ui_out_tuple_end().
-        (breakpoint_1): Use cleanup to invoke ui_out_table_end().
-	* cli/cli-setshow.c (cmd_show_list): Use
-	make_cleanup_ui_out_tuple_begin_end.
-	
 2003-02-03  Jim Blandy  <jimb@redhat.com>
 
 	Use a single, consistent representation for an empty minimal
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b4d9676afe7..57648ec0ec5 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -745,10 +745,10 @@ cli_utils_h = $(srcdir)/cli/cli-utils.h
 # gdb/mi/ headers
 #
 
-mi_h = $(srcdir)/mi/mi.h
 mi_cmds_h = $(srcdir)/mi/mi-cmds.h
 mi_console_h = $(srcdir)/mi/mi-console.h
 mi_getopt_h = $(srcdir)/mi/mi-getopt.h
+mi_main_h = $(srcdir)/mi/mi-main.h
 mi_out_h = $(srcdir)/mi/mi-out.h
 mi_parse_h = $(srcdir)/mi/mi-parse.h
 
@@ -2513,13 +2513,13 @@ mi-getopt.o: $(srcdir)/mi/mi-getopt.c $(defs_h) $(mi_getopt_h) \
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-getopt.c
 mi-interp.o: $(srcdir)/mi/mi-interp.c $(defs_h) $(gdb_string_h) $(interps_h) \
 	$(event_top_h) $(event_loop_h) $(inferior_h) $(ui_out_h) $(top_h) \
-	$(mi_h) $(mi_cmds_h) $(mi_out_h) $(mi_console_h)
+	$(mi_main_h) $(mi_cmds_h) $(mi_out_h) $(mi_console_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-interp.c
 mi-main.o: $(srcdir)/mi/mi-main.c $(defs_h) $(target_h) $(inferior_h) \
 	$(gdb_string_h) $(top_h) $(gdbthread_h) $(mi_cmds_h) $(mi_parse_h) \
 	$(mi_getopt_h) $(mi_console_h) $(ui_out_h) $(mi_out_h) \
 	$(event_loop_h) $(event_top_h) $(gdbcore_h) $(value_h) $(regcache_h) \
-	$(gdb_h) $(frame_h)
+	$(gdb_h) $(frame_h) $(mi_main_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-main.c
 mi-out.o: $(srcdir)/mi/mi-out.c $(defs_h) $(ui_out_h) $(mi_out_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-out.c
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 09a82251ff3..e2116e70c58 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -1,5 +1,6 @@
-/* CLI Definitions for GDB
-   Copyright 2002 Free Software Foundation, Inc.
+/* CLI Definitions for GDB, the GNU debugger.
+
+   Copyright 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 89aeabf9536..2b2c4ff2785 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -251,8 +251,8 @@ display_gdb_prompt (char *new_prompt)
   int prompt_length = 0;
   char *gdb_prompt = get_prompt ();
 
-  /* Each interpreter has its own rules on wether or not display the
-     command prompt. */
+  /* Each interpreter has its own rules on displaying the command
+     prompt.  */
   if (!current_interp_display_prompt_p ())
     return;
 
diff --git a/gdb/interps.c b/gdb/interps.c
index c61c08a373a..551f416bb0f 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -1,6 +1,6 @@
 /* Manages interpreters for GDB, the GNU debugger.
 
-   Copyright 2000, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2002, 2003 Free Software Foundation, Inc.
 
    Written by Jim Ingham <jingham@apple.com> of Apple Computer, Inc.
 
diff --git a/gdb/interps.h b/gdb/interps.h
index 7bb1675b5c7..21362f4ddec 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -1,5 +1,7 @@
-/* Manages interpreters for gdb.
-   Copyright 2000,2002 Free Software Foundation, Inc.
+/* Manages interpreters for GDB, the GNU debugger.
+
+   Copyright 2000, 2002, 2003 Free Software Foundation, Inc.
+
    Written by Jim Ingham <jingham@apple.com> of Apple Computer, Inc.
 
    This file is part of GDB.
diff --git a/gdb/main.c b/gdb/main.c
index a1dbf4662f8..9e8c00d320b 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -1,7 +1,8 @@
 /* Top level stuff for GDB, the GNU debugger.
-   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
+
+   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
+   Foundation, Inc.
 
    This file is part of GDB.
 
@@ -54,9 +55,9 @@ int display_space;
    processes UI events asynchronously. */
 int event_loop_p = 1;
 
-/* Has an interpreter been specified and if so, which.
-   This will be used as a set command variable, so it should
-   always be malloc'ed - since do_setshow_command will free it. */
+/* The selected interpreter.  This will be used as a set command
+   variable, so it should always be malloc'ed - since
+   do_setshow_command will free it. */
 char *interpreter_p;
 
 /* Whether this is the command line version or not */
diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index d7f617e02f4..07f7d86642b 100644
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,220 +1,32 @@
-2003-02-03  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-interp.c, mi-main.c, mi.h: Update to current interp
-	interface.
-
-2002-11-05  Elena Zannoni  <ezannoni@redhat.com>
-
-        * mi-cmd-stack.c (mi_cmd_stack_select_frame): Remove stray statement.
-        Remove include of gdb-events.h.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* mi.h: Clean up interface, removing unnecessarily exported
-	functions and data structures.
-	* mi-events.c (mi_event_handlers): Move here...
-	* mi-interps.c: .. from here.
-	Include gdb_string.h.
-	
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* mi-interp.c (mi_interpreter_resume): Ditto.
-	(mi_cmd_interpreter_exec): Use gdb_interpreter_lookup.
-	(_initialize_mi_interp): Use gdb_interpreter_new,
-	gdb_interpreter_add.
-	* mi-cmd-break.c (mi_cmd_break_insert): Use
-	gdb_interpreter_current_is_named_p.
-	(mi_cmd_break_watch): Ditto.
-	* mi-events.c (mi_interp_stack_changed_hook): Ditto.
-	(event_notify): Ditto.
-	
-
-	* mi-main.c (captured_mi_execute_command): Use
-	gdb_interpreter_current_is_named_p.
-	(mi_load_progress): Ditto.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* mi-interp.c (_initialize_mi_interp): Use mi_interpreter_prompt_p
-	instead of mi_interpreter_prompt.
-	(mi_interpreter_prompt_p): Rename from mi_interpreter_prompt and
-	rewrite.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* mi-interp.c mi_interpreter_delete): Remove.
-	(_initialize_mi_interp): Remove mi_interpreter_delete.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* mi-interp.c (mi_interpreter_do_one_event): Remove.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* mi-cmd-break.c (mi_cmd_break_insert): Initialize old_hooks.
-	(mi_cmd_break_insert, mi_cmd_break_watch, mi_cmd_break_insert):
-	Increment MI version number.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-	* mi-interp.c: Increment mi version numbers: 0->1, 1->2,
-	and 2->3. Remove MI0 references.
-	* mi-events.c: Ditto.
-	* mi-main.c: Ditto. Remove erroneously merged code.
-	* mi.h: Ditto.
+2003-02-04  Jim Ingham <jingham@apple.com>
+	    Keith Seitz  <keiths@redhat.com>
+            Elena Zannoni  <ezannoni@redhat.com>
+            Andrew Cagney  <ac131313@redhat.com>
 	
-2002-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* mi-interp.c (_initialize_mi_interp): Add exec_proc.
-	(mi_interpreter_exec): New function. MI's exec_proc.
-
-2002-08-28  Keith Seitz  <keiths@redhat.com>
-
-	* gdbmi.texinfo: Document the interpreter-exec command.
-
-2002-08-21  Keith Seitz  <keiths@redhat.com>
-
-	* mi-events.c (mi_target_changed): Renamed from mi_register_update.
-	* mi.h (mi_target_changed): Ditto.
-	* mi-interp.c (mi_event_handlers): Ditto.
-
-2002-08-19  Keith Seitz  <keiths@redhat.com>
-
-	* mi-cmd-stack.c (mi_cmd_stack_select_frame): Revert 2002-07-25
-	change. stack.c now handles it properly.
-
-2002-08-13  Keith Seitz  <keiths@redhat.com>
-
-	* mi-interp.c (mi_cmd_interpreter_set): Remove. We're not going
-	to allow this.
-	* mi-cmds.c: Remove "interpreter-set" command.
-	* mi-cmds.h (mi_cmd_interpreter_set): Remove.
-
-2002-08-09  Keith Seitz  <keiths@redhat.com>
-
-	* gdbmi.texinfo: Document selected-frame-changed, register-update,
-	and context-changed events.
-
-2002-08-09  Keith Seitz  <keiths@redhat.com>
-
-	* gdbmi.texinfo (-data-list-register-names): Document "-numbers"
-	option.
-	* mi-main.c (mi_cmd_data_list_register_names): Add "-numbers"
-	option.
-
-2002-08-09  Keith Seitz  <keiths@redhat.com>
-
-        * mi-interp.c (mi_event_handlers): Add context_changed event
-        handler.
-	(mi_command_loop): Remove big block of code repeated in 
-	mi_interpreter_resume. I don't think this is needed.
-        (mi_insert_notify_hooks): Remove context_hook.
-        (mi_remove_notify_hooks): Likewise.
-        * mi-events.c (mi_context_changed): New function.
-        * mi.h (mi_context_changed): Add declaration.
-
-2002-07-25  Keith Seitz  <keiths@redhat.com>
-
-	* mi-interp.c (mi_event_handlers): Add selected_frame_level_changed
-	handler.
-	(mi_insert_notify_hooks): Remove breakpoint hooks and frame
-	changed hook.
-	(mi_remove_notify_hooks): Likewise.
-	* mi-events.c (mi_selected_frame_level_changed): New function.
-	(mi_interp_frame_changed_hook): Remove.
-	(mi_interp_create_breakpoint_hook): Remove.
-	(mi_interp_modify_breakpoint_hook): Remove.
-	(mi_interp_delete_breakpoint_hook): Remove.
-	* mi.h (mi_selected_frame_level_changed): Add declaration.
-        (mi_interp_create_breakpoint_hook): Remove declaration.
-        (mi_interp_modify_breakpoint_hook): Remove declaration.
-        (mi_interp_delete_breakpoint_hook): Remove declaration.
-	* mi-cmd-stack.c (mi_cmd_stack_select_frame): If the stack level changes,
-	issue a selected_frame_level_changed event.
-
-2002-07-22  Keith Seitz  <keiths@redhat.com>
-
-	* mi-events.c (mi_register_update): New function.
-	* mi-interp.c (mi_event_handlers): Add mi_register_update
-	event handler.
-	* mi.h (mi_register_update): Add declaration.
-	
-2002-06-24  Keith Seitz  <keiths@redhat.com>
-
-	* mi-cmds.h (mi_execute_command): Add "extern".
+	* mi-main.h: New file.
+	* mi-interp.c: New file.
+	* mi-main.c: Include "interps.h".
+	(mi_error_message): Make global.
+	(mi_input): Delete static function, moved to "mi-interp.c".
+	(mi_execute_command, mi_execute_command_wrapper): Ditto.
+	(mi_command_loop, mi1_command_loop, mi2_command_loop): Ditto.
+	(mi_load_progress): Make non-static.
 	(mi_error_last_message): New function.
-	* mi-main.c (mi_error_last_message): New function.
-	* mi-interp.c (mi_event_handlers): New static global.
-	(mi_interpreter_init): Don't install mi event handlers here.
-	(mi_interpreter_resume): Install mi event handlers here.
-	(mi_interpreter_exec): Don't actually switch interpreters.
-	Update error messages.
-	exec_proc will return <0 if an error occurs.
-
-2002-06-19  Keith Seitz  <keiths@redhat.com>
-
-	* mi-cmd-break.c (breakpoint_notify): Only query the breakpoint
-	for user breakpoints.
-	(mi_cmd_break_insert): Only reset event handlers for MI0 and MI1
-	interpreters.
-	(mi_cmd_break_watch): Reset uiout output to clear watchpoint
-	query. This is only used for MI0 and MI1.
-
-	* mi-console.h (mi_console_file_new): Add "quote" parameter.
-	* mi_console.c (struct mi_console_file): Add "quote".
-	(mi_console_file_new): Add "quote" parameter.
-	(mi_console_raw_packet): Use the quote character specified in
-	mi_console_file_new, instead of assuming it is '"'.
-
-	* mi-interp.c (mi_event_channel): New channel for event notifications.
-	(mi_interpreter_init): Make static.
-	Set event handlers.
-	(mi_interpreter_resume): Make static.
-	Deal with MI version bump.
-	(mi_interpreter_suspend): Make static.
-	(mi_interpreter_delete): Ditto.
-	(mi_do_one_event): Ditto.
-	(mi_cmd_exec_continuation): Ditto.
-	(mi_interp_query_hook): Ditto.
-	(mi_interp_read_one_line_hook): Ditto.
-	(_initialize_mi_interp): Create explicit mi1 interp.
-
-	* mi-events.c (notify_event): New helper function.
-	(mi_create_breakpoint, mi_modify_breakpoint, mi_delete_breakpoint,
-	mi_create_tracepoint, mi_modify_tracepoint, mi_delete_tracepoint,
-	mi_architecture_changed): New functions.
-
-	* mi.h: Add declarations for mi_create_breakpoint, mi_modify_breakpoint,
-	mi_delete_breakpoint, mi_create_tracepoint, mi_modify_tracepoint,
-	mi_delete_tracepoint, mi_architecture_changed, mi_stdout, mi_stderr,
-	mi_stdtarg, mi_stdlog, and mi_eventchannel.
-
-	* mi-main.c (captured_mi_execute_command): Deal with mi version
-	bump.
-	(mi_load_progress): Ditto.
-
-	* gdbmi.texinfo: Expand notify-async-output to include GDB events.
-	Update all examples to show breakpoint events and
-	remove redundant breakpoint info on "-break-insert" and "-break-watch".
-	The event now supplies everything that is needed.
-
-2002-05-28  Keith Seitz  <keiths@redhat.com>
-
-	* mi-interp.c:  New file. Almost entirely from Apple's
-	sources. Collected and moved here.
-	* mi-events.c: Ditto.
-	* mi.h: New file.
-	* mi-main.c (captured_execute_command): Use catch_exception
-	instead of catch_errors.
-	(mi_execute_command_wrapper): Remove. Using catch_errors now.
-	(mi_input): Make global.
-	(mi_load_progress): Ditto.
-	Use interpreter functions instead of interpreter_p.
-	(mi_command_loop): Moved to mi-interp.c
-	(mi0_command_loop): Ditto.
-	(mi1_command_loop): Ditto.
-	(mi_init_ui): Remove.
-	(_initialize_mi_main): Remove. No longer needed.
+	(captured_mi_execute_command): If the interpreter changed, don't
+	print anything.
+	(mi_load_progress): Use current_interp_named_p.
+	(mi_init_ui): Delete function.
+	(_initialize_mi_main): Don't install the mi interpreter, handled
+	by "mi-interp.c".
+	(mi_exec_async_cli_cmd_continuation): Make static.
+	* mi-console.h (mi_console_file_new): Add `quote' parameter.
+	* mi-console.c (struct mi_console_file): Add `quote'.
+	(mi_console_file_new): Add `quote' parameter.  Initialize `quote'.
+	(mi_console_raw_packet): Only quote the output when `quote'.
+	* mi-cmds.h (mi_cmd_interpreter_exec): Declare.
+	(mi_error_message, mi_error_last_message): Declare.
+	(mi_execute_command): Declare.
+	* mi-cmds.c: Add `interpreter-exec' command.
 
 2003-02-02  Andrew Cagney  <ac131313@redhat.com>
 
diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index 1447d57ffb2..5a0bf50754e 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -1,5 +1,7 @@
-/* MI Command Set.
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+/* MI Command Set for GDB, the GNU debugger.
+
+   Copyright 2000, 2001, 2003 Free Software Foundation, Inc.
+
    Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.
diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h
index d346a7659b2..3eb6153694e 100644
--- a/gdb/mi/mi-cmds.h
+++ b/gdb/mi/mi-cmds.h
@@ -1,5 +1,7 @@
-/* MI Command Set.
-   Copyright 2000 Free Software Foundation, Inc.
+/* MI Command Set for GDB, the GNU debugger.
+
+   Copyright 2000, 2003 Free Software Foundation, Inc.
+
    Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.
diff --git a/gdb/mi/mi-console.h b/gdb/mi/mi-console.h
index 99ecb73e154..bc6c0085398 100644
--- a/gdb/mi/mi-console.h
+++ b/gdb/mi/mi-console.h
@@ -22,7 +22,8 @@
 #ifndef MI_CONSOLE_H
 #define MI_CONSOLE_H
 
-extern struct ui_file *mi_console_file_new (struct ui_file *raw, const char *prefix,
+extern struct ui_file *mi_console_file_new (struct ui_file *raw,
+					    const char *prefix,
 					    char quote);
 
 #endif
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 3db94bebc41..bf5873a61df 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -1,5 +1,6 @@
-/* MI Interpreter Definitions and Commands
-   Copyright 2002 Free Software Foundation, Inc.
+/* MI Interpreter Definitions and Commands for GDB, the GNU debugger.
+
+   Copyright 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -27,7 +28,7 @@
 #include "ui-out.h"
 #include "top.h"
 
-#include "mi.h"
+#include "mi-main.h"
 #include "mi-cmds.h"
 #include "mi-out.h"
 #include "mi-console.h"
@@ -98,7 +99,6 @@ mi_interpreter_resume (void *data)
   /* As per hack note in mi_interpreter_init, swap in the output channels... */
 
   gdb_setup_readline ();
-  mi_register_gdbarch_swap ();
 
   if (event_loop_p)
     {
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 2f21f74cf66..8a54108bca4 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -84,23 +84,18 @@ char *mi_error_message;
 static char *old_regs;
 
 extern void _initialize_mi_main (void);
-void mi_execute_command (char *cmd, int from_tty);
 static enum mi_cmd_result mi_cmd_execute (struct mi_parse *parse);
 
 static void mi_execute_cli_command (const char *cli, char *args);
 static enum mi_cmd_result mi_execute_async_cli_command (char *mi, char *args, int from_tty);
 
-void mi_exec_async_cli_cmd_continuation (struct continuation_arg *arg);
+static void mi_exec_async_cli_cmd_continuation (struct continuation_arg *arg);
 
 static int register_changed_p (int regnum);
 static int get_register (int regnum, int format);
-void mi_load_progress (const char *section_name,
-		       unsigned long sent_so_far,
-		       unsigned long total_section,
-		       unsigned long total_sent,
-		       unsigned long grand_total);
 
-/* A helper function which will set mi_error_message to error_last_message. */
+/* A helper function which will set mi_error_message to
+   error_last_message.  */
 void
 mi_error_last_message (void)
 {
@@ -1411,7 +1406,6 @@ mi_load_progress (const char *section_name,
   int new_section;
 
   if (!current_interp_named_p (INTERP_MI)
-      && !current_interp_named_p (INTERP_MI2)
       && !current_interp_named_p (INTERP_MI1))
     return;
 
@@ -1480,7 +1474,7 @@ mi_setup_architecture_data (void)
 }
 
 void
-mi_register_gdbarch_swap (void)
+_initialize_mi_main (void)
 {
   register_gdbarch_swap (&old_regs, sizeof (old_regs), NULL);
   register_gdbarch_swap (NULL, 0, mi_setup_architecture_data);
diff --git a/gdb/mi/mi.h b/gdb/mi/mi-main.h
index b45ef0c29db..8e504c6076e 100644
--- a/gdb/mi/mi.h
+++ b/gdb/mi/mi-main.h
@@ -1,5 +1,6 @@
-/* MI Internal Functions
-   Copyright 2002 Free Software Foundation, Inc.
+/* MI Internal Functions for GDB, the GNU debugger.
+
+   Copyright 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -18,20 +19,15 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef MI_H
-#define MI_H
-/* The mi interpreters. */
-
-extern struct interp *mi_interp;
-extern struct interp *mi1_interp;
-extern struct ui_file *mi_event_channel;
+#ifndef MI_MAIN_H
+#define MI_MAIN_H
 
 extern void mi_setup_architecture_data (void);
-extern void mi_register_gdbarch_swap (void);
 
 extern void mi_load_progress (const char *section_name,
 			      unsigned long sent_so_far,
 			      unsigned long total_section,
 			      unsigned long total_sent,
 			      unsigned long grand_total);
-#endif /* MI_H */
+#endif
+
diff --git a/gdb/top.c b/gdb/top.c
index e488450808b..fea71dfd87f 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -63,7 +63,6 @@
 #include <ctype.h>
 #include "ui-out.h"
 #include "cli-out.h"
-#include "interps.h"
 
 /* Default command line prompt.  This is overriden in some configs. */
 
@@ -2125,5 +2124,4 @@ gdb_init (char *argv0)
      it wants GDB to revert to the CLI, it should clear init_ui_hook. */
   if (init_ui_hook)
     init_ui_hook (argv0);
-
 }