* infrun.c (displaced_step_fixup): If this is a software

	single-stepping arch, don't tell the target to single-step.
	(maybe_software_singlestep): Return 0 if we're using displaced
	stepping.
	(resume): If this is a software single-stepping arch, and
	displaced-stepping is enabled, use it for all single-step
	requests.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 50bf09053a648ed6550c5a583d13c1679cac7976..b5f5167525142b1022f6d8d95e0ff150d43f2bae 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2009-07-31  Pedro Alves  <pedro@codesourcery.com>
+           Julian Brown  <julian@codesourcery.com>
+
+       * infrun.c (displaced_step_fixup): If this is a software
+       single-stepping arch, don't tell the target to single-step.
+       (maybe_software_singlestep): Return 0 if we're using displaced
+       stepping.
+       (resume): If this is a software single-stepping arch, and
+       displaced-stepping is enabled, use it for all single-step
+       requests.
+
 2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.in (ACLOCAL, ACLOCAL_AMFLAGS, aclocal_m4_deps)

diff --git a/gdb/infrun.c b/gdb/infrun.c
index f8179727df7ab21976b281ca7945ad460ce024f7..0bc9fb3553d3c14bc3c27e441cc3edcf0c61d41d 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -964,6 +964,7 @@ displaced_step_fixup (ptid_t event_ptid, enum target_signal signal)
       struct displaced_step_request *head;
       ptid_t ptid;
       struct regcache *regcache;
+      struct gdbarch *gdbarch;
       CORE_ADDR actual_pc;
 
       head = displaced_step_request_queue;
@@ -985,9 +986,11 @@ displaced_step_fixup (ptid_t event_ptid, enum target_signal signal)
 
          displaced_step_prepare (ptid);
 
+         gdbarch = get_regcache_arch (regcache);
+
          if (debug_displaced)
            {
-             struct gdbarch *gdbarch = get_regcache_arch (regcache);
+             CORE_ADDR actual_pc = regcache_read_pc (regcache);
              gdb_byte buf[4];
 
              fprintf_unfiltered (gdb_stdlog, "displaced: run %s: ",
@@ -996,7 +999,10 @@ displaced_step_fixup (ptid_t event_ptid, enum target_signal signal)
              displaced_step_dump_bytes (gdb_stdlog, buf, sizeof (buf));
            }
 
-         target_resume (ptid, 1, TARGET_SIGNAL_0);
+         if (gdbarch_software_single_step_p (gdbarch))
+           target_resume (ptid, 0, TARGET_SIGNAL_0);
+         else
+           target_resume (ptid, 1, TARGET_SIGNAL_0);
 
          /* Done, we're stepping a thread.  */
          break;
@@ -1105,15 +1111,19 @@ maybe_software_singlestep (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   int hw_step = 1;
 
-  if (gdbarch_software_single_step_p (gdbarch)
-      && gdbarch_software_single_step (gdbarch, get_current_frame ()))
+  if (gdbarch_software_single_step_p (gdbarch))
     {
-      hw_step = 0;
-      /* Do not pull these breakpoints until after a `wait' in
-        `wait_for_inferior' */
-      singlestep_breakpoints_inserted_p = 1;
-      singlestep_ptid = inferior_ptid;
-      singlestep_pc = pc;
+      if (use_displaced_stepping (gdbarch))
+        hw_step = 0;
+      else if (gdbarch_software_single_step (gdbarch, get_current_frame ()))
+       {
+         hw_step = 0;
+         /* Do not pull these breakpoints until after a `wait' in
+            `wait_for_inferior' */
+         singlestep_breakpoints_inserted_p = 1;
+         singlestep_ptid = inferior_ptid;
+         singlestep_pc = pc;
+       }
     }
   return hw_step;
 }
@@ -1179,7 +1189,8 @@ a command like `return' or `jump' to continue execution."));
      comments in the handle_inferior event for dealing with 'random
      signals' explain what we do instead.  */
   if (use_displaced_stepping (gdbarch)
-      && tp->trap_expected
+      && (tp->trap_expected
+         || (step && gdbarch_software_single_step_p (gdbarch)))
       && sig == TARGET_SIGNAL_0)
     {
       if (!displaced_step_prepare (inferior_ptid))