From 751254059d4238e2a67a7644306f1185523816ca Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 10 Nov 2009 21:00:41 +0000 Subject: [PATCH] 2009-11-10 Daniel Gutson * procfs.c (procfs_do_thread_registers): Added a call to fetch register values before saving them in the core file through the gcore command. (procfs_corefile_thread_callback): Removed the backup of inferior_ptid before calling procfs_do_thread_registers since the function already saves and restores it before returning. --- gdb/ChangeLog | 9 +++++++++ gdb/procfs.c | 19 +++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 048583f568..ced2fe0834 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2009-11-10 Daniel Gutson + + * procfs.c (procfs_do_thread_registers): Added a call to fetch + register values before saving them in the core file + through the gcore command. + (procfs_corefile_thread_callback): Removed the backup of + inferior_ptid before calling procfs_do_thread_registers since + the function already saves and restores it before returning. + 2009-11-10 Michael Snyder * dcache.c: Fix typo, shorten long lines in comment. diff --git a/gdb/procfs.c b/gdb/procfs.c index 7d7a895141..c311ef51c6 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -6060,9 +6060,19 @@ procfs_do_thread_registers (bfd *obfd, ptid_t ptid, gdb_gregset_t gregs; gdb_fpregset_t fpregs; unsigned long merged_pid; + struct cleanup *old_chain; merged_pid = TIDGET (ptid) << 16 | PIDGET (ptid); + /* This part is the old method for fetching registers. + It should be replaced by the newer one using regsets + once it is implemented in this platform: + gdbarch_regset_from_core_section() and regset->collect_regset(). */ + + old_chain = save_inferior_ptid (); + inferior_ptid = ptid; + target_fetch_registers (regcache, -1); + fill_gregset (regcache, &gregs, -1); #if defined (UNIXWARE) note_data = (char *) elfcore_write_lwpstatus (obfd, @@ -6085,6 +6095,9 @@ procfs_do_thread_registers (bfd *obfd, ptid_t ptid, note_size, &fpregs, sizeof (fpregs)); + + do_cleanups (old_chain); + return note_data; } @@ -6102,13 +6115,11 @@ procfs_corefile_thread_callback (procinfo *pi, procinfo *thread, void *data) if (pi != NULL) { - ptid_t saved_ptid = inferior_ptid; - inferior_ptid = MERGEPID (pi->pid, thread->tid); - args->note_data = procfs_do_thread_registers (args->obfd, inferior_ptid, + ptid_t ptid = MERGEPID (pi->pid, thread->tid); + args->note_data = procfs_do_thread_registers (args->obfd, ptid, args->note_data, args->note_size, args->stop_signal); - inferior_ptid = saved_ptid; } return 0; } -- 2.34.1