Factor out in-stepping-range checks.

This adds a function for doing within-thread's-stepping-range checks,
and converts a couple spots to use it.  Following patches will add
more uses.

gdb/
2013-05-23  Yao Qi  <yao@codesourcery.com>
	    Pedro Alves  <palves@redhat.com>

	* gdbthread.h (pc_in_thread_step_range): New declaration.
	* thread.c (pc_in_thread_step_range): New function.
	* infrun.c (handle_inferior_event): Use it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1c21cd46689dc44448c1a9cdac830aba8b974de6..3389c9fc64452946e18165563a5a3c5012830601 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-23  Yao Qi  <yao@codesourcery.com>
+           Pedro Alves  <palves@redhat.com>
+
+       * gdbthread.h (pc_in_thread_step_range): New declaration.
+       * thread.c (pc_in_thread_step_range): New function.
+       * infrun.c (handle_inferior_event): Use it.
+
 2013-05-23  Joel Brobecker  <brobecker@adacore.com>
 
        * mi/mi-cmd-break.c (mi_argv_to_format): Use xsnprintf instead

diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index 0846322725a5fd44c57ae3eaf1bba9224d1dd08e..a9f8a941df17e02564ebd3b708aa43ec475dd53a 100644 (file)
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -399,6 +399,10 @@ extern struct thread_info* inferior_thread (void);
 
 extern void update_thread_list (void);
 
+/* Return true if PC is in the stepping range of THREAD.  */
+
+int pc_in_thread_step_range (CORE_ADDR pc, struct thread_info *thread);
+
 extern struct thread_info *thread_list;
 
 #endif /* GDBTHREAD_H */

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 54e92f2318ba6f235420be6e1d27fc5be8ef1f0e..57c427da6d429ac68d67bdfb36c471aa269b89ed 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -4337,8 +4337,7 @@ process_event_stop_test:
 
       if (ecs->event_thread->control.step_range_end != 0
          && ecs->event_thread->suspend.stop_signal != GDB_SIGNAL_0
-         && (ecs->event_thread->control.step_range_start <= stop_pc
-             && stop_pc < ecs->event_thread->control.step_range_end)
+         && pc_in_thread_step_range (stop_pc, ecs->event_thread)
          && frame_id_eq (get_stack_frame_id (frame),
                          ecs->event_thread->control.step_stack_frame_id)
          && ecs->event_thread->control.step_resume_breakpoint == NULL)
@@ -4707,8 +4706,7 @@ process_event_stop_test:
      through a function epilogue and therefore must detect when
      the current-frame changes in the middle of a line.  */
 
-  if (stop_pc >= ecs->event_thread->control.step_range_start
-      && stop_pc < ecs->event_thread->control.step_range_end
+  if (pc_in_thread_step_range (stop_pc, ecs->event_thread)
       && (execution_direction != EXEC_REVERSE
          || frame_id_eq (get_frame_id (frame),
                          ecs->event_thread->control.step_frame_id)))

diff --git a/gdb/thread.c b/gdb/thread.c
index 2a1d7239b3174a1013ff8a0765935d430303b85a..2eb506bb7c83af54cbfb1063e7d8189690724d29 100644 (file)
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -750,6 +750,13 @@ finish_thread_state_cleanup (void *arg)
   finish_thread_state (*ptid_p);
 }
 
+int
+pc_in_thread_step_range (CORE_ADDR pc, struct thread_info *thread)
+{
+  return (pc >= thread->control.step_range_start
+         && pc < thread->control.step_range_end);
+}
+
 /* Prints the list of threads and their details on UIOUT.
    This is a version of 'info_threads_command' suitable for
    use from MI.