Start replacing target_ulong with vaddr
v3 cover Start replacing target_ulong with vaddr
This is a first patchset in removing target_ulong from non-target/ directories. As use of target_ulong is spread accross the codebase we are attempting to target as few maintainers as possible with each patchset in order to ease reviewing.
The following instances of target_ulong remain in accel/ and tcg/
- atomic helpers (atomic_common.c.inc), cpu_atomic_*() (atomic_template.h,) and cpu_[st|ld]*() (cputlb.c/ldst_common.c.inc) are only used in target/ and can be pulled out into a separate target-specific file;
- walk_memory_regions() is used in user-exec.c and linux-user/elfload.c;
- kvm_find_sw_breakpoint() in kvm-all.c used in target/;
Changes in v2:
- addr argument in tb_invalidate_phys_addr() changed from vaddr to hwaddr;
- Removed previous patch:
"[PATCH 4/8] accel/tcg: Replace target_ulong with vaddr in helper_unaligned_*()"
as these functions are removed by Richard's patches;
- First patch:
"[PATCH 1/8] accel: Replace target_ulong with vaddr in TB/TLB"
has been split into patches 1-7 to ease reviewing;
- Pulled in target/ changes to cpu_get_tb_cpu_state() into this patchset. This was done to avoid pointer casts to target_ulong * which would break for 32-bit targets on a 64-bit BE host;
Note the small target/ changes are collected in a single patch to not break bisection. If it's still desirable to split based on maintainer, let me know;
- last argument of pageflags_[find|next] changed from target_long to vaddr. This change was left out of the last patchset due to triggering a "Bad ram pointer" error (softmmu/physmem.c:2273) when running make check for a i386-softmmu target.
I was not able to recreate this on master or post rebase on Richard's tcg-once branch.
Changes in v3:
- Rebased on master
Finally, the grand goal is to allow for heterogeneous QEMU binaries consisting of multiple frontends.
RFC: https://lists.nongnu.org/archive/html/qemu-devel/2022-12/msg04518.html
Anton Johansson (12):
accel: Replace target_ulong in tlb_*() accel/tcg/translate-all.c: Widen pc and cs_base
target: Widen pc/cs_base in cpu_get_tb_cpu_state accel/tcg/cputlb.c: Widen CPUTLBEntry access functions accel/tcg/cputlb.c: Widen addr in MMULookupPageData accel/tcg/cpu-exec.c: Widen pc to vaddr
accel/tcg: Widen pc to vaddr in CPUJumpCache
accel: Replace target_ulong with vaddr in probe_*() accel/tcg: Replace target_ulong with vaddr in *_mmu_lookup() accel/tcg: Replace target_ulong with vaddr in translator_*() accel/tcg: Replace target_ulong with vaddr in page_*()
cpu: Replace target_ulong with hwaddr in tb_invalidate_phys_addr()
accel/stubs/tcg-stub.c | 6 +- accel/tcg/cpu-exec.c | 43 ++++--- accel/tcg/cputlb.c | 233 +++++++++++++++++------------------ accel/tcg/internal.h | 6 +- accel/tcg/tb-hash.h | 12 +- accel/tcg/tb-jmp-cache.h | 2 +- accel/tcg/tb-maint.c | 2 +- accel/tcg/translate-all.c | 13 +- accel/tcg/translator.c | 10 +- accel/tcg/user-exec.c | 58 +++++---- cpu.c | 2 +- include/exec/cpu-all.h | 10 +- include/exec/cpu-defs.h | 4 +- include/exec/cpu_ldst.h | 10 +- include/exec/exec-all.h | 95 +++++++------- include/exec/translate-all.h | 2 +- include/exec/translator.h | 6 +- include/qemu/plugin-memory.h | 2 +- target/alpha/cpu.h | 4 +- target/arm/cpu.h | 4 +- target/arm/helper.c | 4 +- target/avr/cpu.h | 4 +- target/cris/cpu.h | 4 +- target/hexagon/cpu.h | 4 +- target/hppa/cpu.h | 5 +- target/i386/cpu.h | 4 +- target/loongarch/cpu.h | 6 +- target/m68k/cpu.h | 4 +- target/microblaze/cpu.h | 4 +- target/mips/cpu.h | 4 +- target/nios2/cpu.h | 4 +- target/openrisc/cpu.h | 5 +- target/ppc/cpu.h | 8 +- target/ppc/helper_regs.c | 4 +- target/riscv/cpu.h | 4 +- target/riscv/cpu_helper.c | 4 +- target/rx/cpu.h | 4 +- target/s390x/cpu.h | 4 +- target/sh4/cpu.h | 4 +- target/sparc/cpu.h | 4 +- target/tricore/cpu.h | 4 +- target/xtensa/cpu.h | 4 +- 42 files changed, 307 insertions(+), 313 deletions(-)
--
2.41.0
PATCH v3 1/12 accel: Replace target_ulong in tlb_*()
Replaces target_ulong with vaddr for guest virtual addresses in tlb_*() functions and auxilliary structs.
--- accel/stubs/tcg-stub.c | 2 +- accel/tcg/cputlb.c | 177 +++++++++++++++++------------------ accel/tcg/tb-maint.c | 2 +- include/exec/cpu-defs.h | 4 +- include/exec/exec-all.h | 79 ++++++++-------- include/qemu/plugin-memory.h | 2 +- 6 files changed, 131 insertions(+), 135 deletions(-)
accel/stubs/tcg-stub.c +1 -1
@@ -18,7 +18,7 @@ void tb_flush(CPUState *cpu) { } -void tlb_set_dirty (CPUState *cpu,target_ulong vaddr) +void tlb_set_dirty (CPUState *cpu,vaddr vaddr) { }
accel/tcg/cputlb.c +87 -90
512 lines not on this page · raw message
accel/tcg/tb-maint.c +1 -1
@@ -98,7 +98,7 @@ static void tb_remove_all(void)/* Call with mmap_lock held. */ static void tb_record (TranslationBlock *tb,PageDesc *p1,PageDesc *p2) { -target_ulong addr; +vaddr addr;int flags;assert_memory_lock ();
include/exec/cpu-defs.h +2 -2
@@ -147,8 +147,8 @@ typedef struct CPUTLBDesc {* we must flush the entire tlb. The region is matched if * (addr & large_page_mask) == large_page_addr. */ -target_ulong large_page_addr; -target_ulong large_page_mask; +vaddr large_page_addr; +vaddr large_page_mask;/* host time (in ns) at the beginning of the time window */ int64_t window_begin_ns;/* maximum number of entries observed in the window */
include/exec/exec-all.h +39 -40
234 lines not on this page · raw message
include/qemu/plugin-memory.h +1 -1
@@ -37,7 +37,7 @@ struct qemu_plugin_hwaddr {* It would only fail if not called from an instrumented memory access * which would be an abuse of the API. */ -bool tlb_plugin_lookup (CPUState *cpu,target_ulong addr,int mmu_idx, +bool tlb_plugin_lookup (CPUState *cpu,vaddr addr,int mmu_idx,bool is_store,struct qemu_plugin_hwaddr *data);#endif /* PLUGIN_MEMORY_H */
Signature · 1 line
2.41.0
PATCH v3 2/12 accel/tcg/translate-all.c: Widen pc and cs_base
In reply to Anton Johansson via--- accel/tcg/internal.h | 6 +++--- accel/tcg/translate-all.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-)
accel/tcg/internal.h +3 -3
@@ -42,8 +42,8 @@ void tb_invalidate_phys_range_fast(ram_addr_t ram_addr, G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);#endif /* CONFIG_SOFTMMU */ -TranslationBlock *tb_gen_code (CPUState *cpu,target_ulong pc, -target_ulong cs_base,uint32_t flags, +TranslationBlock *tb_gen_code (CPUState *cpu,vaddr pc, +uint64_t cs_base,uint32_t flags,int cflags);void page_init (void );void tb_htable_init (void );
@@ -55,7 +55,7 @@ void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb, uintptr_t host_pc);/* Return the current PC from CPU, which may be cached in TB. */ -static inline target_ulong log_pc (CPUState *cpu,const TranslationBlock *tb) +static inline vaddr log_pc (CPUState *cpu,const TranslationBlock *tb) {if (tb_cflags (tb) &CF_PCREL ) {return cpu->cc->get_pc (cpu);
accel/tcg/translate-all.c +5 -5
@@ -274,7 +274,7 @@ void page_init(void)* Return the size of the generated code, or negative on error. */ static int setjmp_gen_code (CPUArchState *env,TranslationBlock *tb, -target_ulong pc,void *host_pc, +vaddr pc,void *host_pc,int *max_insns,int64_t *ti) {int ret =sigsetjmp (tcg_ctx->jmp_trans,0 );
@@ -302,7 +302,7 @@ static int setjmp_gen_code(CPUArchState *env, TranslationBlock *tb,/* Called with mmap_lock held for user mode emulation. */ TranslationBlock *tb_gen_code (CPUState *cpu, -target_ulong pc,target_ulong cs_base, +vaddr pc,uint64_t cs_base,uint32_t flags,int cflags) {CPUArchState *env = cpu->env_ptr;
@@ -634,10 +634,10 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) cpu->cflags_next_tb =curr_cflags (cpu) |CF_MEMI_ONLY |CF_LAST_IO | n;if (qemu_loglevel_mask (CPU_LOG_EXEC )) { -target_ulong pc =log_pc (cpu, tb); +vaddr pc =log_pc (cpu, tb);if (qemu_log_in_addr_range (pc)) { -qemu_log ("cpu_io_recompile: rewound execution of TB to " - TARGET_FMT_lx"\n" , pc); +qemu_log ("cpu_io_recompile: rewound execution of TB to %" + VADDR_PRIx"\n" , pc); } }
Signature · 1 line
2.41.0
PATCH v3 3/12 target: Widen pc/cs_base in cpu_get_tb_cpu_state
In reply to Anton Johansson via--- accel/tcg/cpu-exec.c | 9 ++++++--- accel/tcg/translate-all.c | 3 ++- target/alpha/cpu.h | 4 ++-- target/arm/cpu.h | 4 ++-- target/arm/helper.c | 4 ++-- target/avr/cpu.h | 4 ++-- target/cris/cpu.h | 4 ++-- target/hexagon/cpu.h | 4 ++-- target/hppa/cpu.h | 5 ++--- target/i386/cpu.h | 4 ++-- target/loongarch/cpu.h | 6 ++---- target/m68k/cpu.h | 4 ++-- target/microblaze/cpu.h | 4 ++-- target/mips/cpu.h | 4 ++-- target/nios2/cpu.h | 4 ++-- target/openrisc/cpu.h | 5 ++--- target/ppc/cpu.h | 8 ++++---- target/ppc/helper_regs.c | 4 ++-- target/riscv/cpu.h | 4 ++-- target/riscv/cpu_helper.c | 4 ++-- target/rx/cpu.h | 4 ++-- target/s390x/cpu.h | 4 ++-- target/sh4/cpu.h | 4 ++-- target/sparc/cpu.h | 4 ++-- target/tricore/cpu.h | 4 ++-- target/xtensa/cpu.h | 4 ++-- 26 files changed, 58 insertions(+), 58 deletions(-)
accel/tcg/cpu-exec.c +6 -3
@@ -408,7 +408,8 @@ const void *HELPER(lookup_tb_ptr)(CPUArchState *env) {CPUState *cpu =env_cpu (env);TranslationBlock *tb; -target_ulong cs_base, pc; +vaddr pc; +uint64_t cs_base;uint32_t flags, cflags;cpu_get_tb_cpu_state (env, &pc, &cs_base, &flags);
@@ -529,7 +530,8 @@ void cpu_exec_step_atomic(CPUState *cpu) {CPUArchState *env = cpu->env_ptr;TranslationBlock *tb; -target_ulong cs_base, pc; +vaddr pc; +uint64_t cs_base;uint32_t flags, cflags;int tb_exit;
@@ -942,7 +944,8 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc)while (!cpu_handle_interrupt (cpu, &last_tb)) {TranslationBlock *tb; -target_ulong cs_base, pc; +vaddr pc; +uint64_t cs_base;uint32_t flags, cflags;cpu_get_tb_cpu_state (cpu->env_ptr, &pc, &cs_base, &flags);
accel/tcg/translate-all.c +2 -1
@@ -580,7 +580,8 @@ void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr)/* The exception probably happened in a helper. The CPU state should have been saved before calling it. Fetch the PC from there. */ CPUArchState *env = cpu->env_ptr; -target_ulong pc, cs_base; +vaddr pc; +uint64_t cs_base;tb_page_addr_t addr;uint32_t flags;
target/alpha/cpu.h +2 -2
@@ -462,8 +462,8 @@ void alpha_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, MemTxResult response, uintptr_t retaddr);#endif -static inline void cpu_get_tb_cpu_state (CPUAlphaState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *pflags) +static inline void cpu_get_tb_cpu_state (CPUAlphaState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *pflags) { *pc = env->pc; *cs_base =0 ;
target/arm/cpu.h +2 -2
@@ -3134,8 +3134,8 @@ static inline bool arm_cpu_bswap_data(CPUARMState *env) }#endif -void cpu_get_tb_cpu_state (CPUARMState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags); +void cpu_get_tb_cpu_state (CPUARMState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags);enum {QEMU_PSCI_CONDUIT_DISABLED =0 ,
target/arm/helper.c +2 -2
@@ -11847,8 +11847,8 @@ static bool mve_no_pred(CPUARMState *env)return true; } -void cpu_get_tb_cpu_state (CPUARMState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *pflags) +void cpu_get_tb_cpu_state (CPUARMState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *pflags) {CPUARMTBFlags flags;
target/avr/cpu.h +2 -2
@@ -190,8 +190,8 @@ enum { TB_FLAGS_SKIP = 2, }; -static inline void cpu_get_tb_cpu_state (CPUAVRState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *pflags) +static inline void cpu_get_tb_cpu_state (CPUAVRState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *pflags) {uint32_t flags =0 ;
target/cris/cpu.h +2 -2
@@ -266,8 +266,8 @@ static inline int cpu_mmu_index (CPUCRISState *env, bool ifetch)#include "exec/cpu-all.h" -static inline void cpu_get_tb_cpu_state (CPUCRISState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUCRISState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->pc; *cs_base =0 ;
target/hexagon/cpu.h +2 -2
@@ -153,8 +153,8 @@ struct ArchCPU { FIELD(TB_FLAGS, IS_TIGHT_LOOP, 0, 1) -static inline void cpu_get_tb_cpu_state (CPUHexagonState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUHexagonState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) {uint32_t hex_flags =0 ; *pc = env->gpr[HEX_REG_PC ];
target/hppa/cpu.h +2 -3
@@ -268,9 +268,8 @@ static inline target_ulong hppa_form_gva(CPUHPPAState *env, uint64_t spc,#define TB_FLAG_PRIV_SHIFT 8#define TB_FLAG_UNALIGN 0x400 -static inline void cpu_get_tb_cpu_state (CPUHPPAState *env,target_ulong *pc, -target_ulong *cs_base, -uint32_t *pflags) +static inline void cpu_get_tb_cpu_state (CPUHPPAState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *pflags) {uint32_t flags = env->psw_n *PSW_N ;
target/i386/cpu.h +2 -2
@@ -2275,8 +2275,8 @@ static inline int cpu_mmu_index_kernel(CPUX86State *env)#include "hw/i386/apic.h" #endif -static inline void cpu_get_tb_cpu_state (CPUX86State *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUX86State *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *cs_base = env->segs[R_CS ].base; *pc = *cs_base + env->eip;
target/loongarch/cpu.h +2 -4
@@ -427,10 +427,8 @@ static inline int cpu_mmu_index(CPULoongArchState *env, bool ifetch)#define HW_FLAGS_EUEN_FPE 0x04#define HW_FLAGS_EUEN_SXE 0x08 -static inline void cpu_get_tb_cpu_state (CPULoongArchState *env, -target_ulong *pc, -target_ulong *cs_base, -uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPULoongArchState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->pc; *cs_base =0 ;
target/m68k/cpu.h +2 -2
@@ -601,8 +601,8 @@ void m68k_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr,#define TB_FLAGS_TRACE 16#define TB_FLAGS_TRACE_BIT (1 << TB_FLAGS_TRACE) -static inline void cpu_get_tb_cpu_state (CPUM68KState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUM68KState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->pc; *cs_base =0 ;
target/microblaze/cpu.h +2 -2
@@ -401,8 +401,8 @@ void mb_tcg_init(void);/* Ensure there is no overlap between the two masks. */ QEMU_BUILD_BUG_ON (MSR_TB_MASK &IFLAGS_TB_MASK ); -static inline void cpu_get_tb_cpu_state (CPUMBState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUMBState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->pc; *flags = (env->iflags &IFLAGS_TB_MASK ) | (env->msr &MSR_TB_MASK );
target/mips/cpu.h +2 -2
@@ -1313,8 +1313,8 @@ void itc_reconfigure(struct MIPSITUState *tag);/* helper.c */ target_ulong exception_resume_pc (CPUMIPSState *env); -static inline void cpu_get_tb_cpu_state (CPUMIPSState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUMIPSState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->active_tc.PC; *cs_base =0 ;
target/nios2/cpu.h +2 -2
@@ -302,8 +302,8 @@ FIELD(TBFLAGS, CRS0, 0, 1) /* Set if CRS == 0. */ FIELD(TBFLAGS, U, 1, 1) /* Overlaps CR_STATUS_U */ FIELD(TBFLAGS, R0_0, 2, 1) /* Set if R0 == 0. */ -static inline void cpu_get_tb_cpu_state (CPUNios2State *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUNios2State *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) {unsigned crs =FIELD_EX32 (env->ctrl[CR_STATUS ],CR_STATUS ,CRS );
target/openrisc/cpu.h +2 -3
@@ -367,9 +367,8 @@ static inline void cpu_set_gpr(CPUOpenRISCState *env, int i, uint32_t val) env->shadow_gpr[0 ][i] = val; } -static inline void cpu_get_tb_cpu_state (CPUOpenRISCState *env, -target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUOpenRISCState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->pc; *cs_base =0 ;
target/ppc/cpu.h +4 -4
@@ -2498,11 +2498,11 @@ void cpu_write_xer(CPUPPCState *env, target_ulong xer);#define is_book3s_arch2x (ctx) (!!((ctx)->insns_flags & PPC_SEGMENT_64B))#ifdef CONFIG_DEBUG_TCG -void cpu_get_tb_cpu_state (CPUPPCState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags); +void cpu_get_tb_cpu_state (CPUPPCState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags);#else -static inline void cpu_get_tb_cpu_state (CPUPPCState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUPPCState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->nip; *cs_base =0 ;
target/ppc/helper_regs.c +2 -2
@@ -218,8 +218,8 @@ void hreg_update_pmu_hflags(CPUPPCState *env) }#ifdef CONFIG_DEBUG_TCG -void cpu_get_tb_cpu_state (CPUPPCState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +void cpu_get_tb_cpu_state (CPUPPCState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) {uint32_t hflags_current = env->hflags;uint32_t hflags_rebuilt;
target/riscv/cpu.h +2 -2
@@ -587,8 +587,8 @@ static inline uint32_t vext_get_vlmax(RISCVCPU *cpu, target_ulong vtype)return cpu->cfg.vlen >> (sew +3 - lmul); } -void cpu_get_tb_cpu_state (CPURISCVState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *pflags); +void cpu_get_tb_cpu_state (CPURISCVState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *pflags);void riscv_cpu_update_mask (CPURISCVState *env);
target/riscv/cpu_helper.c +2 -2
@@ -61,8 +61,8 @@ int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch)#endif } -void cpu_get_tb_cpu_state (CPURISCVState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *pflags) +void cpu_get_tb_cpu_state (CPURISCVState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *pflags) {CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs);
target/rx/cpu.h +2 -2
@@ -143,8 +143,8 @@ void rx_cpu_unpack_psw(CPURXState *env, uint32_t psw, int rte);#define RX_CPU_IRQ 0#define RX_CPU_FIR 1 -static inline void cpu_get_tb_cpu_state (CPURXState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPURXState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->pc; *cs_base =0 ;
target/s390x/cpu.h +2 -2
@@ -378,8 +378,8 @@ static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)#endif } -static inline void cpu_get_tb_cpu_state (CPUS390XState * env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUS390XState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) {if (env->psw.addr &1 ) {/*
target/sh4/cpu.h +2 -2
@@ -368,8 +368,8 @@ static inline void cpu_write_sr(CPUSH4State *env, target_ulong sr) env->sr = sr & ~((1u <<SR_M ) | (1u <<SR_Q ) | (1u <<SR_T )); } -static inline void cpu_get_tb_cpu_state (CPUSH4State *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUSH4State *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->pc;/* For a gUSA region, notice the end of the region. */
target/sparc/cpu.h +2 -2
@@ -762,8 +762,8 @@ trap_state* cpu_tsptr(CPUSPARCState* env);#define TB_FLAG_HYPER (1 << 7)#define TB_FLAG_ASI_SHIFT 24 -static inline void cpu_get_tb_cpu_state (CPUSPARCState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *pflags) +static inline void cpu_get_tb_cpu_state (CPUSPARCState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *pflags) {uint32_t flags; *pc = env->pc;
target/tricore/cpu.h +2 -2
@@ -380,8 +380,8 @@ static inline int cpu_mmu_index(CPUTriCoreState *env, bool ifetch)void cpu_state_reset (CPUTriCoreState *s);void tricore_tcg_init (void ); -static inline void cpu_get_tb_cpu_state (CPUTriCoreState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUTriCoreState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->PC; *cs_base =0 ;
target/xtensa/cpu.h +2 -2
@@ -727,8 +727,8 @@ static inline int cpu_mmu_index(CPUXtensaState *env, bool ifetch)#include "exec/cpu-all.h" -static inline void cpu_get_tb_cpu_state (CPUXtensaState *env,target_ulong *pc, -target_ulong *cs_base,uint32_t *flags) +static inline void cpu_get_tb_cpu_state (CPUXtensaState *env,vaddr *pc, +uint64_t *cs_base,uint32_t *flags) { *pc = env->pc; *cs_base =0 ;
Signature · 1 line
2.41.0
PATCH v3 4/12 accel/tcg/cputlb.c: Widen CPUTLBEntry access functions
In reply to Anton Johansson via--- accel/tcg/cputlb.c | 8 ++++---- include/exec/cpu_ldst.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-)
accel/tcg/cputlb.c +4 -4
@@ -1453,7 +1453,7 @@ static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index,assert_cpu_is_self (env_cpu (env));for (vidx =0 ; vidx <CPU_VTLB_SIZE ; ++vidx) {CPUTLBEntry *vtlb = &env_tlb (env)->d[mmu_idx].vtable[vidx]; -target_ulong cmp =tlb_read_idx (vtlb, access_type); +uint64_t cmp =tlb_read_idx (vtlb, access_type);if (cmp == page) {/* Found entry in victim tlb, swap tlb and iotlb. */
@@ -1507,7 +1507,7 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr, {uintptr_t index =tlb_index (env, mmu_idx, addr);CPUTLBEntry *entry =tlb_entry (env, mmu_idx, addr); -target_ulong tlb_addr =tlb_read_idx (entry, access_type); +uint64_t tlb_addr =tlb_read_idx (entry, access_type);target_ulong page_addr = addr &TARGET_PAGE_MASK ;int flags =TLB_FLAGS_MASK ;
@@ -1694,7 +1694,7 @@ bool tlb_plugin_lookup(CPUState *cpu, vaddr addr, int mmu_idx,CPUArchState *env = cpu->env_ptr;CPUTLBEntry *tlbe =tlb_entry (env, mmu_idx, addr);uintptr_t index =tlb_index (env, mmu_idx, addr); -vaddr tlb_addr = is_store ?tlb_addr_write (tlbe) : tlbe->addr_read; +uint64_t tlb_addr = is_store ?tlb_addr_write (tlbe) : tlbe->addr_read;if (likely (tlb_hit (tlb_addr, addr))) {/* We must have an iotlb entry for MMIO */
@@ -1759,7 +1759,7 @@ static bool mmu_lookup1(CPUArchState *env, MMULookupPageData *data,target_ulong addr = data->addr;uintptr_t index =tlb_index (env, mmu_idx, addr);CPUTLBEntry *entry =tlb_entry (env, mmu_idx, addr); -target_ulong tlb_addr =tlb_read_idx (entry, access_type); +uint64_t tlb_addr =tlb_read_idx (entry, access_type);bool maybe_resized = false;/* If the TLB entry is for a different page, reload and try again. */
include/exec/cpu_ldst.h +5 -5
@@ -328,8 +328,8 @@ static inline void clear_helper_retaddr(void)#include "tcg/oversized-guest.h" -static inline target_ulong tlb_read_idx (const CPUTLBEntry *entry, -MMUAccessType access_type) +static inline uint64_t tlb_read_idx (const CPUTLBEntry *entry, +MMUAccessType access_type) {/* Do not rearrange the CPUTLBEntry structure members. */ QEMU_BUILD_BUG_ON(offsetof(CPUTLBEntry, addr_read) !=
@@ -355,14 +355,14 @@ static inline target_ulong tlb_read_idx(const CPUTLBEntry *entry,#endif } -static inline target_ulong tlb_addr_write (const CPUTLBEntry *entry) +static inline uint64_t tlb_addr_write (const CPUTLBEntry *entry) {return tlb_read_idx (entry,MMU_DATA_STORE ); }/* Find the TLB index corresponding to the mmu_idx + address pair. */ static inline uintptr_t tlb_index (CPUArchState *env,uintptr_t mmu_idx, -target_ulong addr) +vaddr addr) {uintptr_t size_mask =env_tlb (env)->f[mmu_idx].mask >>CPU_TLB_ENTRY_BITS ;
@@ -371,7 +371,7 @@ static inline uintptr_t tlb_index(CPUArchState *env, uintptr_t mmu_idx,/* Find the TLB entry corresponding to the mmu_idx + address pair. */ static inline CPUTLBEntry *tlb_entry (CPUArchState *env,uintptr_t mmu_idx, -target_ulong addr) +vaddr addr) {return &env_tlb (env)->f[mmu_idx].table[tlb_index (env, mmu_idx, addr)]; }
Signature · 1 line
2.41.0
PATCH v3 5/12 accel/tcg/cputlb.c: Widen addr in MMULookupPageData
In reply to Anton Johansson viaFunctions accessing MMULookupPageData are also updated.
--- accel/tcg/cputlb.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
accel/tcg/cputlb.c +15 -15
@@ -1729,7 +1729,7 @@ bool tlb_plugin_lookup(CPUState *cpu, vaddr addr, int mmu_idx,typedef struct MMULookupPageData {CPUTLBEntryFull *full;void *haddr; -target_ulong addr; +vaddr addr;int flags;int size; }MMULookupPageData ;
@@ -1756,7 +1756,7 @@ typedef struct MMULookupLocals {static bool mmu_lookup1 (CPUArchState *env,MMULookupPageData *data,int mmu_idx,MMUAccessType access_type,uintptr_t ra) { -target_ulong addr = data->addr; +vaddr addr = data->addr;uintptr_t index =tlb_index (env, mmu_idx, addr);CPUTLBEntry *entry =tlb_entry (env, mmu_idx, addr);uint64_t tlb_addr =tlb_read_idx (entry, access_type);
@@ -1796,7 +1796,7 @@ static void mmu_watch_or_dirty(CPUArchState *env, MMULookupPageData *data, MMUAccessType access_type, uintptr_t ra) {CPUTLBEntryFull *full = data->full; -target_ulong addr = data->addr; +vaddr addr = data->addr;int flags = data->flags;int size = data->size;
@@ -1827,7 +1827,7 @@ static void mmu_watch_or_dirty(CPUArchState *env, MMULookupPageData *data,* Resolve the translation for the page(s) beginning at @addr, for MemOp.size * bytes. Return true if the lookup crosses a page boundary. */ -static bool mmu_lookup (CPUArchState *env,target_ulong addr,MemOpIdx oi, +static bool mmu_lookup (CPUArchState *env,vaddr addr,MemOpIdx oi,uintptr_t ra,MMUAccessType type,MMULookupLocals *l) {unsigned a_bits;
@@ -2024,7 +2024,7 @@ static uint64_t do_ld_mmio_beN(CPUArchState *env, MMULookupPageData *p, MMUAccessType type, uintptr_t ra) {CPUTLBEntryFull *full = p->full; -target_ulong addr = p->addr; +vaddr addr = p->addr;int i, size = p->size;QEMU_IOTHREAD_LOCK_GUARD ();
@@ -2333,7 +2333,7 @@ static uint64_t do_ld_8(CPUArchState *env, MMULookupPageData *p, int mmu_idx,return ret; } -static uint8_t do_ld1_mmu (CPUArchState *env,target_ulong addr,MemOpIdx oi, +static uint8_t do_ld1_mmu (CPUArchState *env,vaddr addr,MemOpIdx oi,uintptr_t ra,MMUAccessType access_type) {MMULookupLocals l;
@@ -2352,7 +2352,7 @@ tcg_target_ulong helper_ldub_mmu(CPUArchState *env, uint64_t addr,return do_ld1_mmu (env, addr, oi, retaddr,MMU_DATA_LOAD ); } -static uint16_t do_ld2_mmu (CPUArchState *env,target_ulong addr,MemOpIdx oi, +static uint16_t do_ld2_mmu (CPUArchState *env,vaddr addr,MemOpIdx oi,uintptr_t ra,MMUAccessType access_type) {MMULookupLocals l;
@@ -2383,7 +2383,7 @@ tcg_target_ulong helper_lduw_mmu(CPUArchState *env, uint64_t addr,return do_ld2_mmu (env, addr, oi, retaddr,MMU_DATA_LOAD ); } -static uint32_t do_ld4_mmu (CPUArchState *env,target_ulong addr,MemOpIdx oi, +static uint32_t do_ld4_mmu (CPUArchState *env,vaddr addr,MemOpIdx oi,uintptr_t ra,MMUAccessType access_type) {MMULookupLocals l;
@@ -2410,7 +2410,7 @@ tcg_target_ulong helper_ldul_mmu(CPUArchState *env, uint64_t addr,return do_ld4_mmu (env, addr, oi, retaddr,MMU_DATA_LOAD ); } -static uint64_t do_ld8_mmu (CPUArchState *env,target_ulong addr,MemOpIdx oi, +static uint64_t do_ld8_mmu (CPUArchState *env,vaddr addr,MemOpIdx oi,uintptr_t ra,MMUAccessType access_type) {MMULookupLocals l;
@@ -2460,7 +2460,7 @@ tcg_target_ulong helper_ldsl_mmu(CPUArchState *env, uint64_t addr,return (int32_t )helper_ldul_mmu (env, addr, oi, retaddr); } -static Int128 do_ld16_mmu (CPUArchState *env,target_ulong addr, +static Int128 do_ld16_mmu (CPUArchState *env,vaddr addr,MemOpIdx oi,uintptr_t ra) {MMULookupLocals l;
@@ -2617,7 +2617,7 @@ static uint64_t do_st_mmio_leN(CPUArchState *env, MMULookupPageData *p, uint64_t val_le, int mmu_idx, uintptr_t ra) { CPUTLBEntryFull *full = p->full; -target_ulong addr = p->addr; +vaddr addr = p->addr;int i, size = p->size;QEMU_IOTHREAD_LOCK_GUARD ();
@@ -2808,7 +2808,7 @@ void helper_stb_mmu(CPUArchState *env, uint64_t addr, uint32_t val,do_st_1 (env, &l.page[0 ], val, l.mmu_idx, ra); } -static void do_st2_mmu (CPUArchState *env,target_ulong addr,uint16_t val, +static void do_st2_mmu (CPUArchState *env,vaddr addr,uint16_t val,MemOpIdx oi,uintptr_t ra) {MMULookupLocals l;
@@ -2837,7 +2837,7 @@ void helper_stw_mmu(CPUArchState *env, uint64_t addr, uint32_t val,do_st2_mmu (env, addr, val, oi, retaddr); } -static void do_st4_mmu (CPUArchState *env,target_ulong addr,uint32_t val, +static void do_st4_mmu (CPUArchState *env,vaddr addr,uint32_t val,MemOpIdx oi,uintptr_t ra) {MMULookupLocals l;
@@ -2864,7 +2864,7 @@ void helper_stl_mmu(CPUArchState *env, uint64_t addr, uint32_t val,do_st4_mmu (env, addr, val, oi, retaddr); } -static void do_st8_mmu (CPUArchState *env,target_ulong addr,uint64_t val, +static void do_st8_mmu (CPUArchState *env,vaddr addr,uint64_t val,MemOpIdx oi,uintptr_t ra) {MMULookupLocals l;
@@ -2891,7 +2891,7 @@ void helper_stq_mmu(CPUArchState *env, uint64_t addr, uint64_t val,do_st8_mmu (env, addr, val, oi, retaddr); } -static void do_st16_mmu (CPUArchState *env,target_ulong addr,Int128 val, +static void do_st16_mmu (CPUArchState *env,vaddr addr,Int128 val,MemOpIdx oi,uintptr_t ra) {MMULookupLocals l;
Signature · 1 line
2.41.0
PATCH v3 6/12 accel/tcg/cpu-exec.c: Widen pc to vaddr
In reply to Anton Johansson via--- accel/tcg/cpu-exec.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
accel/tcg/cpu-exec.c +17 -17
@@ -169,8 +169,8 @@ uint32_t curr_cflags(CPUState *cpu) }struct tb_desc { -target_ulong pc; -target_ulong cs_base; +vaddr pc; +uint64_t cs_base;CPUArchState *env;tb_page_addr_t page_addr0;uint32_t flags;
@@ -193,7 +193,7 @@ static bool tb_lookup_cmp(const void *p, const void *d)return true; }else {tb_page_addr_t phys_page1; -target_ulong virt_page1; +vaddr virt_page1;/* * We know that the first page matched, and an otherwise valid TB
@@ -214,8 +214,8 @@ static bool tb_lookup_cmp(const void *p, const void *d)return false; } -static TranslationBlock *tb_htable_lookup (CPUState *cpu,target_ulong pc, -target_ulong cs_base,uint32_t flags, +static TranslationBlock *tb_htable_lookup (CPUState *cpu,vaddr pc, +uint64_t cs_base,uint32_t flags,uint32_t cflags) {tb_page_addr_t phys_pc;
@@ -238,9 +238,9 @@ static TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc, }/* Might cause an exception, so have a longjmp destination ready */ -static inline TranslationBlock *tb_lookup (CPUState *cpu,target_ulong pc, -target_ulong cs_base, -uint32_t flags,uint32_t cflags) +static inline TranslationBlock *tb_lookup (CPUState *cpu,vaddr pc, +uint64_t cs_base,uint32_t flags, +uint32_t cflags) {TranslationBlock *tb;CPUJumpCache *jc;
@@ -292,13 +292,13 @@ static inline TranslationBlock *tb_lookup(CPUState *cpu, target_ulong pc,return tb; } -static void log_cpu_exec (target_ulong pc,CPUState *cpu, +static void log_cpu_exec (vaddr pc,CPUState *cpu,const TranslationBlock *tb) {if (qemu_log_in_addr_range (pc)) {qemu_log_mask (CPU_LOG_EXEC ,"Trace %d: %p [%08" PRIx64 -"/" TARGET_FMT_lx"/%08x/%08x] %s\n" , +"/%" VADDR_PRIx"/%08x/%08x] %s\n" , cpu->cpu_index, tb->tc.ptr, tb->cs_base, pc, tb->flags, tb->cflags,lookup_symbol (pc));
@@ -323,7 +323,7 @@ static void log_cpu_exec(target_ulong pc, CPUState *cpu, } } -static bool check_for_breakpoints_slow (CPUState *cpu,target_ulong pc, +static bool check_for_breakpoints_slow (CPUState *cpu,vaddr pc,uint32_t *cflags) {CPUBreakpoint *bp;
@@ -389,7 +389,7 @@ static bool check_for_breakpoints_slow(CPUState *cpu, target_ulong pc,return false; } -static inline bool check_for_breakpoints (CPUState *cpu,target_ulong pc, +static inline bool check_for_breakpoints (CPUState *cpu,vaddr pc,uint32_t *cflags) { return unlikely(!QTAILQ_EMPTY(&cpu->breakpoints)) &&
@@ -485,10 +485,10 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit) cc->set_pc (cpu, last_tb->pc); }if (qemu_loglevel_mask (CPU_LOG_EXEC )) { -target_ulong pc =log_pc (cpu, last_tb); +vaddr pc =log_pc (cpu, last_tb);if (qemu_log_in_addr_range (pc)) { -qemu_log ("Stopped execution of TB chain before %p [" - TARGET_FMT_lx"] %s\n" , +qemu_log ("Stopped execution of TB chain before %p [%" + VADDR_PRIx"] %s\n" , last_tb->tc.ptr, pc,lookup_symbol (pc)); } }
@@ -882,8 +882,8 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, }static inline void cpu_loop_exec_tb (CPUState *cpu,TranslationBlock *tb, -target_ulong pc, -TranslationBlock **last_tb,int *tb_exit) +vaddr pc,TranslationBlock **last_tb, +int *tb_exit) {int32_t insns_left;
Signature · 1 line
2.41.0
PATCH v3 7/12 accel/tcg: Widen pc to vaddr in CPUJumpCache
In reply to Anton Johansson viaRelated functions dealing with the jump cache are also updated.
--- accel/tcg/cputlb.c | 2 +- accel/tcg/tb-hash.h | 12 ++++++------ accel/tcg/tb-jmp-cache.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
accel/tcg/cputlb.c +1 -1
@@ -99,7 +99,7 @@ static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns, desc->window_max_entries = max_entries; } -static void tb_jmp_cache_clear_page (CPUState *cpu,target_ulong page_addr) +static void tb_jmp_cache_clear_page (CPUState *cpu,vaddr page_addr) {CPUJumpCache *jc = cpu->tb_jmp_cache;int i, i0;
accel/tcg/tb-hash.h +6 -6
@@ -35,16 +35,16 @@#define TB_JMP_ADDR_MASK (TB_JMP_PAGE_SIZE - 1)#define TB_JMP_PAGE_MASK (TB_JMP_CACHE_SIZE - TB_JMP_PAGE_SIZE) -static inline unsigned int tb_jmp_cache_hash_page (target_ulong pc) +static inline unsigned int tb_jmp_cache_hash_page (vaddr pc) { -target_ulong tmp; +vaddr tmp; tmp = pc ^ (pc >> (TARGET_PAGE_BITS -TB_JMP_PAGE_BITS ));return (tmp >> (TARGET_PAGE_BITS -TB_JMP_PAGE_BITS )) &TB_JMP_PAGE_MASK ; } -static inline unsigned int tb_jmp_cache_hash_func (target_ulong pc) +static inline unsigned int tb_jmp_cache_hash_func (vaddr pc) { -target_ulong tmp; +vaddr tmp; tmp = pc ^ (pc >> (TARGET_PAGE_BITS -TB_JMP_PAGE_BITS ));return (((tmp >> (TARGET_PAGE_BITS -TB_JMP_PAGE_BITS )) &TB_JMP_PAGE_MASK ) | (tmp &TB_JMP_ADDR_MASK ));
@@ -53,7 +53,7 @@ static inline unsigned int tb_jmp_cache_hash_func(target_ulong pc)#else /* In user-mode we can get better hashing because we do not have a TLB */ -static inline unsigned int tb_jmp_cache_hash_func (target_ulong pc) +static inline unsigned int tb_jmp_cache_hash_func (vaddr pc) {return (pc ^ (pc >>TB_JMP_CACHE_BITS )) & (TB_JMP_CACHE_SIZE -1 ); }
@@ -61,7 +61,7 @@ static inline unsigned int tb_jmp_cache_hash_func(target_ulong pc)#endif /* CONFIG_SOFTMMU */ static inline -uint32_t tb_hash_func (tb_page_addr_t phys_pc,target_ulong pc, +uint32_t tb_hash_func (tb_page_addr_t phys_pc,vaddr pc,uint32_t flags,uint64_t flags2,uint32_t cf_mask) {return qemu_xxhash8 (phys_pc, pc, flags2, flags, cf_mask);
accel/tcg/tb-jmp-cache.h +1 -1
@@ -21,7 +21,7 @@ struct CPUJumpCache {struct rcu_head rcu;struct {TranslationBlock *tb; -target_ulong pc; +vaddr pc; } array[TB_JMP_CACHE_SIZE ]; };
Signature · 1 line
2.41.0
PATCH v3 8/12 accel: Replace target_ulong with vaddr in probe_*()
In reply to Anton Johansson viaFunctions for probing memory accesses (and functions that call these) are updated to take a vaddr for guest virtual addresses over target_ulong.
--- accel/stubs/tcg-stub.c | 4 ++-- accel/tcg/cputlb.c | 12 ++++++------ accel/tcg/user-exec.c | 8 ++++---- include/exec/exec-all.h | 14 +++++++------- 4 files changed, 19 insertions(+), 19 deletions(-)
accel/stubs/tcg-stub.c +2 -2
@@ -26,14 +26,14 @@ void tcg_flush_jmp_cache(CPUState *cpu) { } -int probe_access_flags (CPUArchState *env,target_ulong addr,int size, +int probe_access_flags (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,bool nonfault,void **phost,uintptr_t retaddr) {g_assert_not_reached (); } -void *probe_access (CPUArchState *env,target_ulong addr,int size, +void *probe_access (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,uintptr_t retaddr) {/* Handled by hardware accelerator. */
accel/tcg/cputlb.c +6 -6
@@ -1499,7 +1499,7 @@ static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size, } } -static int probe_access_internal(CPUArchState *env, target_ulong addr, +static int probe_access_internal(CPUArchState *env, vaddr addr, int fault_size, MMUAccessType access_type, int mmu_idx, bool nonfault, void **phost, CPUTLBEntryFull **pfull,
@@ -1508,7 +1508,7 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr,uintptr_t index =tlb_index (env, mmu_idx, addr);CPUTLBEntry *entry =tlb_entry (env, mmu_idx, addr);uint64_t tlb_addr =tlb_read_idx (entry, access_type); -target_ulong page_addr = addr &TARGET_PAGE_MASK ; +vaddr page_addr = addr &TARGET_PAGE_MASK ;int flags =TLB_FLAGS_MASK ;if (!tlb_hit_page (tlb_addr, page_addr)) {
@@ -1551,7 +1551,7 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr,return flags; } -int probe_access_full (CPUArchState *env,target_ulong addr,int size, +int probe_access_full (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,bool nonfault,void **phost,CPUTLBEntryFull **pfull,uintptr_t retaddr)
@@ -1568,7 +1568,7 @@ int probe_access_full(CPUArchState *env, target_ulong addr, int size,return flags; } -int probe_access_flags (CPUArchState *env,target_ulong addr,int size, +int probe_access_flags (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,bool nonfault,void **phost,uintptr_t retaddr) {
@@ -1589,7 +1589,7 @@ int probe_access_flags(CPUArchState *env, target_ulong addr, int size,return flags; } -void *probe_access (CPUArchState *env,target_ulong addr,int size, +void *probe_access (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,uintptr_t retaddr) {CPUTLBEntryFull *full;
@@ -1648,7 +1648,7 @@ void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr,* NOTE: This function will trigger an exception if the page is * not executable. */ -tb_page_addr_t get_page_addr_code_hostp (CPUArchState *env,target_ulong addr, +tb_page_addr_t get_page_addr_code_hostp (CPUArchState *env,vaddr addr,void **hostp) {CPUTLBEntryFull *full;
accel/tcg/user-exec.c +4 -4
@@ -721,7 +721,7 @@ int page_unprotect(target_ulong address, uintptr_t pc)return current_tb_invalidated ?2 :1 ; } -static int probe_access_internal (CPUArchState *env,target_ulong addr, +static int probe_access_internal (CPUArchState *env,vaddr addr,int fault_size,MMUAccessType access_type,bool nonfault,uintptr_t ra) {
@@ -759,7 +759,7 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr,cpu_loop_exit_sigsegv (env_cpu (env), addr, access_type, maperr, ra); } -int probe_access_flags (CPUArchState *env,target_ulong addr,int size, +int probe_access_flags (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,bool nonfault,void **phost,uintptr_t ra) {
@@ -771,7 +771,7 @@ int probe_access_flags(CPUArchState *env, target_ulong addr, int size,return flags; } -void *probe_access (CPUArchState *env,target_ulong addr,int size, +void *probe_access (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,uintptr_t ra) {int flags;
@@ -783,7 +783,7 @@ void *probe_access(CPUArchState *env, target_ulong addr, int size,return size ?g2h (env_cpu (env), addr) :NULL ; } -tb_page_addr_t get_page_addr_code_hostp (CPUArchState *env,target_ulong addr, +tb_page_addr_t get_page_addr_code_hostp (CPUArchState *env,vaddr addr,void **hostp) {int flags;
include/exec/exec-all.h +7 -7
@@ -413,16 +413,16 @@ static inline void tlb_flush_range_by_mmuidx_all_cpus_synced(CPUState *cpu,* Finally, return the host address for a page that is backed by RAM, * or NULL if the page requires I/O. */ -void *probe_access (CPUArchState *env,target_ulong addr,int size, +void *probe_access (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,uintptr_t retaddr); -static inline void *probe_write (CPUArchState *env,target_ulong addr,int size, +static inline void *probe_write (CPUArchState *env,vaddr addr,int size,int mmu_idx,uintptr_t retaddr) {return probe_access (env, addr, size,MMU_DATA_STORE , mmu_idx, retaddr); } -static inline void *probe_read (CPUArchState *env,target_ulong addr,int size, +static inline void *probe_read (CPUArchState *env,vaddr addr,int size,int mmu_idx,uintptr_t retaddr) {return probe_access (env, addr, size,MMU_DATA_LOAD , mmu_idx, retaddr);
@@ -447,7 +447,7 @@ static inline void *probe_read(CPUArchState *env, target_ulong addr, int size,* Do handle clean pages, so exclude TLB_NOTDIRY from the returned flags. * For simplicity, all "mmio-like" flags are folded to TLB_MMIO. */ -int probe_access_flags (CPUArchState *env,target_ulong addr,int size, +int probe_access_flags (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,bool nonfault,void **phost,uintptr_t retaddr);
@@ -460,7 +460,7 @@ int probe_access_flags(CPUArchState *env, target_ulong addr, int size,* and must be consumed or copied immediately, before any further * access or changes to TLB @mmu_idx. */ -int probe_access_full (CPUArchState *env,target_ulong addr,int size, +int probe_access_full (CPUArchState *env,vaddr addr,int size,MMUAccessType access_type,int mmu_idx,bool nonfault,void **phost,CPUTLBEntryFull **pfull,uintptr_t retaddr);
@@ -581,7 +581,7 @@ struct MemoryRegionSection *iotlb_to_section(CPUState *cpu,* * Note: this function can trigger an exception. */ -tb_page_addr_t get_page_addr_code_hostp (CPUArchState *env,target_ulong addr, +tb_page_addr_t get_page_addr_code_hostp (CPUArchState *env,vaddr addr,void **hostp);/**
@@ -596,7 +596,7 @@ tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, target_ulong addr,* Note: this function can trigger an exception. */ static inline tb_page_addr_t get_page_addr_code (CPUArchState *env, -target_ulong addr) +vaddr addr) {return get_page_addr_code_hostp (env, addr,NULL ); }
Signature · 1 line
2.41.0
PATCH v3 9/12 accel/tcg: Replace target_ulong with vaddr in *_mmu_lookup()
In reply to Anton Johansson viaUpdate atomic_mmu_lookup() and cpu_mmu_lookup() to take the guest virtual address as a vaddr instead of a target_ulong.
--- accel/tcg/cputlb.c | 6 +++--- accel/tcg/user-exec.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
accel/tcg/cputlb.c +3 -3
@@ -1898,15 +1898,15 @@ static bool mmu_lookup(CPUArchState *env, vaddr addr, MemOpIdx oi,* Probe for an atomic operation. Do not allow unaligned operations, * or io operations to proceed. Return the host address. */ -static void *atomic_mmu_lookup (CPUArchState *env,target_ulong addr, -MemOpIdx oi,int size,uintptr_t retaddr) +static void *atomic_mmu_lookup (CPUArchState *env,vaddr addr,MemOpIdx oi, +int size,uintptr_t retaddr) {uintptr_t mmu_idx =get_mmuidx (oi);MemOp mop =get_memop (oi);int a_bits =get_alignment_bits (mop);uintptr_t index;CPUTLBEntry *tlbe; -target_ulong tlb_addr; +vaddr tlb_addr;void *hostaddr;CPUTLBEntryFull *full;
accel/tcg/user-exec.c +3 -3
@@ -889,7 +889,7 @@ void page_reset_target_data(target_ulong start, target_ulong last) { }/* The softmmu versions of these helpers are in cputlb.c. */ -static void *cpu_mmu_lookup (CPUArchState *env,abi_ptr addr, +static void *cpu_mmu_lookup (CPUArchState *env,vaddr addr,MemOp mop,uintptr_t ra,MMUAccessType type) {int a_bits =get_alignment_bits (mop);
@@ -1324,8 +1324,8 @@ uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr,/* * Do not allow unaligned operations to proceed. Return the host address. */ -static void *atomic_mmu_lookup (CPUArchState *env,target_ulong addr, -MemOpIdx oi,int size,uintptr_t retaddr) +static void *atomic_mmu_lookup (CPUArchState *env,vaddr addr,MemOpIdx oi, +int size,uintptr_t retaddr) {MemOp mop =get_memop (oi);int a_bits =get_alignment_bits (mop);
Signature · 1 line
2.41.0
PATCH v3 10/12 accel/tcg: Replace target_ulong with vaddr in translator_*()
In reply to Anton Johansson viaUse vaddr for guest virtual address in translator_use_goto_tb() and translator_loop().
--- accel/tcg/translator.c | 10 +++++----- include/exec/translator.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-)
accel/tcg/translator.c +5 -5
@@ -117,7 +117,7 @@ static void gen_tb_end(const TranslationBlock *tb, uint32_t cflags, } } -bool translator_use_goto_tb (DisasContextBase *db,target_ulong dest) +bool translator_use_goto_tb (DisasContextBase *db,vaddr dest) {/* Suppress goto_tb if requested. */ if (tb_cflags (db->tb) &CF_NO_GOTO_TB ) {
@@ -129,8 +129,8 @@ bool translator_use_goto_tb(DisasContextBase *db, target_ulong dest) }void translator_loop (CPUState *cpu,TranslationBlock *tb,int *max_insns, -target_ulong pc,void *host_pc, -const TranslatorOps *ops,DisasContextBase *db) +vaddr pc,void *host_pc,const TranslatorOps *ops, +DisasContextBase *db) {uint32_t cflags =tb_cflags (tb);TCGOp *icount_start_insn;
@@ -235,10 +235,10 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns, }static void *translator_access (CPUArchState *env,DisasContextBase *db, -target_ulong pc,size_t len) +vaddr pc,size_t len) {void *host; -target_ulong base, end; +vaddr base, end;TranslationBlock *tb; tb = db->tb;
include/exec/translator.h +3 -3
@@ -142,8 +142,8 @@ typedef struct TranslatorOps {* - When too many instructions have been translated. */ void translator_loop (CPUState *cpu,TranslationBlock *tb,int *max_insns, -target_ulong pc,void *host_pc, -const TranslatorOps *ops,DisasContextBase *db); +vaddr pc,void *host_pc,const TranslatorOps *ops, +DisasContextBase *db);/** * translator_use_goto_tb
@@ -153,7 +153,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,* Return true if goto_tb is allowed between the current TB * and the destination PC. */ -bool translator_use_goto_tb (DisasContextBase *db,target_ulong dest); +bool translator_use_goto_tb (DisasContextBase *db,vaddr dest);/** * translator_io_start
Signature · 1 line
2.41.0
PATCH v3 11/12 accel/tcg: Replace target_ulong with vaddr in page_*()
In reply to Anton Johansson viaUse vaddr for guest virtual addresses for functions dealing with page flags.
--- accel/tcg/user-exec.c | 44 +++++++++++++++++------------------- include/exec/cpu-all.h | 10 ++++---- include/exec/translate-all.h | 2 +- 3 files changed, 27 insertions(+), 29 deletions(-)
accel/tcg/user-exec.c +21 -23
@@ -144,7 +144,7 @@ typedef struct PageFlagsNode {static IntervalTreeRoot pageflags_root; -static PageFlagsNode *pageflags_find (target_ulong start,target_long last) +static PageFlagsNode *pageflags_find (vaddr start,vaddr last) {IntervalTreeNode *n;
@@ -152,8 +152,7 @@ static PageFlagsNode *pageflags_find(target_ulong start, target_long last)return n ?container_of (n, PageFlagsNode, itree) :NULL ; } -static PageFlagsNode *pageflags_next (PageFlagsNode *p,target_ulong start, -target_long last) +static PageFlagsNode *pageflags_next (PageFlagsNode *p,vaddr start,vaddr last) {IntervalTreeNode *n;
@@ -205,7 +204,7 @@ void page_dump(FILE *f)walk_memory_regions (f, dump_region); } -int page_get_flags (target_ulong address) +int page_get_flags (vaddr address) {PageFlagsNode *p =pageflags_find (address, address);
@@ -228,7 +227,7 @@ int page_get_flags(target_ulong address) }/* A subroutine of page_set_flags: insert a new node for [start,last]. */ -static void pageflags_create (target_ulong start,target_ulong last,int flags) +static void pageflags_create (vaddr start,vaddr last,int flags) {PageFlagsNode *p =g_new (PageFlagsNode,1 );
@@ -239,13 +238,13 @@ static void pageflags_create(target_ulong start, target_ulong last, int flags) }/* A subroutine of page_set_flags: remove everything in [start,last]. */ -static bool pageflags_unset (target_ulong start,target_ulong last) +static bool pageflags_unset (vaddr start,vaddr last) {bool inval_tb = false;while (true) {PageFlagsNode *p =pageflags_find (start, last); -target_ulong p_last; +vaddr p_last;if (!p) {break ;
@@ -284,8 +283,7 @@ static bool pageflags_unset(target_ulong start, target_ulong last)* A subroutine of page_set_flags: nothing overlaps [start,last], * but check adjacent mappings and maybe merge into a single range. */ -static void pageflags_create_merge (target_ulong start,target_ulong last, -int flags) +static void pageflags_create_merge (vaddr start,vaddr last,int flags) {PageFlagsNode *next =NULL , *prev =NULL ;
@@ -336,11 +334,11 @@ static void pageflags_create_merge(target_ulong start, target_ulong last,#define PAGE_STICKY (PAGE_ANON | PAGE_PASSTHROUGH | PAGE_TARGET_STICKY)/* A subroutine of page_set_flags: add flags to [start,last]. */ -static bool pageflags_set_clear (target_ulong start,target_ulong last, +static bool pageflags_set_clear (vaddr start,vaddr last,int set_flags,int clear_flags) {PageFlagsNode *p; -target_ulong p_start, p_last; +vaddr p_start, p_last;int p_flags, merge_flags;bool inval_tb = false;
@@ -480,7 +478,7 @@ static bool pageflags_set_clear(target_ulong start, target_ulong last,* The flag PAGE_WRITE_ORG is positioned automatically depending * on PAGE_WRITE. The mmap_lock should already be held. */ -void page_set_flags (target_ulong start,target_ulong last,int flags) +void page_set_flags (vaddr start,vaddr last,int flags) {bool reset = false;bool inval_tb = false;
@@ -520,9 +518,9 @@ void page_set_flags(target_ulong start, target_ulong last, int flags) } } -int page_check_range (target_ulong start,target_ulong len,int flags) +int page_check_range (vaddr start,vaddr len,int flags) { -target_ulong last; +vaddr last;int locked;/* tri-state: =0: unlocked, +1: global, -1: local */ int ret;
@@ -601,7 +599,7 @@ int page_check_range(target_ulong start, target_ulong len, int flags)void page_protect (tb_page_addr_t address) {PageFlagsNode *p; -target_ulong start, last; +vaddr start, last;int prot;assert_memory_lock ();
@@ -642,7 +640,7 @@ void page_protect(tb_page_addr_t address)* immediately exited. (We can only return 2 if the 'pc' argument is * non-zero.) */ -int page_unprotect (target_ulong address,uintptr_t pc) +int page_unprotect (vaddr address,uintptr_t pc) {PageFlagsNode *p;bool current_tb_invalidated;
@@ -676,7 +674,7 @@ int page_unprotect(target_ulong address, uintptr_t pc) }#endif }else { -target_ulong start, len, i; +vaddr start, len, i;int prot;if (qemu_host_page_size <=TARGET_PAGE_SIZE ) {
@@ -691,7 +689,7 @@ int page_unprotect(target_ulong address, uintptr_t pc) prot =0 ;for (i =0 ; i < len; i +=TARGET_PAGE_SIZE ) { -target_ulong addr = start + i; +vaddr addr = start + i; p =pageflags_find (addr, addr);if (p) {
@@ -814,7 +812,7 @@ typedef struct TargetPageDataNode {static IntervalTreeRoot targetdata_root; -void page_reset_target_data (target_ulong start,target_ulong last) +void page_reset_target_data (vaddr start,vaddr last) {IntervalTreeNode *n, *next;
@@ -828,7 +826,7 @@ void page_reset_target_data(target_ulong start, target_ulong last) n !=NULL ; n = next, next = next ? interval_tree_iter_next(n, start, last) : NULL) { -target_ulong n_start, n_last, p_ofs, p_len; +vaddr n_start, n_last, p_ofs, p_len;TargetPageDataNode *t =container_of (n, TargetPageDataNode, itree);if (n->start >= start && n->last <= last) {
@@ -851,11 +849,11 @@ void page_reset_target_data(target_ulong start, target_ulong last) } } -void *page_get_target_data (target_ulong address) +void *page_get_target_data (vaddr address) {IntervalTreeNode *n;TargetPageDataNode *t; -target_ulong page, region; +vaddr page, region; page = address &TARGET_PAGE_MASK ; region = address &TBD_MASK ;
@@ -884,7 +882,7 @@ void *page_get_target_data(target_ulong address) return t->data[(page - region) >> TARGET_PAGE_BITS]; }#else -void page_reset_target_data (target_ulong start,target_ulong last) { } +void page_reset_target_data (vaddr start,vaddr last) { }#endif /* TARGET_PAGE_DATA_SIZE */ /* The softmmu versions of these helpers are in cputlb.c. */
include/exec/cpu-all.h +5 -5
@@ -219,10 +219,10 @@ typedef int (*walk_memory_regions_fn)(void *, target_ulong, target_ulong, unsigned long);int walk_memory_regions (void *,walk_memory_regions_fn ); -int page_get_flags (target_ulong address); -void page_set_flags (target_ulong start,target_ulong last,int flags); -void page_reset_target_data (target_ulong start,target_ulong last); -int page_check_range (target_ulong start,target_ulong len,int flags); +int page_get_flags (vaddr address); +void page_set_flags (vaddr start,vaddr last,int flags); +void page_reset_target_data (vaddr start,vaddr last); +int page_check_range (vaddr start,vaddr len,int flags);/** * page_get_target_data(address)
@@ -235,7 +235,7 @@ int page_check_range(target_ulong start, target_ulong len, int flags);* The memory will be freed when the guest page is deallocated, * e.g. with the munmap system call. */ -void *page_get_target_data (target_ulong address) +void *page_get_target_data (vaddr address) __attribute__((returns_nonnull));#endif
include/exec/translate-all.h +1 -1
@@ -28,7 +28,7 @@ void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr);#ifdef CONFIG_USER_ONLY void page_protect (tb_page_addr_t page_addr); -int page_unprotect (target_ulong address,uintptr_t pc); +int page_unprotect (vaddr address,uintptr_t pc);#endif #endif /* TRANSLATE_ALL_H */
Signature · 1 line
2.41.0
Re: [PATCH v3 11/12] accel/tcg: Replace target_ulong with vaddr in page_*()
Quoted 10 lines · Anton Johansson via
Use vaddr for guest virtual addresses for functions dealing with page flags.
Signed-off-by Anton Johansson <[email protected]>Reviewed-by Richard Henderson <[email protected]>--- accel/tcg/user-exec.c | 44 +++++++++++++++++------------------- include/exec/cpu-all.h | 10 ++++---- include/exec/translate-all.h | 2 +- 3 files changed, 27 insertions(+), 29 deletions(-)
This causes other failures, such as
https://gitlab.com/rth7680/qemu/-/jobs/4540151776#L4468
qemu-hppa: ../accel/tcg/user-exec.c:490: page_set_flags: Assertion `last <= GUEST_ADDR_MAX' failed.
which is caused by
#8 0x00005555556e5b77 in do_shmat (cpu_env=cpu_env@entry=0x555556274378,
shmid=54, shmaddr=<optimized out>, shmflg=0)
at ../src/linux-user/syscall.c:4598
4598 page_set_flags(raddr, raddr + shm_info.shm_segsz - 1,
4599 PAGE_VALID | PAGE_RESET | PAGE_READ |
4600 (shmflg & SHM_RDONLY ? 0 : PAGE_WRITE));
The host shm_info.shm_segsz is uint64_t, which means that the whole expression gets converted to uint64_t. With this patch, it is not properly truncated to a guest address.
In this particular case, raddr is signed (abi_long), which is a mistake. Fixing that avoids this particular error.
But since user-only is outside of the scope of this work, I'm going to drop this patch for now.
r~
Re: [PATCH v3 11/12] accel/tcg: Replace target_ulong with vaddr in page_*()
Quoted 28 lines · Richard Henderson
Quoted 10 lines · Anton Johansson via
Use vaddr for guest virtual addresses for functions dealing with page flags.
Signed-off-by Anton Johansson <[email protected]>Reviewed-by Richard Henderson <[email protected]>---
accel/tcg/user-exec.c | 44 +++++++++++++++++------------------- include/exec/cpu-all.h | 10 ++++----include/exec/translate-all.h| 2 +-3 files changed, 27 insertions(+), 29 deletions(-)This causes other failures, such as
https://gitlab.com/rth7680/qemu/-/jobs/4540151776#L4468
qemu-hppa:
../accel/tcg/user-exec.c:490:page_set_flags: Assertion `last <=GUEST_ADDR_MAX' failed.which is caused by
#8
0x00005555556e5b77indo_shmat(cpu_env=cpu_env@entry=0x555556274378, shmid=54, shmaddr=<optimized out>, shmflg=0)
at../src/linux-user/syscall.c:45984598 page_set_flags(raddr, raddr + shm_info.shm_segsz - 1, 4599
PAGE_VALID|PAGE_RESET|PAGE_READ| 4600 (shmflg &SHM_RDONLY? 0 :PAGE_WRITE));
Quoted 8 lines
The host shm_info.shm_segsz is
uint64_t, which means that the whole expression gets converted to uint64_t. With this patch, it is not properly truncated to a guest address.In this particular case, raddr is signed (
abi_long), which is a mistake. Fixing that avoids this particular error.But since user-only is outside of the scope of this work, I'm going to drop this patch for now.
r~
My bad! I saw the CI failure post-rebase but didn't look closely enough, I saw a build-user failure in the branch I was based on and assumed they were related.
Thanks for the explanation, makes sense!:)
Signature · 2 lines
Anton Johansson, rev.ng Labs Srl.
PATCH v3 12/12 cpu: Replace target_ulong with hwaddr in tb_invalidate_phys_addr()
In reply to Anton Johansson via--- cpu.c | 2 +- include/exec/exec-all.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
cpu.c +1 -1
@@ -293,7 +293,7 @@ void list_cpus(void) }#if defined(CONFIG_USER_ONLY ) -void tb_invalidate_phys_addr (target_ulong addr) +void tb_invalidate_phys_addr (hwaddr addr) {mmap_lock ();tb_invalidate_phys_page (addr);
include/exec/exec-all.h +1 -1
@@ -526,7 +526,7 @@ uint32_t curr_cflags(CPUState *cpu);/* TranslationBlock invalidate API */ #if defined(CONFIG_USER_ONLY ) -void tb_invalidate_phys_addr (target_ulong addr); +void tb_invalidate_phys_addr (hwaddr addr);#else void tb_invalidate_phys_addr (AddressSpace *as,hwaddr addr,MemTxAttrs attrs);#endif
Signature · 1 line
2.41.0
Richard Henderson
AppliedQuoted 114 lines · Anton Johansson
This is a first patchset in removing
target_ulongfrom non-target/ directories. As use oftarget_ulongis spread accross the codebase we are attempting to target as few maintainers as possible with each patchset in order to ease reviewing.The following instances of
target_ulongremain in accel/ and tcg/
- atomic helpers (atomic_common.c.inc), cpu_atomic_*() (atomic_template.h,) and cpu_[st|ld]*() (cputlb.c/ldst_common.c.inc) are only used in target/ and can be pulled out into a separate target-specific file;-
walk_memory_regions()is used inuser-exec.candlinux-user/elfload.c;-
kvm_find_sw_breakpoint()inkvm-all.cused in target/;Changes in v2:
- addr argument intb_invalidate_phys_addr()changed from vaddr to hwaddr;- Removed previous patch:
"[PATCH 4/8] accel/tcg: Replace
target_ulongwith vaddr in helper_unaligned_*()"as these functions are removed by Richard's patches;
- First patch:
"[PATCH 1/8] accel: Replace
target_ulongwithvaddrin TB/TLB"has been split into patches 1-7 to ease reviewing;
- Pulled in target/ changes to
cpu_get_tb_cpu_state()into this patchset. This was done to avoid pointer casts totarget_ulong* which would break for 32-bit targets on a 64-bit BE host;Note the small target/ changes are collected in a single patch to not break bisection. If it's still desirable to split based on maintainer, let me know;
-
lastargument of pageflags_[find|next] changed fromtarget_longto vaddr. This change was left out of the last patchset due to triggering a "Bad ram pointer" error (softmmu/physmem.c:2273) when running make check for a i386-softmmu target.I was not able to recreate this on master or post rebase on Richard's tcg-once branch.
Changes in v3:
- Rebased on masterFinally, the grand goal is to allow for heterogeneous QEMU binaries consisting of multiple frontends.
RFC: https://lists.nongnu.org/archive/html/qemu-devel/2022-12/msg04518.html
Anton Johansson (12):
accel: Replacetarget_ulongin tlb_*()accel/tcg/translate-all.c: Widen pc andcs_base
target: Widen pc/cs_base incpu_get_tb_cpu_stateaccel/tcg/cputlb.c: Widen CPUTLBEntry access functionsaccel/tcg/cputlb.c: Widen addr in MMULookupPageDataaccel/tcg/cpu-exec.c: Widen pc to vaddr
accel/tcg: Widen pc to vaddr in CPUJumpCache
accel: Replacetarget_ulongwith vaddr in probe_*() accel/tcg: Replacetarget_ulongwith vaddr in*_mmu_lookup()accel/tcg: Replacetarget_ulongwith vaddr in translator_*() accel/tcg: Replacetarget_ulongwith vaddr in page_*()
cpu: Replacetarget_ulongwith hwaddr intb_invalidate_phys_addr()accel/stubs/tcg-stub.c | 6 +- accel/tcg/cpu-exec.c | 43 ++++--- accel/tcg/cputlb.c | 233 +++++++++++++++++------------------ accel/tcg/internal.h | 6 +- accel/tcg/tb-hash.h | 12 +- accel/tcg/tb-jmp-cache.h | 2 +- accel/tcg/tb-maint.c | 2 +- accel/tcg/translate-all.c | 13 +- accel/tcg/translator.c | 10 +- accel/tcg/user-exec.c | 58 +++++---- cpu.c | 2 +- include/exec/cpu-all.h | 10 +- include/exec/cpu-defs.h | 4 +- include/exec/cpu_ldst.h | 10 +- include/exec/exec-all.h | 95 +++++++------- include/exec/translate-all.h | 2 +- include/exec/translator.h | 6 +- include/qemu/plugin-memory.h | 2 +- target/alpha/cpu.h | 4 +- target/arm/cpu.h | 4 +- target/arm/helper.c | 4 +- target/avr/cpu.h | 4 +- target/cris/cpu.h | 4 +- target/hexagon/cpu.h | 4 +- target/hppa/cpu.h | 5 +- target/i386/cpu.h | 4 +- target/loongarch/cpu.h | 6 +- target/m68k/cpu.h | 4 +- target/microblaze/cpu.h | 4 +- target/mips/cpu.h | 4 +- target/nios2/cpu.h | 4 +- target/openrisc/cpu.h | 5 +- target/ppc/cpu.h | 8 +- target/ppc/helper_regs.c | 4 +- target/riscv/cpu.h | 4 +- target/riscv/cpu_helper.c | 4 +- target/rx/cpu.h | 4 +- target/s390x/cpu.h | 4 +- target/sh4/cpu.h | 4 +- target/sparc/cpu.h | 4 +- target/tricore/cpu.h | 4 +- target/xtensa/cpu.h | 4 +- 42 files changed, 307 insertions(+), 313 deletions(-)
Quoted 2 lines
--
2.41.0
Queued to tcg-next, thanks.
r~