Merge changes for dos x udi:

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

diff --git a/gdb/corelow.c b/gdb/corelow.c
index 75f64d54eaa0c4dc879bc1c0b0f80a4412e96e05..77a4d17c2e1197357ea488f208506416e90821b7 100644 (file)
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -28,6 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "bfd.h"
 #include "target.h"
 #include "gdbcore.h"
+#include "thread.h"
 
 static void
 core_files_info PARAMS ((struct target_ops *));
@@ -51,6 +52,8 @@ static void
 core_close (quitting)
      int quitting;
 {
+  inferior_pid = 0;            /* Avoid confusion from thread stuff */
+
   if (core_bfd) {
     free (bfd_get_filename (core_bfd));
     bfd_close (core_bfd);
@@ -78,6 +81,31 @@ solib_add_stub (from_tty)
 }
 #endif /* SOLIB_ADD */
 
+/* Look for sections whose names start with `.reg/' so that we can extract the
+   list of threads in a core file.  */
+
+static void
+add_to_thread_list (abfd, asect, reg_sect_arg)
+     bfd *abfd;
+     asection *asect;
+     PTR reg_sect_arg;
+{
+  int thread_id;
+  asection *reg_sect = (asection *) reg_sect_arg;
+
+  if (strncmp (bfd_section_name (abfd, asect), ".reg/", 5) != 0)
+    return;
+
+  thread_id = atoi (bfd_section_name (abfd, asect) + 5);
+
+  add_thread (thread_id);
+
+/* Warning, Will Robinson, looking at BFD private data! */
+
+  if (asect->filepos == reg_sect->filepos) /* Did we find .reg? */
+    inferior_pid = thread_id;  /* Yes, make it current */
+}
+
 /* This routine opens and sets up the core file bfd */
 
 void
@@ -114,7 +142,7 @@ core_open (filename, from_tty)
   if (scratch_chan < 0)
     perror_with_name (filename);
 
-  temp_bfd = bfd_fdopenr (filename, NULL, scratch_chan);
+  temp_bfd = bfd_fdopenr (filename, gnutarget, scratch_chan);
   if (temp_bfd == NULL)
     {
       perror_with_name (filename);
@@ -154,17 +182,24 @@ core_open (filename, from_tty)
     printf_filtered ("Program terminated with signal %d, %s.\n", siggy,
            safe_strsignal (siggy));
 
+  /* Build up thread list from BFD sections. */
+
+  init_thread_list ();
+  bfd_map_over_sections (core_bfd, add_to_thread_list,
+                        bfd_get_section_by_name (core_bfd, ".reg"));
+
   if (ontop) {
     /* Fetch all registers from core file */
     target_fetch_registers (-1);
 
     /* Add symbols and section mappings for any shared libraries */
 #ifdef SOLIB_ADD
-    catch_errors (solib_add_stub, (char *)from_tty, (char *)0);
+    catch_errors (solib_add_stub, (char *)from_tty, (char *)0,
+                 RETURN_MASK_ALL);
 #endif
 
     /* Now, set up the frame cache, and print the top of stack */
-    set_current_frame (create_new_frame (read_register (FP_REGNUM),
+    set_current_frame (create_new_frame (read_fp (),
                                         read_pc ()));
     select_frame (get_current_frame (), 0);
     print_stack_frame (selected_frame, selected_frame_level, 1);
@@ -183,6 +218,7 @@ core_detach (args, from_tty)
   if (args)
     error ("Too many arguments");
   unpush_target (&core_ops);
+  reinit_frame_cache ();
   if (from_tty)
     printf_filtered ("No core file now.\n");
 }
@@ -200,8 +236,20 @@ get_core_registers (regno)
   sec_ptr reg_sec;
   unsigned size;
   char *the_regs;
+  char secname[10];
+
+  /* Thread support.  If inferior_pid is non-zero, then we have found a core
+     file with threads (or multiple processes).  In that case, we need to
+     use the appropriate register section, else we just use `.reg'. */
+
+  /* XXX - same thing needs to be done for floating-point (.reg2) sections. */
+
+  if (inferior_pid)
+    sprintf (secname, ".reg/%d", inferior_pid);
+  else
+    strcpy (secname, ".reg");
 
-  reg_sec = bfd_get_section_by_name (core_bfd, ".reg");
+  reg_sec = bfd_get_section_by_name (core_bfd, secname);
   if (!reg_sec) goto cant;
   size = bfd_section_size (core_bfd, reg_sec);
   the_regs = alloca (size);
@@ -213,7 +261,7 @@ get_core_registers (regno)
   else
     {
 cant:
-      fprintf_filtered (stderr, "Couldn't fetch registers from core file: %s\n",
+      fprintf_filtered (gdb_stderr, "Couldn't fetch registers from core file: %s\n",
               bfd_errmsg (bfd_error));
     }
 
@@ -230,7 +278,7 @@ cant:
       }
     else
       {
-       fprintf_filtered (stderr, "Couldn't fetch register set 2 from core file: %s\n",
+       fprintf_filtered (gdb_stderr, "Couldn't fetch register set 2 from core file: %s\n",
                 bfd_errmsg (bfd_error));
       }
   }
@@ -244,6 +292,17 @@ core_files_info (t)
   print_section_info (t, core_bfd);
 }
 \f
+/* If mourn is being called in all the right places, this could be say
+   `gdb internal error' (since generic_mourn calls breakpoint_init_inferior).  */
+
+static int
+ignore (addr, contents)
+     CORE_ADDR addr;
+     char *contents;
+{
+  return 0;
+}
+
 struct target_ops core_ops = {
        "core", "Local core dump file",
        "Use a core file as a target.  Specify the filename of the core file.",
@@ -252,7 +311,7 @@ struct target_ops core_ops = {
        get_core_registers, 
        0, 0, /* store_regs, prepare_to_store */
        xfer_memory, core_files_info,
-       0, 0, /* core_insert_breakpoint, core_remove_breakpoint, */
+       ignore, ignore, /* core_insert_breakpoint, core_remove_breakpoint, */
        0, 0, 0, 0, 0, /* terminal stuff */
        0, 0, 0, /* kill, load, lookup sym */
        find_default_create_inferior, 0, /* mourn_inferior */