44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
|
commit f0ee78c5ccefe388a64273353ecd5c99dae62558
|
||
|
|
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
|
||
|
|
Date: Fri Sep 18 20:54:22 2015 +0200
|
||
|
|
|
||
|
|
pahole.py: Fix the Python3 port.
|
||
|
|
- https://bugzilla.redhat.com/show_bug.cgi?id=1264532
|
||
|
|
|
||
|
|
diff --git a/gdb/python/lib/gdb/command/pahole.py b/gdb/python/lib/gdb/command/pahole.py
|
||
|
|
index dee04f5..e08eaf5 100644
|
||
|
|
--- a/gdb/python/lib/gdb/command/pahole.py
|
||
|
|
+++ b/gdb/python/lib/gdb/command/pahole.py
|
||
|
|
@@ -55,19 +55,19 @@ It prints the type and displays comments showing where holes are."""
|
||
|
|
fieldsize = 8 * ftype.sizeof
|
||
|
|
|
||
|
|
# TARGET_CHAR_BIT
|
||
|
|
- print (' /* %3d %3d */' % (int (bitpos / 8), int (fieldsize / 8)))
|
||
|
|
+ print (' /* %3d %3d */' % (int (bitpos / 8), int (fieldsize / 8)), end = "")
|
||
|
|
bitpos = bitpos + fieldsize
|
||
|
|
|
||
|
|
if ftype.code == gdb.TYPE_CODE_STRUCT:
|
||
|
|
self.pahole (ftype, level + 1, field.name)
|
||
|
|
else:
|
||
|
|
- print (' ' * (2 + 2 * level))
|
||
|
|
+ print (' ' * (2 + 2 * level), end = "")
|
||
|
|
print ('%s %s' % (str (ftype), field.name))
|
||
|
|
|
||
|
|
if level == 0:
|
||
|
|
self.maybe_print_hole(bitpos, 8 * type.sizeof)
|
||
|
|
|
||
|
|
- print (' ' * (14 + 2 * level))
|
||
|
|
+ print (' ' * (14 + 2 * level), end = "")
|
||
|
|
print ('} %s' % name)
|
||
|
|
|
||
|
|
def invoke (self, arg, from_tty):
|
||
|
|
@@ -75,7 +75,7 @@ It prints the type and displays comments showing where holes are."""
|
||
|
|
type = type.strip_typedefs ()
|
||
|
|
if type.code != gdb.TYPE_CODE_STRUCT:
|
||
|
|
raise (TypeError, '%s is not a struct type' % arg)
|
||
|
|
- print (' ' * 14)
|
||
|
|
+ print (' ' * 14, end = "")
|
||
|
|
self.pahole (type, 0, '')
|
||
|
|
|
||
|
|
Pahole()
|