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 47bfe2d415085c33561e535b1872840c9e0b16fb..5772fe0ab3de001d965f4861e63e3a9eac239f0b 100644 (file)
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -231,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. */
@@ -238,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");
 
@@ -246,6 +256,7 @@ exec_one_dummy_insn ()
     pid = wait (&status);
   } while (pid != inferior_pid);
     
+  write_pc (prev_pc);
   target_remove_breakpoint (DUMMY_INSN_ADDR, shadow_contents);
 }
 
@@ -807,5 +818,9 @@ static struct core_fns rs6000_core_fns =
 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);
 }