diff options
| -rw-r--r-- | gdb/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/Makefile.in | 8 | ||||
| -rw-r--r-- | gdb/linux-fork.c | 39 |
3 files changed, 41 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 43b76df..bf4c68d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2006-03-24 Daniel Jacobowitz <dan@codesourcery.com> + + * linux-fork.c: Include "gdb_assert.h". + (fork_load_infrun_state): Set inferior_ptid and stop_pc here. + Update the register cache and selected frame also. + (linux_fork_mourn_inferior): Use fork_load_infrun_state. Return + to single fork mode if necessary. + (linux_fork_context): Remove bits handled by fork_load_infrun_state. + * Makefile.in (linux_fork_h): New. + (linux-fork.o, linux-nat.o): Update. + 2006-03-23 Andreas Schwab <schwab@suse.de> * config/s390/s390.mh (NATDEPFILES): Add linux-fork.o. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f066124..29aa218 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -726,6 +726,7 @@ kod_h = kod.h language_h = language.h libunwind_frame_h = libunwind-frame.h $(libunwind_h) linespec_h = linespec.h +linux_fork_h = linux-fork.h linux_nat_h = linux-nat.h $(target_h) m2_lang_h = m2-lang.h m32r_tdep_h = m32r-tdep.h @@ -2188,12 +2189,13 @@ linespec.o: linespec.c $(defs_h) $(symtab_h) $(frame_h) $(command_h) \ $(symfile_h) $(objfiles_h) $(source_h) $(demangle_h) $(value_h) \ $(completer_h) $(cp_abi_h) $(parser_defs_h) $(block_h) \ $(objc_lang_h) $(linespec_h) $(exceptions_h) -linux-fork.o: linux-fork.c linux-fork.h $(defs_h) $(inferior_h) \ - $(regcache_h) $(gdbcmd_h) $(infcall_h) +linux-fork.o: linux-fork.c $(defs_h) $(inferior_h) $(regcache_h) $(gdbcmd_h) \ + $(infcall_h) $(gdb_assert_h) $(gdb_string_h) $(linux_fork_h) linux-nat.o: linux-nat.c $(defs_h) $(inferior_h) $(target_h) $(gdb_string_h) \ $(gdb_wait_h) $(gdb_assert_h) $(linux_nat_h) $(gdbthread_h) \ $(gdbcmd_h) $(regcache_h) $(inf_ptrace.h) $(auxv.h) $(elf_bfd_h) \ - $(gregset_h) $(gdbcore_h) $(gdbthread_h) $(gdb_stat_h) linux-fork.h + $(gregset_h) $(gdbcore_h) $(gdbthread_h) $(gdb_stat_h) \ + $(linux_fork_h) linux-thread-db.o: linux-thread-db.c $(defs_h) $(gdb_assert_h) \ $(gdb_proc_service_h) $(gdb_thread_db_h) $(bfd_h) $(exceptions_h) \ $(gdbthread_h) $(inferior_h) $(symfile_h) $(objfiles_h) $(target_h) \ diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index f024490..88bea61 100644 --- a/gdb/linux-fork.c +++ b/gdb/linux-fork.c @@ -24,6 +24,7 @@ #include "regcache.h" #include "gdbcmd.h" #include "infcall.h" +#include "gdb_assert.h" #include "gdb_string.h" #include "linux-fork.h" @@ -238,9 +239,19 @@ fork_load_infrun_state (struct fork_info *fp) extern void nullify_last_target_wait_ptid (); int i; + inferior_ptid = fp->ptid; + if (fp->savedregs && fp->clobber_regs) regcache_cpy (current_regcache, fp->savedregs); + registers_changed (); + reinit_frame_cache (); + + /* We must select a new frame before making any inferior calls to + avoid warnings. */ + select_frame (get_current_frame ()); + + stop_pc = read_pc (); nullify_last_target_wait_ptid (); /* Now restore the file positions of open file descriptors. */ @@ -358,12 +369,19 @@ linux_fork_mourn_inferior (void) We need to delete that one from the fork_list, and switch to the next available fork. */ delete_fork (inferior_ptid); - if (fork_list) /* Paranoia, shouldn't happen. */ - { - inferior_ptid = fork_list[0].ptid; - printf_filtered (_("[Switching to %s]\n"), - target_pid_to_str (inferior_ptid)); - } + + /* There should still be a fork - if there's only one left, + delete_fork won't remove it, because we haven't updated + inferior_ptid yet. */ + gdb_assert (fork_list); + + fork_load_infrun_state (fork_list); + printf_filtered (_("[Switching to %s]\n"), + target_pid_to_str (inferior_ptid)); + + /* If there's only one fork, switch back to non-fork mode. */ + if (fork_list->next == NULL) + delete_fork (inferior_ptid); } /* Fork list <-> user interface. */ @@ -559,17 +577,10 @@ linux_fork_context (struct fork_info *newfp, int from_tty) error (_("No such fork/process")); if (!oldfp) - { - oldfp = add_fork (ptid_get_pid (inferior_ptid)); - } + oldfp = add_fork (ptid_get_pid (inferior_ptid)); fork_save_infrun_state (oldfp, 1); - inferior_ptid = newfp->ptid; fork_load_infrun_state (newfp); - registers_changed (); - reinit_frame_cache (); - stop_pc = read_pc (); - select_frame (get_current_frame ()); printf_filtered (_("Switching to %s\n"), target_pid_to_str (inferior_ptid)); |