From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-64881-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 27803 invoked by alias); 27 Jun 2009 18:59:35 -0000
Received: (qmail 27795 invoked by uid 22791); 27 Jun 2009 18:59:35 -0000
X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 	tests=AWL,BAYES_00,URIBL_RHS_DOB
X-Spam-Check-By: sourceware.org
Received: from smtp-outbound-1.vmware.com (HELO smtp-outbound-1.vmware.com) (65.115.85.69)     by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 27 Jun 2009 18:59:29 +0000
Received: from jupiter.vmware.com (mailhost5.vmware.com [10.16.68.131]) 	by smtp-outbound-1.vmware.com (Postfix) with ESMTP id 4264B26006; 	Sat, 27 Jun 2009 11:59:28 -0700 (PDT)
Received: from [10.20.94.141] (msnyder-server.eng.vmware.com [10.20.94.141]) 	by jupiter.vmware.com (Postfix) with ESMTP id 39B02DC104; 	Sat, 27 Jun 2009 11:59:28 -0700 (PDT)
Message-ID: <4A466BAE.2010305@vmware.com>
Date: Sat, 27 Jun 2009 18:59:00 -0000
From: Michael Snyder <msnyder@vmware.com>
User-Agent: Thunderbird 1.5.0.12 (X11/20080411)
MIME-Version: 1.0
To: Hui Zhu <teawater@gmail.com>
CC: gdb-patches ml <gdb-patches@sourceware.org>,   Marc Khouzam <marc.khouzam@ericsson.com>
Subject: Re: [RFA] Patch to fix reverse return from subroutine error
References: <daef60380906110127p5a834832k557f01e12d7a40e2@mail.gmail.com>
In-Reply-To: <daef60380906110127p5a834832k557f01e12d7a40e2@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2009-06/txt/msg00768.txt.bz2

Hui Zhu wrote:
> Hi,
> 
> This patch is to fix bug in http://sourceware.org/ml/gdb/2009-06/msg00089.html
> 
> 2009-06-11  Hui Zhu  <teawater@gmail.com>
> 
> 	* infrun.c (handle_inferior_event): Reverse return from
> 	subroutine doesn't use code "infrun: stepped into subroutine".

Hi Hui,

This patch is approved, if you'll make the changes shown below.


> ------------------------------------------------------------------------
> 
> ---
>  infrun.c |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> --- a/infrun.c
> +++ b/infrun.c
> @@ -3708,7 +3708,12 @@ infrun: not switching back to stepped th
>  		    ecs->event_thread->step_frame_id)
>        && (frame_id_eq (frame_unwind_id (get_current_frame ()),
>  		       ecs->event_thread->step_frame_id)
> -	  || execution_direction == EXEC_REVERSE))
> +	  || (execution_direction == EXEC_REVERSE
> +	      && ecs->event_thread->step_frame_id.stack_addr_p
> +	      && get_frame_id (get_current_frame ()).stack_addr_p

Replace "get_current_frame ()" with "frame".

> +              && !gdbarch_inner_than (current_gdbarch,

Replace "current_gdbarch" with "gdbarch".

> +				      ecs->event_thread->step_frame_id.stack_addr,
> +				      get_frame_id (get_current_frame()).stack_addr))))

Replace "get_current_frame()" with "frame".

>      {
>        CORE_ADDR real_stop_pc;
>  

Thanks,
Michael