2009-07-18 Michael Snyder <msnyder@vmware.com>

	* infrun.c (handle_inferior_event): Remove an execution_direction
	check in the "check for subroutine calls" test, and add some
	additional handling for reverse-stepping through shared libraries.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 882330bd3bf241065667e2d227b80e23fa42ee19..d8dfeee4e0586b6c95f7ec47faeb9557f30a371e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-18  Michael Snyder  <msnyder@vmware.com>
+
+       * infrun.c (handle_inferior_event): Remove an execution_direction
+       check in the "check for subroutine calls" test, and add some 
+       additional handling for reverse-stepping through shared libraries.
+
 2009-07-18  Anthony Green  <green@moxielogic.com>
 
        * moxie-tdep.c (moxie_analyze_prologue): Take gdbarch as last

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 9f6cfc99aa2de67a9e4203d411112b09f945f298..72ef8ee37cbc2ce96ea76a756d85e5b2af051bcc 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3776,9 +3776,8 @@ infrun: not switching back to stepped thread, it has vanished\n");
      previous frame must have valid frame IDs.  */
   if (!frame_id_eq (get_stack_frame_id (frame),
                    ecs->event_thread->step_stack_frame_id)
-      && (frame_id_eq (frame_unwind_caller_id (frame),
-                      ecs->event_thread->step_stack_frame_id)
-         || execution_direction == EXEC_REVERSE))
+      && frame_id_eq (frame_unwind_caller_id (frame),
+                     ecs->event_thread->step_stack_frame_id))
     {
       CORE_ADDR real_stop_pc;
 
@@ -3806,6 +3805,7 @@ infrun: not switching back to stepped thread, it has vanished\n");
       /* Reverse stepping through solib trampolines.  */
 
       if (execution_direction == EXEC_REVERSE
+         && ecs->event_thread->step_over_calls != STEP_OVER_NONE
          && (gdbarch_skip_trampoline_code (gdbarch, frame, stop_pc)
              || (ecs->stop_func_start == 0
                  && in_solib_dynsym_resolve_code (stop_pc))))
@@ -3923,6 +3923,38 @@ infrun: not switching back to stepped thread, it has vanished\n");
       return;
     }
 
+  /* Reverse stepping through solib trampolines.  */
+
+  if (execution_direction == EXEC_REVERSE
+      && ecs->event_thread->step_over_calls != STEP_OVER_NONE)
+    {
+      if (gdbarch_skip_trampoline_code (gdbarch, frame, stop_pc)
+         || (ecs->stop_func_start == 0
+             && in_solib_dynsym_resolve_code (stop_pc)))
+       {
+         /* Any solib trampoline code can be handled in reverse
+            by simply continuing to single-step.  We have already
+            executed the solib function (backwards), and a few 
+            steps will take us back through the trampoline to the
+            caller.  */
+         keep_going (ecs);
+         return;
+       }
+      else if (in_solib_dynsym_resolve_code (stop_pc))
+       {
+         /* Stepped backward into the solib dynsym resolver.
+            Set a breakpoint at its start and continue, then
+            one more step will take us out.  */
+         struct symtab_and_line sr_sal;
+         init_sal (&sr_sal);
+         sr_sal.pc = ecs->stop_func_start;
+         insert_step_resume_breakpoint_at_sal (gdbarch, 
+                                               sr_sal, null_frame_id);
+         keep_going (ecs);
+         return;
+       }
+    }
+
   /* If we're in the return path from a shared library trampoline,
      we want to proceed through the trampoline when stepping.  */
   if (gdbarch_in_solib_return_trampoline (gdbarch,