From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12287 invoked by alias); 11 Mar 2013 12:53:05 -0000 Received: (qmail 12139 invoked by uid 22791); 11 Mar 2013 12:53:01 -0000 X-SWARE-Spam-Status: No, hits=-4.6 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 11 Mar 2013 12:52:44 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UF2Db-0006kT-OH from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Mon, 11 Mar 2013 05:52:43 -0700 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 11 Mar 2013 05:52:43 -0700 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.1.289.1; Mon, 11 Mar 2013 05:52:42 -0700 From: Yao Qi To: Subject: [PATCH 1/7] New macro THREAD_WITHIN_SINGLE_STEP_RANGE Date: Mon, 11 Mar 2013 12:53:00 -0000 Message-ID: <1363006291-13334-2-git-send-email-yao@codesourcery.com> In-Reply-To: <1363006291-13334-1-git-send-email-yao@codesourcery.com> References: <1363006291-13334-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2013-03/txt/msg00456.txt.bz2 This patch moves code into a macro, which will be used in my following patches. gdb: 2013-03-11 Yao Qi * gdbthread.h (THREAD_WITHIN_SINGLE_STEP_RANGE): New macro. * infrun.c (handle_inferior_event): Use it. --- gdb/gdbthread.h | 6 ++++++ gdb/infrun.c | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 824e4d0..6f47006 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -37,6 +37,12 @@ enum thread_state THREAD_EXITED, }; +/* PC is within the range of single stepping of thread THR. */ + +#define THREAD_WITHIN_SINGLE_STEP_RANGE(THR, PC) \ + ((PC) >= (THR)->control.step_range_start \ + && (PC) < (THR)->control.step_range_end) + /* Inferior thread specific part of `struct infcall_control_state'. Inferior process counterpart is `struct inferior_control_state'. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index 1cf30fe..5bc276c 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -4340,8 +4340,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) + && THREAD_WITHIN_SINGLE_STEP_RANGE (ecs->event_thread, stop_pc) && frame_id_eq (get_stack_frame_id (frame), ecs->event_thread->control.step_stack_frame_id) && ecs->event_thread->control.step_resume_breakpoint == NULL) @@ -4710,8 +4709,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 (THREAD_WITHIN_SINGLE_STEP_RANGE (ecs->event_thread, stop_pc) && (execution_direction != EXEC_REVERSE || frame_id_eq (get_frame_id (frame), ecs->event_thread->control.step_frame_id))) -- 1.7.7.6