From patchwork Tue Nov 22 15:48:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 17707 Received: (qmail 114741 invoked by alias); 22 Nov 2016 15:49:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 114531 invoked by uid 89); 22 Nov 2016 15:49:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=Hx-languages-length:1874, 15697, 1569, 7 X-HELO: mail-pg0-f65.google.com Received: from mail-pg0-f65.google.com (HELO mail-pg0-f65.google.com) (74.125.83.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 22 Nov 2016 15:48:56 +0000 Received: by mail-pg0-f65.google.com with SMTP id p66so2421365pga.2 for ; Tue, 22 Nov 2016 07:48:56 -0800 (PST) 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=idiQyFUDnBnFL9Mvmuf9HmUG44Rl7GJP4pUGHAOf6og=; b=NnfYZIiz+SIPrFSCU4qTU2PUl9bHtj3vfDoZOC0M3o0IWpqCqsnOxy0B5Fhei1a8fK odUL7oeVPcwPRMmIU2vudUtLhc8ZgvwpezLr4TODfrOLavHhmqkR4uGk4YhUDVeReLsC 2yJ7vV+O4xGWKcscp8F8R80zJ9wMI32uJYHhTWQRu+ZlafGO+d3oTCX9iugBF7Ws24nk H/NRNZyLjqKYnvsKiJgBGVJIeaZrgaCnzqNz4yoBJqpp+lYso3ppXSsOw/knbDToJbcJ 4/DUNEU2eTe/Pfo9Ahejvn71r7R9tLdcwnmzUsy1V+TcNkXGyyq4OO3JRseAGtMxpCIA HzgQ== X-Gm-Message-State: AKaTC00RtcDfglbuGZf+sjCojjjZ4ZnO1+HxucI3YFbgmQG0Sh1DTdeduJUhdlYRvFBtiA== X-Received: by 10.99.111.78 with SMTP id k75mr45974713pgc.114.1479829734484; Tue, 22 Nov 2016 07:48:54 -0800 (PST) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id o68sm46198774pfb.42.2016.11.22.07.48.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Nov 2016 07:48:54 -0800 (PST) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 1/3] New function value_has_address Date: Tue, 22 Nov 2016 15:48:39 +0000 Message-Id: <1479829721-22162-2-git-send-email-yao.qi@linaro.org> In-Reply-To: <1479829721-22162-1-git-send-email-yao.qi@linaro.org> References: <1479829721-22162-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes This patch is to move duplicated condition checking in three functions to a single new function, value_has_address. gdb: 2016-10-27 Yao Qi * value.c (value_has_address): New function. (value_address): Call value_has_address. (value_raw_address): Likewise. (set_value_address): Likewise. --- gdb/value.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index 8d33501..a8ab5db 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1540,12 +1540,20 @@ value_lval_const (const struct value *value) return value->lval; } +/* Return true if VALUE has address, otherwise return false. */ + +static int +value_has_address (const struct value *value) +{ + return (value->lval != lval_internalvar + && value->lval != lval_internalvar_component + && value->lval != lval_xcallable); +} + CORE_ADDR value_address (const struct value *value) { - if (value->lval == lval_internalvar - || value->lval == lval_internalvar_component - || value->lval == lval_xcallable) + if (!value_has_address (value)) return 0; if (value->parent != NULL) return value_address (value->parent) + value->offset; @@ -1561,9 +1569,7 @@ value_address (const struct value *value) CORE_ADDR value_raw_address (const struct value *value) { - if (value->lval == lval_internalvar - || value->lval == lval_internalvar_component - || value->lval == lval_xcallable) + if (!value_has_address (value)) return 0; return value->location.address; } @@ -1571,9 +1577,7 @@ value_raw_address (const struct value *value) void set_value_address (struct value *value, CORE_ADDR addr) { - gdb_assert (value->lval != lval_internalvar - && value->lval != lval_internalvar_component - && value->lval != lval_xcallable); + gdb_assert (value_has_address (value)); value->location.address = addr; }