* procfs.c: (procfs_do_thread_registers) Use elfcore_write_lwpstatus.

[deliverable/binutils-gdb.git] / gdb / procfs.c

diff --git a/gdb/procfs.c b/gdb/procfs.c
index d43031bed1238e19dd0854b9d8d2e129ae0df4cf..e5df8866d223762546c79ff3e3c68246d1e3fa0d 100644 (file)
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -1,6 +1,6 @@
 /* Machine independent support for SVR4 /proc (process file system) for GDB.
 
 /* Machine independent support for SVR4 /proc (process file system) for GDB.
 

-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2006, 2007, 2008, 2009
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2006, 2007, 2008, 2009, 2010

    Free Software Foundation, Inc.
 
    Written by Michael Snyder at Cygnus Solutions.
    Free Software Foundation, Inc.
 
    Written by Michael Snyder at Cygnus Solutions.


@@ -3705,7 +3705,8 @@ do_attach (ptid_t ptid)
   if ((fail = procfs_debug_inferior (pi)) != 0)
     dead_procinfo (pi, "do_attach: failed in procfs_debug_inferior", NOKILL);
 
   if ((fail = procfs_debug_inferior (pi)) != 0)
     dead_procinfo (pi, "do_attach: failed in procfs_debug_inferior", NOKILL);
 

-  inf = add_inferior (pi->pid);
+  inf = current_inferior ();
+  inferior_appeared (inf, pi->pid);

   /* Let GDB know that the inferior was attached.  */
   inf->attach_flag = 1;
 
   /* Let GDB know that the inferior was attached.  */
   inf->attach_flag = 1;
 


@@ -5665,7 +5666,7 @@ insert_dbx_link_bpt_in_file (int fd, CORE_ADDR ignored)
     {
       /* Insert the breakpoint.  */
       dbx_link_bpt_addr = sym_addr;
     {
       /* Insert the breakpoint.  */
       dbx_link_bpt_addr = sym_addr;

-      dbx_link_bpt = deprecated_insert_raw_breakpoint (target_gdbarch,
+      dbx_link_bpt = deprecated_insert_raw_breakpoint (target_gdbarch, NULL,

                                                       sym_addr);
       if (dbx_link_bpt == NULL)
         {
                                                       sym_addr);
       if (dbx_link_bpt == NULL)
         {


@@ -6059,11 +6060,21 @@ procfs_do_thread_registers (bfd *obfd, ptid_t ptid,
   gdb_gregset_t gregs;
   gdb_fpregset_t fpregs;
   unsigned long merged_pid;
   gdb_gregset_t gregs;
   gdb_fpregset_t fpregs;
   unsigned long merged_pid;

+  struct cleanup *old_chain;

 
   merged_pid = TIDGET (ptid) << 16 | PIDGET (ptid);
 
 
   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);
   fill_gregset (regcache, &gregs, -1);

-#if defined (UNIXWARE)
+#if defined (NEW_PROC_API)

   note_data = (char *) elfcore_write_lwpstatus (obfd,
                                                note_data,
                                                note_size,
   note_data = (char *) elfcore_write_lwpstatus (obfd,
                                                note_data,
                                                note_size,


@@ -6084,6 +6095,9 @@ procfs_do_thread_registers (bfd *obfd, ptid_t ptid,
                                              note_size,
                                              &fpregs,
                                              sizeof (fpregs));
                                              note_size,
                                              &fpregs,
                                              sizeof (fpregs));

+
+  do_cleanups (old_chain);
+

   return note_data;
 }
 
   return note_data;
 }
 


@@ -6101,13 +6115,11 @@ procfs_corefile_thread_callback (procinfo *pi, procinfo *thread, void *data)
 
   if (pi != NULL)
     {
 
   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);
                                                    args->note_data,
                                                    args->note_size,
                                                    args->stop_signal);

-      inferior_ptid = saved_ptid;

     }
   return 0;
 }
     }
   return 0;
 }