From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 96755 invoked by alias); 31 Aug 2016 15:06:35 -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 96585 invoked by uid 89); 31 Aug 2016 15:06:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-pf0-f194.google.com Received: from mail-pf0-f194.google.com (HELO mail-pf0-f194.google.com) (209.85.192.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 Aug 2016 15:06:24 +0000 Received: by mail-pf0-f194.google.com with SMTP id y134so2902194pfg.3 for ; Wed, 31 Aug 2016 08:06:24 -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=DQPx6cQ6Kwz9IIGaAfDEN731TTS4IMLchlTZGVl/7DE=; b=S/zfzEM86MuzOIEKfHv7IlqMQInRLdcC+Q4MH9uo2bVnjeyJ7u3GIfk27MsH0P9rNG hULXLivPcdPv605v1aEPa7fxmqBdm0AUgKIS+K2ZfW/WOXA1TUv/a88O3OSS39DuNSuP L5U1cXlkOnJtqqH+FDoiUD2pnKa4Vzr8NyGHWbtaQu6SMZUzDBhr/8gZ8FbJwo/V/M9a m2EJCeJ0+uDhEsIz9f8GdbWV2dbE8sJkKMd/uW6+XNrxAiwwEAtu8qiIA31e/yw5gwJv aauwhCsAGBLXSWGQgFM6z6gI9TzK9uWyEO+7E9iHX8RLEd08jpDEHhq5ME+CbxShIYIE C/4g== X-Gm-Message-State: AE9vXwOdVetEisPOz/ZTPJYzE8UFrDv6+AKCQDyK4hBQmA2WM/qlew7YFl9SMX3Mgn641w== X-Received: by 10.98.202.202 with SMTP id y71mr17903563pfk.10.1472655983085; Wed, 31 Aug 2016 08:06:23 -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.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Aug 2016 08:06:22 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 09/13] Rename placed_size to kind Date: Wed, 31 Aug 2016 15:06:00 -0000 Message-Id: <1472655965-12212-10-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/msg00321.txt.bz2 This patch renames placed_size to kind. gdb: 2016-08-30 Yao Qi * breakpoint.h (struct bp_target_info) : Remove. : New field. Update all users. --- gdb/breakpoint.c | 4 ++-- gdb/breakpoint.h | 10 +++------- gdb/mem-break.c | 4 ++-- gdb/remote.c | 8 ++++---- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index f00c6c3..cc672f7 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -2769,7 +2769,7 @@ insert_bp_location (struct bp_location *bl, { int val; - bl->overlay_target_info.placed_size + bl->overlay_target_info.kind = breakpoint_kind (bl, &addr); bl->overlay_target_info.placed_address = addr; val = target_insert_breakpoint (bl->gdbarch, @@ -13129,7 +13129,7 @@ bkpt_insert_location (struct bp_location *bl) { CORE_ADDR addr = bl->target_info.reqstd_address; - bl->target_info.placed_size = breakpoint_kind (bl, &addr); + bl->target_info.kind = breakpoint_kind (bl, &addr); bl->target_info.placed_address = addr; if (bl->loc_type == bp_loc_hardware_breakpoint) diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 4bdf0d5..95b5731 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -260,13 +260,9 @@ struct bp_target_info /* The length of the data cached in SHADOW_CONTENTS. */ int shadow_len; - /* The size of the placed breakpoint, according to - gdbarch_breakpoint_from_pc, when the breakpoint was inserted. - This is generally the same as SHADOW_LEN, unless we did not need - to read from the target to implement the memory breakpoint - (e.g. if a remote stub handled the details). We may still need - the size to remove the breakpoint safely. */ - int placed_size; + /* The breakpoint's kind. It is used in 'kind' parameter in Z + packets. */ + int kind; /* Vector of conditions the target should evaluate if it supports target-side breakpoint conditions. */ diff --git a/gdb/mem-break.c b/gdb/mem-break.c index dafe834..50f7d9c 100644 --- a/gdb/mem-break.c +++ b/gdb/mem-break.c @@ -44,7 +44,7 @@ default_memory_insert_breakpoint (struct gdbarch *gdbarch, int val; /* Determine appropriate breakpoint contents and size for this address. */ - bp = gdbarch_sw_breakpoint_from_kind (gdbarch, bp_tgt->placed_size, &bplen); + bp = gdbarch_sw_breakpoint_from_kind (gdbarch, bp_tgt->kind, &bplen); /* Save the memory contents in the shadow_contents buffer and then write the breakpoint instruction. */ @@ -76,7 +76,7 @@ default_memory_remove_breakpoint (struct gdbarch *gdbarch, { int bplen; - gdbarch_sw_breakpoint_from_kind (gdbarch, bp_tgt->placed_size, &bplen); + gdbarch_sw_breakpoint_from_kind (gdbarch, bp_tgt->kind, &bplen); return target_write_raw_memory (bp_tgt->placed_address, bp_tgt->shadow_contents, bplen); diff --git a/gdb/remote.c b/gdb/remote.c index 9eb1d4b..9c85608 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -9297,7 +9297,7 @@ remote_insert_breakpoint (struct target_ops *ops, *(p++) = ','; addr = (ULONGEST) remote_address_masked (addr); p += hexnumstr (p, addr); - xsnprintf (p, endbuf - p, ",%d", bp_tgt->placed_size); + xsnprintf (p, endbuf - p, ",%d", bp_tgt->kind); if (remote_supports_cond_breakpoints (ops)) remote_add_target_side_condition (gdbarch, bp_tgt, p, endbuf); @@ -9353,7 +9353,7 @@ remote_remove_breakpoint (struct target_ops *ops, addr = (ULONGEST) remote_address_masked (bp_tgt->placed_address); p += hexnumstr (p, addr); - xsnprintf (p, endbuf - p, ",%d", bp_tgt->placed_size); + xsnprintf (p, endbuf - p, ",%d", bp_tgt->kind); putpkt (rs->buf); getpkt (&rs->buf, &rs->buf_size, 0); @@ -9608,7 +9608,7 @@ remote_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch, addr = remote_address_masked (addr); p += hexnumstr (p, (ULONGEST) addr); - xsnprintf (p, endbuf - p, ",%x", bp_tgt->placed_size); + xsnprintf (p, endbuf - p, ",%x", bp_tgt->kind); if (remote_supports_cond_breakpoints (self)) remote_add_target_side_condition (gdbarch, bp_tgt, p, endbuf); @@ -9662,7 +9662,7 @@ remote_remove_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch, addr = remote_address_masked (bp_tgt->placed_address); p += hexnumstr (p, (ULONGEST) addr); - xsnprintf (p, endbuf - p, ",%x", bp_tgt->placed_size); + xsnprintf (p, endbuf - p, ",%x", bp_tgt->kind); putpkt (rs->buf); getpkt (&rs->buf, &rs->buf_size, 0); -- 1.9.1