2002-10-02 Elena Zannoni <ezannoni@redhat.com>

        * inferior.h (registers_info, stepi_command, nexti_command,
        continue_command, interrupt_target_command): Export from infcmd.c.
        * frame.h (args_info, selected_frame_level_changed_hook,
        return_command): Export from stack.c.
        * v850ice.c (stepi_command, nexti_command, continue_command): use
        prototypes from inferior.h.
        * tracepoint.c (registers_info, args_info, locals_info): Use
        prototypes from frame.h and inferior.h.
        * Makefile.in (mi-main.o): Add dependency on frame.h.

2002-10-02  Elena Zannoni  <ezannoni@redhat.com>

        * mi-main.c (mi_cmd_exec_return): Don't use
        return_command_wrapper, use return_command instead.
        (mi_cmd_exec_interrupt): Don't use
        interrupt_target_command_wrapper, use interrupt_target_command
        instead.
        (return_command_wrapper, interrupt_target_command_wrapper):
        Delete.
        Include frame.h.

2002-10-02  Elena Zannoni  <ezannoni@redhat.com>

        * tui-hooks.c (selected_frame_level_changed_hook): Use the one
        exported from frame.h.

10 files changed, 53 insertions, 21 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5bb236a..6068879 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-02  Elena Zannoni  <ezannoni@redhat.com>
+ 
+	* inferior.h (registers_info, stepi_command, nexti_command,
+	continue_command, interrupt_target_command): Export from infcmd.c.
+	* frame.h (args_info, selected_frame_level_changed_hook,
+	return_command): Export from stack.c.
+	* v850ice.c (stepi_command, nexti_command, continue_command): use
+	prototypes from inferior.h.
+	* tracepoint.c (registers_info, args_info, locals_info): Use
+	prototypes from frame.h and inferior.h.
+	* Makefile.in (mi-main.o): Add dependency on frame.h.
+
 2002-10-02  Andrew Cagney  <ac131313@redhat.com>
 
 	* rs6000-tdep.c (rs6000_store_struct_return): Store struct_return
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 21031d2..95330c0 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2493,7 +2493,7 @@ 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)
+	$(gdb_h) $(frame_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/frame.h b/gdb/frame.h
index 79bb3d9..849566b 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -373,4 +373,13 @@ extern int frame_register_read (struct frame_info *frame, int regnum,
 extern int frame_map_name_to_regnum (const char *name, int strlen);
 extern const char *frame_map_regnum_to_name (int regnum);
 
+/* From stack.c.  */
+extern void args_info (char *, int);
+
+extern void locals_info (char *, int);
+
+extern void (*selected_frame_level_changed_hook) (int);
+
+extern void return_command (char *, int);
+
 #endif /* !defined (FRAME_H)  */
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 8035ccd..2cccda1 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -315,6 +315,16 @@ extern char *set_inferior_args (char *);
 
 extern void set_inferior_args_vector (int, char **);
 
+extern void registers_info (char *, int);
+
+extern void nexti_command (char *, int);
+
+extern void stepi_command (char *, int);
+
+extern void continue_command (char *, int);
+
+extern void interrupt_target_command (char *args, int from_tty);
+
 /* Last signal that the inferior received (why it stopped).  */
 
 extern enum target_signal stop_signal;
diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index 6376bf0..7a1552f 100644
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,3 +1,14 @@
+2002-10-02  Elena Zannoni  <ezannoni@redhat.com>
+
+	* mi-main.c (mi_cmd_exec_return): Don't use
+	return_command_wrapper, use return_command instead.
+	(mi_cmd_exec_interrupt): Don't use
+	interrupt_target_command_wrapper, use interrupt_target_command
+	instead.
+	(return_command_wrapper, interrupt_target_command_wrapper):
+	Delete.
+	Include frame.h.
+
 2002-10-01  Andrew Cagney  <ac131313@redhat.com>
 
 	* mi-main.c (mi2_command_loop): New function.
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index b92ebf8..4177592 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -39,6 +39,8 @@
 #include "value.h"		/* for write_register_bytes() */
 #include "regcache.h"
 #include "gdb.h"
+#include "frame.h"
+
 #include <ctype.h>
 #include <sys/time.h>
 
@@ -99,12 +101,6 @@ static void mi_load_progress (const char *section_name,
 			      unsigned long total_sent,
 			      unsigned long grand_total);
 
-/* FIXME: these should go in some .h file, but infcmd.c doesn't have a
-   corresponding .h file. These wrappers will be obsolete anyway, once
-   we pull the plug on the sanitization. */
-extern void interrupt_target_command_wrapper (char *, int);
-extern void return_command_wrapper (char *, int);
-
 /* Command implementations. FIXME: Is this libgdb? No.  This is the MI
    layer that calls libgdb.  Any operation used in the below should be
    formalized. */
@@ -179,11 +175,11 @@ mi_cmd_exec_return (char *args, int from_tty)
   if (*args)
     /* Call return_command with from_tty argument equal to 0 so as to
        avoid being queried. */
-    return_command_wrapper (args, 0);
+    return_command (args, 0);
   else
     /* Call return_command with from_tty argument equal to 0 so as to
        avoid being queried. */
-    return_command_wrapper (NULL, 0);
+    return_command (NULL, 0);
 
   /* Because we have called return_command with from_tty = 0, we need
      to print the frame here. */
@@ -215,7 +211,7 @@ mi_cmd_exec_interrupt (char *args, int from_tty)
 		 "mi_cmd_exec_interrupt: Inferior not executing.");
       return MI_CMD_ERROR;
     }
-  interrupt_target_command_wrapper (args, from_tty);
+  interrupt_target_command (args, from_tty);
   if (last_async_command)
     fputs_unfiltered (last_async_command, raw_stdout);
   fputs_unfiltered ("^done", raw_stdout);
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 2d12f31..b2900b6 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -73,10 +73,6 @@ extern int addressprint;	/* Print machine addresses? */
  */  
 
 extern void output_command (char *, int);
-extern void registers_info (char *, int);
-extern void args_info (char *, int);
-extern void locals_info (char *, int);
-
 
 /* If this definition isn't overridden by the header files, assume
    that isatty and fileno exist on this system.  */
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index e2bc95f..8fdc4bc 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-02  Elena Zannoni  <ezannoni@redhat.com>
+
+	* tui-hooks.c (selected_frame_level_changed_hook): Use the one
+	exported from frame.h.
+
 2002-09-29  Elena Zannoni  <ezannoni@redhat.com>
 
 	* tui.c (tui_show_source): Don't access current_source_symtab, use
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index 3beca39..e1aad9f 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -69,7 +69,6 @@
 int tui_target_has_run = 0;
 
 static void (* tui_target_new_objfile_chain) (struct objfile*);
-extern void (*selected_frame_level_changed_hook) (int);
 static void tui_event_loop (void);
 static void tui_command_loop (void);
 
diff --git a/gdb/v850ice.c b/gdb/v850ice.c
index 1aec483..958eac3 100644
--- a/gdb/v850ice.c
+++ b/gdb/v850ice.c
@@ -50,12 +50,6 @@ struct MessageIO
 /* Prototypes for functions located in other files */
 extern void break_command (char *, int);
 
-extern void stepi_command (char *, int);
-
-extern void nexti_command (char *, int);
-
-extern void continue_command (char *, int);
-
 extern int (*ui_loop_hook) (int);
 
 /* Prototypes for local functions */