From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 127155 invoked by alias); 10 Nov 2016 14:54:56 -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 127119 invoked by uid 89); 10 Nov 2016 14:54:55 -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=4517, 2016-11-10 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; Thu, 10 Nov 2016 14:54:45 +0000 Received: by mail-pf0-f194.google.com with SMTP id i88so4478173pfk.2 for ; Thu, 10 Nov 2016 06:54:45 -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; bh=kKPVvCVBhxyQgKF4Torim0+s2xe3k1pQxLk03I4ztBo=; b=DGmfrvtWfa9eKdKlq6s6RIsPVYgl3rxYsvlBpP4luwcWWF3Ealj4HwbykUK5HaNhTn ispZVUmYffTXV9LOVk/xrYjz6sQdm3cD9TxKVVA0S2Vr1TByEs3FLOo5522AoAOiYEXL hr4TbCu0QNPpIO7XwMErd4Edud3nBbdDept07oesHosSfWUoekWloKEYSHZQGaA19bC6 g56r0SzvGTfe3hcXln4zVJ6jbhuOZopgm58yBB704ungUBsLeHxgHUkI2qwSD9COflhH byRiZgIgh6YHOlfOtkbx1j3EMfPecBSpw+ReLIz+JQYwoImrM8Mi2cut6r1Oz3httThv VaEA== X-Gm-Message-State: ABUngvfCRvSDx0AQPGo4zh3BR1eWHSdbPgZAEDBHwufbthJStt/hl0+BEXtC9/hzJFoBEg== X-Received: by 10.99.219.21 with SMTP id e21mr24054786pgg.136.1478789683689; Thu, 10 Nov 2016 06:54:43 -0800 (PST) Received: from E107787-LIN.cambridge.arm.com (gcc114.osuosl.org. [140.211.9.72]) by smtp.gmail.com with ESMTPSA id xg4sm7938513pac.39.2016.11.10.06.54.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Nov 2016 06:54:42 -0800 (PST) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 1/2] Remove parameter valaddr from c print functions Date: Thu, 10 Nov 2016 14:54:00 -0000 Message-Id: <1478789679-30957-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes X-SW-Source: 2016-11/txt/msg00249.txt.bz2 This patch removes parameter valaddr from some c print functions. Regression tested on x86_64-linux. gdb: 2016-11-10 Yao Qi * c-lang.h (cp_print_value_fields): Update declaration. * cp-valprint.c (cp_print_value): Update declaration. (cp_print_value_fields): Remove parameter valaddr. Callers updated. (cp_print_value): Likewise. --- gdb/c-lang.h | 2 +- gdb/cp-valprint.c | 16 +++++++++------- gdb/m2-valprint.c | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gdb/c-lang.h b/gdb/c-lang.h index 25cd93c..b898b708 100644 --- a/gdb/c-lang.h +++ b/gdb/c-lang.h @@ -123,7 +123,7 @@ extern void cp_print_class_member (const gdb_byte *, struct type *, struct ui_file *, char *); extern void cp_print_value_fields (struct type *, struct type *, - const gdb_byte *, LONGEST, CORE_ADDR, + LONGEST, CORE_ADDR, struct ui_file *, int, struct value *, const struct value_print_options *, diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 82e505a..57d5d02 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -80,7 +80,7 @@ static void cp_print_static_field (struct type *, struct value *, const struct value_print_options *); static void cp_print_value (struct type *, struct type *, - const gdb_byte *, LONGEST, + LONGEST, CORE_ADDR, struct ui_file *, int, struct value *, const struct value_print_options *, @@ -154,7 +154,7 @@ cp_is_vtbl_member (struct type *type) void cp_print_value_fields (struct type *type, struct type *real_type, - const gdb_byte *valaddr, LONGEST offset, + LONGEST offset, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *val, const struct value_print_options *options, @@ -194,7 +194,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, duplicates of virtual baseclasses. */ if (n_baseclasses > 0) - cp_print_value (type, real_type, valaddr, + cp_print_value (type, real_type, offset, address, stream, recurse + 1, val, options, dont_print_vb); @@ -228,6 +228,8 @@ cp_print_value_fields (struct type *type, struct type *real_type, vptr_fieldno = get_vptr_fieldno (type, &vptr_basetype); for (i = n_baseclasses; i < len; i++) { + const gdb_byte *valaddr = value_contents_for_printing (val); + /* If requested, skip printing of static fields. */ if (!options->static_field_print && field_is_static (&TYPE_FIELD (type, i))) @@ -449,7 +451,7 @@ cp_print_value_fields_rtti (struct type *type, if (!real_type) real_type = type; - cp_print_value_fields (type, real_type, valaddr, offset, + cp_print_value_fields (type, real_type, offset, address, stream, recurse, val, options, dont_print_vb, dont_print_statmem); } @@ -459,7 +461,7 @@ cp_print_value_fields_rtti (struct type *type, static void cp_print_value (struct type *type, struct type *real_type, - const gdb_byte *valaddr, LONGEST offset, + LONGEST offset, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *val, const struct value_print_options *options, @@ -471,6 +473,7 @@ cp_print_value (struct type *type, struct type *real_type, int i, n_baseclasses = TYPE_N_BASECLASSES (type); LONGEST thisoffset; struct type *thistype; + const gdb_byte *valaddr = value_contents_for_printing (val); if (dont_print_vb == 0) { @@ -596,7 +599,7 @@ cp_print_value (struct type *type, struct type *real_type, current_language); if (!result) - cp_print_value_fields (baseclass, thistype, base_valaddr, + cp_print_value_fields (baseclass, thistype, thisoffset + boffset, value_address (base_val), stream, recurse, base_val, options, @@ -671,7 +674,6 @@ cp_print_static_field (struct type *type, sizeof (CORE_ADDR)); type = check_typedef (type); cp_print_value_fields (type, value_enclosing_type (val), - value_contents_for_printing (val), value_embedded_offset (val), addr, stream, recurse, val, options, NULL, 1); diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c index f43a2d2..50c2b30 100644 --- a/gdb/m2-valprint.c +++ b/gdb/m2-valprint.c @@ -398,7 +398,7 @@ m2_val_print (struct type *type, int embedded_offset, m2_print_unbounded_array (type, valaddr, embedded_offset, address, stream, recurse, options); else - cp_print_value_fields (type, type, valaddr, embedded_offset, + cp_print_value_fields (type, type, embedded_offset, address, stream, recurse, original_value, options, NULL, 0); break; -- 1.9.1