From 10e3ed9029dc0b6eafcd991d9f292fc079f80cf5 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 19 Jan 2016 11:07:07 -0500 Subject: Fix enum flag with Python 3 Using Python 3.5 (I assume it's the same with 3.4 and lower, but I didn't test), I see this: print (enum flag_enum) (FLAG_1)^M Python Exception %x format: an integer is required, not gdb.Value: ^M $7 = ^M (gdb) FAIL: gdb.python/py-pp-maint.exp: print FLAG_1 Apparently, this idiom, where v is a gdb.Value, was possible with Python 2, but not with Python 3: '%x' % v In Python 2, it would automatically get converted to an integer. To solve it, I simply added wrapped v in a call to int(). '%x' % int(v) In Python 2, the int type is implemented with a "long" in C, so on x86-32 it's 32-bits. I was worried that doing int(v) would truncate the value and give wrong results for enum values > 32-bits. However, the int type != the int function. The int function does the right thing, selecting the right integer type for the given value. I tested with large enum values on x86-32 and Python 2, and everything works as expected. gdb/ChangeLog: * python/lib/gdb/printing.py (_EnumInstance.to_string): Explicitly convert gdb.Value to integer type using int(). --- gdb/python/lib/gdb/printing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gdb/python/lib') diff --git a/gdb/python/lib/gdb/printing.py b/gdb/python/lib/gdb/printing.py index 263d3ba..5160581 100644 --- a/gdb/python/lib/gdb/printing.py +++ b/gdb/python/lib/gdb/printing.py @@ -239,7 +239,7 @@ class _EnumInstance: if not any_found or v != 0: # Leftover value. flag_list.append('' % v) - return "0x%x [%s]" % (self.val, " | ".join(flag_list)) + return "0x%x [%s]" % (int(self.val), " | ".join(flag_list)) class FlagEnumerationPrinter(PrettyPrinter): """A pretty-printer which can be used to print a flag-style enumeration. -- cgit v1.1