From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 3/5] gdb: allow duplicate enumerators in flag enums
Date: Thu, 13 Feb 2020 20:30:00 -0000 [thread overview]
Message-ID: <20200213203035.30157-3-simon.marchi@efficios.com> (raw)
In-Reply-To: <20200213203035.30157-1-simon.marchi@efficios.com>
I have come across some uses cases where it would be desirable to treat
an enum that has duplicate values as a "flag enum". For example, this
one here [1]:
enum membarrier_cmd {
MEMBARRIER_CMD_QUERY = 0,
MEMBARRIER_CMD_GLOBAL = (1 << 0),
MEMBARRIER_CMD_GLOBAL_EXPEDITED = (1 << 1),
MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED = (1 << 2),
MEMBARRIER_CMD_PRIVATE_EXPEDITED = (1 << 3),
MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = (1 << 4),
MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE = (1 << 5),
MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = (1 << 6),
/* Alias for header backward compatibility. */
MEMBARRIER_CMD_SHARED = MEMBARRIER_CMD_GLOBAL,
};
The last enumerator is kept for backwards compatibility. Without this
patch, this enumeration wouldn't be considered a flag enum, because two
enumerators collide. With this patch, it would be considered a flag
enum, and the value 3 would be printed as:
MEMBARRIER_CMD_GLOBAL | MEMBARRIER_CMD_GLOBAL_EXPEDITED
Although if people prefer, we could display both MEMBARRIER_CMD_GLOBAL
and MEMBARRIER_CMD_SHARED in the result. It wouldn't be wrong, and
could perhaps be useful in case a bit may have multiple meanings
(depending on some other bit value).
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/membarrier.h?id=0bf999f9c5e74c7ecf9dafb527146601e5c848b9#n125
---
gdb/dwarf2/read.c | 5 -----
gdb/testsuite/gdb.base/printcmds.c | 7 ++++---
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index b866cc2d5747..5c34667ef36d 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -15495,7 +15495,6 @@ update_enumeration_type_from_children (struct die_info *die,
struct die_info *child_die;
int unsigned_enum = 1;
int flag_enum = 1;
- ULONGEST mask = 0;
auto_obstack obstack;
@@ -15533,10 +15532,6 @@ update_enumeration_type_from_children (struct die_info *die,
if (nbits != 0 && nbits && nbits != 1)
flag_enum = 0;
- else if ((mask & value) != 0)
- flag_enum = 0;
- else
- mask |= value;
}
/* If we already know that the enum type is neither unsigned, nor
diff --git a/gdb/testsuite/gdb.base/printcmds.c b/gdb/testsuite/gdb.base/printcmds.c
index f0b4fa4b86b1..81d2efe1a037 100644
--- a/gdb/testsuite/gdb.base/printcmds.c
+++ b/gdb/testsuite/gdb.base/printcmds.c
@@ -99,9 +99,10 @@ volatile enum some_volatile_enum some_volatile_enum = enumvolval1;
/* An enum considered as a "flag enum". */
enum flag_enum
{
- FE_NONE = 0x00,
- FE_ONE = 0x01,
- FE_TWO = 0x02,
+ FE_NONE = 0x00,
+ FE_ONE = 0x01,
+ FE_TWO = 0x02,
+ FE_TWO_LEGACY = 0x02,
};
enum flag_enum three = FE_ONE | FE_TWO;
--
2.25.0
next prev parent reply other threads:[~2020-02-13 20:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 20:30 [PATCH 1/5] gnulib: import count-one-bits module and use it Simon Marchi
2020-02-13 20:30 ` [PATCH 5/5] gdb: change print format of flag enums with value 0 Simon Marchi
2020-02-17 12:08 ` Luis Machado
2020-02-17 19:02 ` Simon Marchi
2020-02-18 20:45 ` Tom Tromey
2020-02-18 20:52 ` Simon Marchi
2020-02-13 20:30 ` [PATCH 2/5] gdb: fix printing of flag enums with multi-bit enumerators Simon Marchi
2020-02-17 10:56 ` Luis Machado
2020-02-17 17:27 ` Simon Marchi
2020-02-17 17:40 ` Luis Machado
2020-02-17 19:20 ` Simon Marchi
2020-02-18 20:42 ` Tom Tromey
2020-02-13 20:30 ` Simon Marchi [this message]
2020-02-17 11:01 ` [PATCH 3/5] gdb: allow duplicate enumerators in flag enums Luis Machado
2020-02-18 20:38 ` Tom Tromey
2020-02-18 20:42 ` Tom Tromey
2020-02-18 20:48 ` Simon Marchi
2020-02-18 21:57 ` Tom Tromey
2020-02-18 22:25 ` Simon Marchi
2020-02-13 20:38 ` [PATCH 4/5] gdb: print unknown part of flag enum in hex Simon Marchi
2020-02-17 11:04 ` Luis Machado
2020-02-17 18:59 ` Simon Marchi
2020-02-18 20:43 ` Tom Tromey
2020-02-14 19:53 ` [PATCH 1/5] gnulib: import count-one-bits module and use it Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200213203035.30157-3-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).