diff options
-rw-r--r-- | gdb/fork-child.c | 3 | ||||
-rw-r--r-- | gdb/inferior.h | 7 | ||||
-rw-r--r-- | gdb/linux-nat.c | 4 | ||||
-rw-r--r-- | gdbserver/fork-child.cc | 5 | ||||
-rw-r--r-- | gdbserver/inferiors.h | 7 | ||||
-rw-r--r-- | gdbserver/linux-low.cc | 16 |
6 files changed, 38 insertions, 4 deletions
diff --git a/gdb/fork-child.c b/gdb/fork-child.c index 89003fa..66b523e 100644 --- a/gdb/fork-child.c +++ b/gdb/fork-child.c @@ -126,6 +126,9 @@ gdb_startup_inferior (pid_t pid, int num_traps) inferior *inf = current_inferior (); process_stratum_target *proc_target = inf->process_target (); + scoped_restore save_starting_up + = make_scoped_restore (&inf->starting_up, true); + ptid_t ptid = startup_inferior (proc_target, pid, num_traps, NULL, NULL); /* Mark all threads non-executing. */ diff --git a/gdb/inferior.h b/gdb/inferior.h index f6e26a3..c376d78 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -551,6 +551,13 @@ public: architecture/description. */ bool needs_setup = false; + /* True if the inferior is starting up (inside startup_inferior), + and we're nursing it along (through the shell) until it is ready + to execute its first instruction. Until that is done, we must + not access inferior memory or registers, as we haven't determined + the target architecture/description. */ + bool starting_up = false; + /* True when we are reading the library list of the inferior during an attach or handling a fork child. */ bool in_initial_library_scan = false; diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index b9164e6..0a93ab5 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -2539,6 +2539,10 @@ save_stop_reason (struct lwp_info *lp) if (!linux_target->low_status_is_event (lp->status)) return; + inferior *inf = find_inferior_ptid (linux_target, lp->ptid); + if (inf->starting_up) + return; + regcache = get_thread_regcache (linux_target, lp->ptid); gdbarch = regcache->arch (); diff --git a/gdbserver/fork-child.cc b/gdbserver/fork-child.cc index 96dd4d0..7ea66f2 100644 --- a/gdbserver/fork-child.cc +++ b/gdbserver/fork-child.cc @@ -18,6 +18,7 @@ #include "server.h" #include "gdbsupport/job-control.h" +#include "gdbsupport/scoped_restore.h" #include "nat/fork-inferior.h" #ifdef HAVE_SIGNAL_H #include <signal.h> @@ -103,6 +104,10 @@ post_fork_inferior (int pid, const char *program) atexit (restore_old_foreground_pgrp); #endif + process_info *proc = find_process_pid (pid); + scoped_restore save_starting_up + = make_scoped_restore (&proc->starting_up, true); + startup_inferior (the_target, pid, START_INFERIOR_TRAPS_EXPECTED, &cs.last_status, &cs.last_ptid); diff --git a/gdbserver/inferiors.h b/gdbserver/inferiors.h index f3ba4d8..6de746c 100644 --- a/gdbserver/inferiors.h +++ b/gdbserver/inferiors.h @@ -75,6 +75,13 @@ struct process_info /* Flag to mark that the DLL list has changed. */ bool dlls_changed = false; + + /* True if the inferior is starting up (inside startup_inferior), + and we're nursing it along (through the shell) until it is ready + to execute its first instruction. Until that is done, we must + not access inferior memory or registers, as we haven't determined + the target architecture/description. */ + bool starting_up = false; }; /* Get the pid of PROC. */ diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 8b8614f..2f71360 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -747,8 +747,8 @@ linux_process_target::handle_extended_wait (lwp_info **orig_event_lwp, CORE_ADDR linux_process_target::get_pc (lwp_info *lwp) { - struct regcache *regcache; - CORE_ADDR pc; + process_info *proc = get_thread_process (get_lwp_thread (lwp)); + gdb_assert (!proc->starting_up); if (!low_supports_breakpoints ()) return 0; @@ -756,8 +756,8 @@ linux_process_target::get_pc (lwp_info *lwp) scoped_restore_current_thread restore_thread; switch_to_thread (get_lwp_thread (lwp)); - regcache = get_thread_regcache (current_thread, 1); - pc = low_get_pc (regcache); + struct regcache *regcache = get_thread_regcache (current_thread, 1); + CORE_ADDR pc = low_get_pc (regcache); threads_debug_printf ("pc is 0x%lx", (long) pc); @@ -797,6 +797,14 @@ linux_process_target::save_stop_reason (lwp_info *lwp) if (!low_supports_breakpoints ()) return false; + process_info *proc = get_thread_process (get_lwp_thread (lwp)); + if (proc->starting_up) + { + /* Claim we have the stop PC so that the caller doesn't try to + fetch it itself. */ + return true; + } + pc = get_pc (lwp); sw_breakpoint_pc = pc - low_decr_pc_after_break (); |