This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Re: [PATCH/RFA] clean up some extern's
- From: Elena Zannoni <ezannoni at redhat dot com>
- To: Andrew Cagney <ac131313 at redhat dot com>
- Cc: Elena Zannoni <ezannoni at redhat dot com>, gdb-patches at sources dot redhat dot com
- Date: Wed, 2 Oct 2002 17:31:49 -0400
- Subject: Re: [PATCH/RFA] clean up some extern's
- References: <15767.47183.440648.15491@localhost.redhat.com><3D9B615F.5060908@redhat.com>
Andrew Cagney writes:
> > I started from mi-main.c and ended up fixing some other things.
> > I didn't test that v850ice.c builds, I don't have a cygwin host handy.
> > OK to commit?
>
> Don't be to worried about the v850ice.c file. It, according to a recent
> post, doesn't build anyway.
>
> I can't see there being problems with the extern moves. Moving an
> extern out of a .c file and into a .h file has to be pretty obvious.
> (only 290 other externs to go ....)
>
> Andrew
>
committed.
Elena
>
> > 2002-09-29 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.
> >
> >
> > Index: Makefile.in
> > ===================================================================
> > RCS file: /cvs/uberbaum/gdb/Makefile.in,v
> > retrieving revision 1.265
> > diff -u -p -r1.265 Makefile.in
> > --- Makefile.in 27 Sep 2002 19:33:48 -0000 1.265
> > +++ Makefile.in 29 Sep 2002 23:14:30 -0000
> > @@ -2490,7 +2493,7 @@ mi-main.o: $(srcdir)/mi/mi-main.c $(defs
> > $(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
> >
> > Index: tracepoint.c
> > ===================================================================
> > RCS file: /cvs/uberbaum/gdb/tracepoint.c,v
> > retrieving revision 1.41
> > diff -u -p -r1.41 tracepoint.c
> > --- tracepoint.c 12 Sep 2002 19:49:56 -0000 1.41
> > +++ tracepoint.c 29 Sep 2002 23:15:46 -0000
> > @@ -73,10 +73,6 @@ extern int addressprint; /* Print machin
> > */
> >
> > 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. */
> >
> > Index: v850ice.c
> > ===================================================================
> > RCS file: /cvs/uberbaum/gdb/v850ice.c,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 v850ice.c
> > --- v850ice.c 4 May 2001 04:15:28 -0000 1.11
> > +++ v850ice.c 29 Sep 2002 23:16:02 -0000
> > @@ -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 */
> >
> > Index: inferior.h
> > ===================================================================
> > RCS file: /cvs/uberbaum/gdb/inferior.h,v
> > retrieving revision 1.31
> > diff -u -p -r1.31 inferior.h
> > --- inferior.h 26 Aug 2002 19:18:33 -0000 1.31
> > +++ inferior.h 29 Sep 2002 23:17:40 -0000
> > @@ -315,6 +315,20 @@ 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;
> >
> > Index: frame.h
> > ===================================================================
> > RCS file: /cvs/uberbaum/gdb/frame.h,v
> > retrieving revision 1.25
> > diff -u -p -r1.25 frame.h
> > --- frame.h 25 Sep 2002 20:30:37 -0000 1.25
> > +++ frame.h 29 Sep 2002 23:18:22 -0000
> > @@ -373,4 +373,13 @@ extern int frame_register_read (struct f
> > 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) */
> >
> >
> > tui/ChangeLog
> >
> > 2002-09-29 Elena Zannoni <ezannoni@redhat.com>
> >
> > * tui-hooks.c (selected_frame_level_changed_hook): Use the one
> > exported from frame.h.
> >
> > Index: tui-hooks.c
> > ===================================================================
> > RCS file: /cvs/uberbaum/gdb/tui/tui-hooks.c,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 tui-hooks.c
> > --- tui-hooks.c 10 Sep 2002 19:59:31 -0000 1.8
> > +++ tui-hooks.c 30 Sep 2002 02:03:04 -0000
> > @@ -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);
> >
> >
> > mi/ChangeLog:
> >
> > 2002-09-29 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.
> >
> > Index: mi/mi-main.c
> > ===================================================================
> > RCS file: /cvs/uberbaum/gdb/mi/mi-main.c,v
> > retrieving revision 1.31
> > diff -u -p -r1.31 mi-main.c
> > --- mi/mi-main.c 11 Sep 2002 21:49:04 -0000 1.31
> > +++ mi/mi-main.c 29 Sep 2002 23:20:52 -0000
> > @@ -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
> > 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
> > 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 f
> > "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);
> >
>