From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-134349-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 127996 invoked by alias); 27 Oct 2016 14:55:52 -0000
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
Received: (qmail 127964 invoked by uid 89); 27 Oct 2016 14:55:50 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=thr
X-HELO: mx1.redhat.com
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 27 Oct 2016 14:55:49 +0000
Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))	(No client certificate requested)	by mx1.redhat.com (Postfix) with ESMTPS id 923274E4EE;	Thu, 27 Oct 2016 14:55:48 +0000 (UTC)
Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11])	by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9REtlsp024392;	Thu, 27 Oct 2016 10:55:47 -0400
Subject: Re: [PATCH 12/13] Determine the kind of single step breakpoint
To: Yao Qi <qiyaoltc@gmail.com>, gdb-patches@sourceware.org
References: <1472655965-12212-1-git-send-email-yao.qi@linaro.org> <1472655965-12212-13-git-send-email-yao.qi@linaro.org>
From: Pedro Alves <palves@redhat.com>
Message-ID: <96a3e9d9-0de7-a4c9-a26d-3774c9f17adb@redhat.com>
Date: Thu, 27 Oct 2016 14:55:00 -0000
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0
MIME-Version: 1.0
In-Reply-To: <1472655965-12212-13-git-send-email-yao.qi@linaro.org>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-SW-Source: 2016-10/txt/msg00760.txt.bz2

On 08/31/2016 04:06 PM, Yao Qi wrote:
> --- a/gdb/breakpoint.c
> +++ b/gdb/breakpoint.c
> @@ -2607,7 +2607,18 @@ build_target_command_list (struct bp_location *bl)
>  static int
>  breakpoint_kind (struct bp_location *bl, CORE_ADDR *addr)
>  {
> -  return gdbarch_breakpoint_kind_from_pc (bl->gdbarch, addr);
> +  if (bl->owner->type == bp_single_step)
> +    {
> +      struct thread_info *thr = find_thread_global_id (bl->owner->thread);
> +      struct regcache *regcache;
> +
> +      regcache = get_thread_regcache (thr->ptid);
> +
> +      return gdbarch_breakpoint_kind_from_current_state (bl->gdbarch,
> +							 regcache, addr);
> +    }
> +  else
> +    return gdbarch_breakpoint_kind_from_pc (bl->gdbarch, addr);
>  }

This deserves a function intro comment update, I think.

Thanks,
Pedro Alves