From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 96695 invoked by alias); 31 Aug 2016 15:06:34 -0000 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 Received: (qmail 96494 invoked by uid 89); 31 Aug 2016 15:06:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=no version=3.3.2 spammy= X-HELO: mail-pf0-f195.google.com Received: from mail-pf0-f195.google.com (HELO mail-pf0-f195.google.com) (209.85.192.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 Aug 2016 15:06:19 +0000 Received: by mail-pf0-f195.google.com with SMTP id i6so2903850pfe.0 for ; Wed, 31 Aug 2016 08:06:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=4zdM7Tcpfi0DCe7GG7gY3P7LZmgX/0rSW0Uin8s9doc=; b=RTWyryc8WuNWGmZ5iTw9NUAH91sGXtM/xiyipwNv+KBaFmHs4gy6cJ7AQbKrPnl376 wHpvoLBfbw2UNfPNeEB2fyh2PfUHkNwSGsT67Z5sHjBYjTXyyL7SjgdyTOiP3j6DyGgN 6WKeyeTv+9tjp6HBNrBKTQoaRqdcsZRZeD/Xbrv3PiOtEetzbURi7HaAtZqdKTdZZpYA NCiv78nykNH0CgsX6fWiHkkB9FzttUIywgx1OyGokYUDAFiCakuelz/pTeTFKtmBnnHn 68SFfSnGuxC+EtrPEdyU95A7cmmPA2rCRcugZtqzTy7blTzdgRaa3oxe87XUs/XTzfIt Wtqw== X-Gm-Message-State: AE9vXwP8eRErL2h0Hu9Zf6VaarEnz3H0yt94Y0A+3f8Iqvk9QLgpny6yRqXNLnrBnECgWg== X-Received: by 10.98.10.71 with SMTP id s68mr17581280pfi.110.1472655976756; Wed, 31 Aug 2016 08:06:16 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc115.osuosl.org. [140.211.9.73]) by smtp.gmail.com with ESMTPSA id c125sm464809pfc.40.2016.08.31.08.06.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Aug 2016 08:06:16 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 05/13] Share enum arm_breakpoint_kinds Date: Wed, 31 Aug 2016 15:06:00 -0000 Message-Id: <1472655965-12212-6-git-send-email-yao.qi@linaro.org> In-Reply-To: <1472655965-12212-1-git-send-email-yao.qi@linaro.org> References: <1472655965-12212-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes X-SW-Source: 2016-08/txt/msg00316.txt.bz2 This patch shares "enum arm_breakpoint_kinds", and use ARM_BP_KIND_THUMB2 in GDB. gdb: 2016-08-31 Yao Qi * arch/arm.h (enum arm_breakpoint_kinds): New. * arm-tdep.c (arm_remote_breakpoint_from_pc): Use ARM_BP_KIND_THUMB2. gdb/gdbserver: 2016-08-31 Yao Qi * linux-aarch32-low.c (enum arm_breakpoint_kinds): Remove. --- gdb/arch/arm.h | 8 ++++++++ gdb/arm-tdep.c | 2 +- gdb/gdbserver/linux-aarch32-low.c | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gdb/arch/arm.h b/gdb/arch/arm.h index fcde3d0..8d9c34e 100644 --- a/gdb/arch/arm.h +++ b/gdb/arch/arm.h @@ -58,6 +58,14 @@ enum gdb_regnum { ARM_LAST_FP_ARG_REGNUM = ARM_F3_REGNUM }; +/* Enum describing the different kinds of breakpoints. */ +enum arm_breakpoint_kinds +{ + ARM_BP_KIND_THUMB = 2, + ARM_BP_KIND_THUMB2 = 3, + ARM_BP_KIND_ARM = 4, +}; + /* Instruction condition field values. */ #define INST_EQ 0x0 #define INST_NE 0x1 diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index d2661cb..16dc574 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -7849,7 +7849,7 @@ arm_remote_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, if (arm_pc_is_thumb (gdbarch, *pcptr) && *kindptr == 4) /* The documented magic value for a 32-bit Thumb-2 breakpoint, so that this is not confused with a 32-bit ARM breakpoint. */ - *kindptr = 3; + *kindptr = ARM_BP_KIND_THUMB2; } /* Extract from an array REGBUF containing the (raw) register state a diff --git a/gdb/gdbserver/linux-aarch32-low.c b/gdb/gdbserver/linux-aarch32-low.c index e6971d5..ffc7ace 100644 --- a/gdb/gdbserver/linux-aarch32-low.c +++ b/gdb/gdbserver/linux-aarch32-low.c @@ -215,14 +215,6 @@ arm_breakpoint_at (CORE_ADDR where) return 0; } -/* Enum describing the different kinds of breakpoints. */ -enum arm_breakpoint_kinds -{ - ARM_BP_KIND_THUMB = 2, - ARM_BP_KIND_THUMB2 = 3, - ARM_BP_KIND_ARM = 4, -}; - /* Implementation of linux_target_ops method "breakpoint_kind_from_pc". Determine the type and size of breakpoint to insert at PCPTR. Uses the -- 1.9.1