diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/inflow.c | 33 | ||||
| -rw-r--r-- | gdb/target.c | 30 | ||||
| -rw-r--r-- | gdb/utils.c | 5 |
4 files changed, 42 insertions, 34 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1c411a4..150258b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +Sat May 14 15:13:52 1994 Stan Shebs (shebs@andros.cygnus.com) + + * inflow.c (job_control, attach_flag, generic_mourn_inferior): + Remove, needed for both native and cross. + * target.c (attach_flag, generic_mourn_inferior): Put here. + * utils.c (job_control): Put here. + (terminal.h): Don't include anymore. + Sat May 14 09:11:44 1994 Jim Kingdon (kingdon@lioth.cygnus.com) * source.c (find_source_lines): Always use code that was #ifdef diff --git a/gdb/inflow.c b/gdb/inflow.c index fc0bc35..4ccbd36 100644 --- a/gdb/inflow.c +++ b/gdb/inflow.c @@ -57,16 +57,6 @@ kill_command PARAMS ((char *, int)); static void terminal_ours_1 PARAMS ((int)); - -/* Nonzero if we have job control. */ - -int job_control; - -/* Nonzero if we are debugging an attached outside process - rather than an inferior. */ - -int attach_flag; - /* Record terminal status separately for debugger and inferior. */ @@ -562,29 +552,6 @@ kill_command (arg, from_tty) print_stack_frame (selected_frame, selected_frame_level, 1); } } - -/* The inferior process has died. Long live the inferior! */ - -void -generic_mourn_inferior () -{ - inferior_pid = 0; - attach_flag = 0; - breakpoint_init_inferior (); - registers_changed (); - -#ifdef CLEAR_DEFERRED_STORES - /* Delete any pending stores to the inferior... */ - CLEAR_DEFERRED_STORES; -#endif - - reopen_exec_file (); - reinit_frame_cache (); - - /* It is confusing to the user for ignore counts to stick around - from previous runs of the inferior. So clear them. */ - breakpoint_clear_ignore_counts (); -} /* Call set_sigint_trap when you need to pass a signal on to an attached process when handling SIGINT */ diff --git a/gdb/target.c b/gdb/target.c index 456fffd..10f2213 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -117,6 +117,11 @@ struct target_ops **current_target_stack; static struct cmd_list_element *targetlist = NULL; +/* Nonzero if we are debugging an attached outside process + rather than an inferior. */ + +int attach_flag; + /* The user just typed 'target' without the name of a target. */ /* ARGSUSED */ @@ -718,6 +723,8 @@ target_link (modname, t_reloc) if (STREQ(current_target->to_shortname, "rombug")) { (current_target->to_lookup_symbol) (modname, t_reloc); + if (*t_reloc == 0) + error("Unable to link to %s and get relocation in rombug", modname); } else *t_reloc = (CORE_ADDR)-1; @@ -808,6 +815,29 @@ find_core_target () return(count == 1 ? runable : NULL); } +/* The inferior process has died. Long live the inferior! */ + +void +generic_mourn_inferior () +{ + inferior_pid = 0; + attach_flag = 0; + breakpoint_init_inferior (); + registers_changed (); + +#ifdef CLEAR_DEFERRED_STORES + /* Delete any pending stores to the inferior... */ + CLEAR_DEFERRED_STORES; +#endif + + reopen_exec_file (); + reinit_frame_cache (); + + /* It is confusing to the user for ignore counts to stick around + from previous runs of the inferior. So clear them. */ + breakpoint_clear_ignore_counts (); +} + /* This table must match in order and size the signals in enum target_signal in target.h. */ static struct { diff --git a/gdb/utils.c b/gdb/utils.c index b914c5b..1956984 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -30,7 +30,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "signals.h" #include "gdbcmd.h" #include "serial.h" -#include "terminal.h" /* For job_control */ #include "bfd.h" #include "target.h" #include "demangle.h" @@ -73,6 +72,10 @@ set_width_command PARAMS ((char *, int, struct cmd_list_element *)); static struct cleanup *cleanup_chain; +/* Nonzero if we have job control. */ + +int job_control; + /* Nonzero means a quit has been requested. */ int quit_flag; |