ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec-all: Widen TranslationBlock pc and cs_base to 64-bits 

This makes TranslationBlock agnostic to the address size of the guest.
Use vaddr for pc, since that's always a virtual address.
Use uint64_t for cs_base, since usage varies between guests.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-04-01 15:28:18 -07:00
parent 087e2341fb
commit 85314e13ad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accel/tcg/cpu-exec.c
View File

@ -297,7 +297,7 @@ static void log_cpu_exec(target_ulong pc, CPUState *cpu,
{ {
if (qemu_log_in_addr_range(pc)) { if (qemu_log_in_addr_range(pc)) {
qemu_log_mask(CPU_LOG_EXEC, qemu_log_mask(CPU_LOG_EXEC,
"Trace %d: %p [" TARGET_FMT_lx "Trace %d: %p [%08" PRIx64
"/" TARGET_FMT_lx "/%08x/%08x] %s\n", "/" TARGET_FMT_lx "/%08x/%08x] %s\n",
cpu->cpu_index, tb->tc.ptr, tb->cs_base, pc, cpu->cpu_index, tb->tc.ptr, tb->cs_base, pc,
tb->flags, tb->cflags, lookup_symbol(pc)); tb->flags, tb->cflags, lookup_symbol(pc));

4
include/exec/exec-all.h
View File

@ -516,7 +516,7 @@ struct TranslationBlock {
* Unwind information is taken as offsets from the page, to be * Unwind information is taken as offsets from the page, to be
* deposited into the "current" PC. * deposited into the "current" PC.
*/ */
target_ulong pc; vaddr pc;
/* /*
* Target-specific data associated with the TranslationBlock, e.g.: * Target-specific data associated with the TranslationBlock, e.g.:
@ -525,7 +525,7 @@ struct TranslationBlock {
* s390x: instruction data for EXECUTE, * s390x: instruction data for EXECUTE,
* sparc: the next pc of the instruction queue (for delay slots). * sparc: the next pc of the instruction queue (for delay slots).
*/ */
target_ulong cs_base; uint64_t cs_base;
uint32_t flags; /* flags defining in which context the code was generated */ uint32_t flags; /* flags defining in which context the code was generated */
uint32_t cflags; /* compile flags */ uint32_t cflags; /* compile flags */