[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/11] scripts/qemugdb/mtree.py: fix up mtree dump
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 01/11] scripts/qemugdb/mtree.py: fix up mtree dump |
Date: |
Mon, 10 Apr 2017 13:55:14 +0100 |
Since QEMU has been able to build with native Int128 support this was
broken as it attempts to fish values out of the non-existent
structure. Also the alias print was trying to make a %x out of
gdb.ValueType directly which didn't seem to work.
Signed-off-by: Alex Bennée <address@hidden>
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: address@hidden (@ %s)\n' %
(' ' * level,
alias['name'].string(),
- ptr['alias_offset'],
+ int(ptr['alias_offset']),
alias,
),
gdb.STDOUT)
--
2.11.0
- [Qemu-devel] [PULL 00/11] Final icount and misc MTTCG fixes for 2.9, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 04/11] cpus: remove icount handling from qemu_tcg_cpu_thread_fn, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 02/11] cpus: fix wrong define name, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 05/11] cpus: check cpu->running in cpu_get_icount_raw(), Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 06/11] cpus: move icount preparation out of tcg_exec_cpu, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 03/11] target/i386/misc_helper: wrap BQL around another IRQ generator, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 01/11] scripts/qemugdb/mtree.py: fix up mtree dump,
Alex Bennée <=
- [Qemu-devel] [PULL 10/11] cpus: call cpu_update_icount on read, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 08/11] cpus: introduce cpu_update_icount helper, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 11/11] replay: assert time only goes forward, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 09/11] cpu-exec: update icount after each TB_EXIT, Alex Bennée, 2017/04/10
- [Qemu-devel] [PULL 07/11] cpus: don't credit executed instructions before they have run, Alex Bennée, 2017/04/10
- Re: [Qemu-devel] [PULL 00/11] Final icount and misc MTTCG fixes for 2.9, Peter Maydell, 2017/04/10