Thu Jul 25 12:08:09 1996 Martin M. Hunt <hunt@pizza.cygnus.com>

[deliverable/binutils-gdb.git] / gdb / rs6000-nat.c

diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index a5fec6cb8351da088efc1d42dba5e19455c9bba2..5772fe0ab3de001d965f4861e63e3a9eac239f0b 100644 (file)
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -1,5 +1,6 @@
 /* IBM RS/6000 native-dependent code for GDB, the GNU debugger.
-   Copyright 1986, 1987, 1989, 1991, 1992, 1994 Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1989, 1991, 1992, 1994, 1995, 1996
+            Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -230,6 +231,7 @@ exec_one_dummy_insn ()
 
   char shadow_contents[BREAKPOINT_MAX];        /* Stash old bkpt addr contents */
   unsigned int status, pid;
+  CORE_ADDR prev_pc;
 
   /* We plant one dummy breakpoint into DUMMY_INSN_ADDR address. We assume that
      this address will never be executed again by the real code. */
@@ -237,7 +239,16 @@ exec_one_dummy_insn ()
   target_insert_breakpoint (DUMMY_INSN_ADDR, shadow_contents);
 
   errno = 0;
-  ptrace (PT_CONTINUE, inferior_pid, (PTRACE_ARG3_TYPE) DUMMY_INSN_ADDR, 0, 0);
+
+  /* You might think this could be done with a single ptrace call, and
+     you'd be correct for just about every platform I've ever worked
+     on.  However, rs6000-ibm-aix4.1.3 seems to have screwed this up --
+     the inferior never hits the breakpoint (it's also worth noting
+     powerpc-ibm-aix4.1.3 works correctly).  */
+  prev_pc = read_pc ();
+  write_pc (DUMMY_INSN_ADDR);
+  ptrace (PT_CONTINUE, inferior_pid, (PTRACE_ARG3_TYPE)1, 0, 0);
+
   if (errno)
     perror ("pt_continue");
 
@@ -245,10 +256,11 @@ exec_one_dummy_insn ()
     pid = wait (&status);
   } while (pid != inferior_pid);
     
+  write_pc (prev_pc);
   target_remove_breakpoint (DUMMY_INSN_ADDR, shadow_contents);
 }
 
-void
+static void
 fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
      char *core_reg_sect;
      unsigned core_reg_size;
@@ -717,6 +729,14 @@ xcoff_relocate_core (target)
       vp->dstart = (CORE_ADDR) ldip->ldinfo_dataorg;
       vp->dend = vp->dstart + ldip->ldinfo_datasize;
 
+#ifdef DONT_RELOCATE_SYMFILE_OBJFILE
+      if (vp == vmap)
+       {
+         vp->dstart = (CORE_ADDR) 0;
+         vp->dend = ldip->ldinfo_datasize;
+       }
+#endif
+
       if (vp->tadj != 0)
        {
          vp->tstart += vp->tadj;
@@ -729,6 +749,11 @@ xcoff_relocate_core (target)
        {
          int count;
          struct section_table *stp;
+         int update_coreops;
+
+         /* We must update the to_sections field in the core_ops structure
+            now to avoid dangling pointer dereferences.  */
+         update_coreops = core_ops.to_sections == target->to_sections;
          
          count = target->to_sections_end - target->to_sections;
          count += 2;
@@ -736,6 +761,14 @@ xcoff_relocate_core (target)
            xrealloc (target->to_sections,
                      sizeof (struct section_table) * count);
          target->to_sections_end = target->to_sections + count;
+
+         /* Update the to_sections field in the core_ops structure
+            if needed.  */
+         if (update_coreops)
+           {
+             core_ops.to_sections = target->to_sections;
+             core_ops.to_sections_end = target->to_sections_end;
+           }
          stp = target->to_sections_end - 2;
 
          /* "Why do we add bfd_section_vma?", I hear you cry.
@@ -765,3 +798,29 @@ xcoff_relocate_core (target)
   breakpoint_re_set ();
   do_cleanups (old);
 }
+
+int
+kernel_u_size ()
+{
+  return (sizeof (struct user));
+}
+
+\f
+/* Register that we are able to handle rs6000 core file formats. */
+
+static struct core_fns rs6000_core_fns =
+{
+  bfd_target_coff_flavour,
+  fetch_core_registers,
+  NULL
+};
+
+void
+_initialize_core_rs6000 ()
+{
+  /* For native configurations, where this module is included, inform
+     the xcoffsolib module where it can find the function for symbol table
+     relocation at runtime. */
+  xcoff_relocate_symtab_hook = &xcoff_relocate_symtab;
+  add_core_fns (&rs6000_core_fns);
+}