aboutsummaryrefslogtreecommitdiff
path: root/scripts/qemugdb/mtree.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/qemugdb/mtree.py')
-rw-r--r--scripts/qemugdb/mtree.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/qemugdb/mtree.py b/scripts/qemugdb/mtree.py
index cc8131c2e7..e6791b7885 100644
--- a/scripts/qemugdb/mtree.py
+++ b/scripts/qemugdb/mtree.py
@@ -21,7 +21,15 @@ def isnull(ptr):
return ptr == gdb.Value(0).cast(ptr.type)
def int128(p):
- return int(p['lo']) + (int(p['hi']) << 64)
+ '''Read an Int128 type to a python integer.
+
+ QEMU can be built with native Int128 support so we need to detect
+ if the value is a structure or the native type.
+ '''
+ if p.type.code == gdb.TYPE_CODE_STRUCT:
+ return int(p['lo']) + (int(p['hi']) << 64)
+ else:
+ return int(("%s" % p), 16)
class MtreeCommand(gdb.Command):
'''Display the memory tree hierarchy'''
@@ -69,7 +77,7 @@ class MtreeCommand(gdb.Command):
gdb.write('%s alias: %s@%016x (@ %s)\n' %
(' ' * level,
alias['name'].string(),
- ptr['alias_offset'],
+ int(ptr['alias_offset']),
alias,
),
gdb.STDOUT)