From patchwork Thu Feb 13 20:30:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 38054 Received: (qmail 29177 invoked by alias); 13 Feb 2020 20:30:50 -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 29121 invoked by uid 89); 13 Feb 2020 20:30:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:3029, quit, QUIT X-HELO: mail.efficios.com Received: from mail.efficios.com (HELO mail.efficios.com) (167.114.26.124) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 13 Feb 2020 20:30:46 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 72A0B2613C6 for ; Thu, 13 Feb 2020 15:30:44 -0500 (EST) Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id rDnOzQNzHnLN; Thu, 13 Feb 2020 15:30:44 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 1EBC3261703; Thu, 13 Feb 2020 15:30:44 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 1EBC3261703 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1581625844; bh=Ges5yWjFREZ4yF7ZrWjQ+0CifxF6jDw+ub4RLsutYw0=; h=From:To:Date:Message-Id:MIME-Version; b=TzQU9+Mkg9Y3xFB9RiYbL96a6AJqz0l6fMl4KRXj2CKVZ6Mmy+KcX5xGVtu/iRyKf 4g7Bw+mo3caD1FcQUuGxyrh2qc0vTH+c9Eg9drajKZ23FKLR0jmak9RHU9tGcQMD4L Npsl5/SfZllsKUBVOkIhL2vqIn5aG0bkgBq4G1OqKFZprk5OlUUCqe2FIa6HA0++yn 4JfjW8mLTX+Df4JD/ADVNO1f16wVmJgiBLJ0KqZ7CXVHjiQ0J/K+80y8t5CutgLadd tIeNzxT65/sBR/ivNjcu8TpwCmTKwj3M9c0HkufLAEn0qqfNBG1QMugGbiL15GpDHd BZBLaLHd70yxw== Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id yDJaAyteN-Po; Thu, 13 Feb 2020 15:30:44 -0500 (EST) Received: from smarchi-efficios.internal.efficios.com (192-222-181-218.qc.cable.ebox.net [192.222.181.218]) by mail.efficios.com (Postfix) with ESMTPSA id C89E22613C3; Thu, 13 Feb 2020 15:30:42 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 5/5] gdb: change print format of flag enums with value 0 Date: Thu, 13 Feb 2020 15:30:35 -0500 Message-Id: <20200213203035.30157-5-simon.marchi@efficios.com> In-Reply-To: <20200213203035.30157-1-simon.marchi@efficios.com> References: <20200213203035.30157-1-simon.marchi@efficios.com> MIME-Version: 1.0 If a flag enum has value 0 and the enumeration type does not have an enumerator with value 0, we currently print: $1 = (unknown: 0x0) I don't like the display of "unknown" here, since for flags, 0 is a an expected value. It just means that no flags are set. This patch makes it so that we print it as a simple 0 in this situation: $1 = 0 If there is an enumerator with value 0, it is still printed using that enumerator, for example (from the test): $1 = FE_NONE gdb/ChangeLog: * valprint.c (generic_val_print_enum_1): When printing a flag enum with value 0 and there is no enumerator with value 0, print just "0" instead of "(unknown: 0x0)". gdb/testsuite/ChangeLog: * gdb.base/printcmds.exp (test_print_enums): Update expected output. --- gdb/testsuite/gdb.base/printcmds.exp | 2 +- gdb/valprint.c | 31 +++++++++++++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp index d6f5c75650bf..bd2afc8696f0 100644 --- a/gdb/testsuite/gdb.base/printcmds.exp +++ b/gdb/testsuite/gdb.base/printcmds.exp @@ -743,7 +743,7 @@ proc test_print_enums {} { gdb_test "print (enum flag_enum) 0x0" [string_to_regexp " = FE_NONE"] # Print a flag enum with value 0, where no enumerator has value 0. - gdb_test "print flag_enum_without_zero" [string_to_regexp " = (unknown: 0x0)"] + gdb_test "print flag_enum_without_zero" [string_to_regexp " = 0"] # Print a flag enum with unknown bits set. gdb_test "print (enum flag_enum) 0xf1" [string_to_regexp " = (FE_ONE | unknown: 0xf0)"] diff --git a/gdb/valprint.c b/gdb/valprint.c index bd21be69e1bf..6e62d420c0f4 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -634,7 +634,6 @@ generic_val_print_enum_1 (struct type *type, LONGEST val, /* We have a "flag" enum, so we try to decompose it into pieces as appropriate. A flag enum has disjoint constants by definition. */ - fputs_filtered ("(", stream); for (i = 0; i < len; ++i) { QUIT; @@ -646,24 +645,42 @@ generic_val_print_enum_1 (struct type *type, LONGEST val, if ((val & enumval) != 0) { - if (!first) + if (first) + { + fputs_filtered ("(", stream); + first = 0; + } + else fputs_filtered (" | ", stream); - first = 0; val &= ~TYPE_FIELD_ENUMVAL (type, i); fputs_filtered (TYPE_FIELD_NAME (type, i), stream); } } - if (first || val != 0) + if (val != 0) { - if (!first) + /* There are leftover bits, print them. */ + if (first) + fputs_filtered ("(", stream); + else fputs_filtered (" | ", stream); + fputs_filtered ("unknown: 0x", stream); print_longest (stream, 'x', 0, val); + fputs_filtered (")", stream); + } + else if (first) + { + /* Nothing has been printed and the value is 0, the enum value must + have been 0. */ + fputs_filtered ("0", stream); + } + else + { + /* Something has been printed, close the parenthesis. */ + fputs_filtered (")", stream); } - - fputs_filtered (")", stream); } else print_longest (stream, 'd', 0, val);