diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-05-18 11:11:26 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-05-18 11:11:27 +0100 |
| commit | 8e22b27994dba67f3d67d2cb7cf67d7863862b67 (patch) | |
| tree | 5183cc9f1db97c7797d9cc9d14b8976adc816117 /accel | |
| parent | 1acbc0fdf238d5c6c51ee3ef502f6a0ce589304a (diff) | |
| parent | 6c6a4a76eea900112c343ba4f9c5737e298feddf (diff) | |
| download | qemu-8e22b27994dba67f3d67d2cb7cf67d7863862b67.zip qemu-8e22b27994dba67f3d67d2cb7cf67d7863862b67.tar.gz qemu-8e22b27994dba67f3d67d2cb7cf67d7863862b67.tar.bz2 | |
Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210516' into staging
Minor MAINTAINERS update.
Tweak to includes.
Add tcg_constant_tl.
Improve constant pool dump.
# gpg: Signature made Sun 16 May 2021 15:08:42 BST
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth-gitlab/tags/pull-tcg-20210516:
accel/tcg: Align data dumped at end of TB
tcg: Add tcg_constant_tl
exec/gen-icount.h: Add missing "exec/exec-all.h" include
MAINTAINERS: Add include/exec/gen-icount.h to 'Main Loop' section
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'accel')
| -rw-r--r-- | accel/tcg/translate-all.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index ae7e873..fbf8fc6 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2042,8 +2042,15 @@ TranslationBlock *tb_gen_code(CPUState *cpu, int i; qemu_log(" data: [size=%d]\n", data_size); for (i = 0; i < data_size / sizeof(tcg_target_ulong); i++) { - qemu_log("0x%08" PRIxPTR ": .quad 0x%" TCG_PRIlx "\n", - (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]); + if (sizeof(tcg_target_ulong) == 8) { + qemu_log("0x%08" PRIxPTR ": .quad 0x%016" TCG_PRIlx "\n", + (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]); + } else if (sizeof(tcg_target_ulong) == 4) { + qemu_log("0x%08" PRIxPTR ": .long 0x%08" TCG_PRIlx "\n", + (uintptr_t)&rx_data_gen_ptr[i], rx_data_gen_ptr[i]); + } else { + qemu_build_not_reached(); + } } } qemu_log("\n"); |