From patchwork Sun Dec 8 18:29:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 36641 Received: (qmail 47174 invoked by alias); 8 Dec 2019 18:54:59 -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 47103 invoked by uid 89); 8 Dec 2019 18:54:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.143.40) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 08 Dec 2019 18:54:57 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 75BC89D5D for ; Sun, 8 Dec 2019 12:30:07 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id e1JniNEmeOdBHe1JniXAF8; Sun, 08 Dec 2019 12:30:07 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8R5nVGLeF1LlmZs2bDY/j3+e9hPxjHxsXJl7kpqBWOE=; b=wQ2ndpy9dY/yxr0oC8KBm3wvb1 HgVW4tuG8KbXZ5HXn0T7xwK4asDgnJM/EtF5fqil35ppXoMiSr/dJmTB6QKwUeDwVjpRUPv57fYu2 OZnG99JHpMuFNWHPW4SeCzYxk; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:53624 helo=bapiya.Home) by box5379.bluehost.com with esmtpa (Exim 4.92) (envelope-from ) id 1ie1Jn-0045Im-AC; Sun, 08 Dec 2019 11:30:07 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 31/55] Fix generic_val_print_enum for value-based printing Date: Sun, 8 Dec 2019 11:29:34 -0700 Message-Id: <20191208182958.10181-32-tom@tromey.com> In-Reply-To: <20191208182958.10181-1-tom@tromey.com> References: <20191208182958.10181-1-tom@tromey.com> This removes a call to val_print_scalar_formatted from generic_val_print_enum, preferring to do the work in the callers. This lets generic_value_print use the value-based API. gdb/ChangeLog 2019-12-08 Tom Tromey * valprint.c (generic_val_print): Update. (generic_value_print): Update. * valprint.c (generic_val_print_enum): Don't call val_print_scalar_formatted. Change-Id: I8a949daf9de4527482ff3b8e7038b58e97de1464 --- gdb/ChangeLog | 7 +++++++ gdb/valprint.c | 30 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/gdb/valprint.c b/gdb/valprint.c index 980dd3b024e..fe7ffa78abc 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -695,19 +695,13 @@ generic_val_print_enum (struct type *type, struct gdbarch *gdbarch = get_type_arch (type); int unit_size = gdbarch_addressable_memory_unit_size (gdbarch); - if (options->format) - { - val_print_scalar_formatted (type, embedded_offset, - original_value, options, 0, stream); - } - else - { - const gdb_byte *valaddr = value_contents_for_printing (original_value); + gdb_assert (!options->format); - val = unpack_long (type, valaddr + embedded_offset * unit_size); + const gdb_byte *valaddr = value_contents_for_printing (original_value); - generic_val_print_enum_1 (type, val, stream); - } + val = unpack_long (type, valaddr + embedded_offset * unit_size); + + generic_val_print_enum_1 (type, val, stream); } /* generic_val_print helper for TYPE_CODE_FLAGS. */ @@ -951,8 +945,12 @@ generic_val_print (struct type *type, break; case TYPE_CODE_ENUM: - generic_val_print_enum (type, embedded_offset, stream, - original_value, options); + if (options->format) + val_print_scalar_formatted (type, embedded_offset, + original_value, options, 0, stream); + else + generic_val_print_enum (type, embedded_offset, stream, + original_value, options); break; case TYPE_CODE_FLAGS: @@ -1060,8 +1058,10 @@ generic_value_print (struct value *val, struct ui_file *stream, int recurse, break; case TYPE_CODE_ENUM: - generic_val_print_enum (type, 0, stream, - val, options); + if (options->format) + value_print_scalar_formatted (val, options, 0, stream); + else + generic_val_print_enum (type, 0, stream, val, options); break; case TYPE_CODE_FLAGS: