accel/tcg: Make probe_access() a generic TCG helper
v2 cover accel/tcg: Make probe_access() a generic TCG helper
probe_access() is not ARM specific and can be reused by other targets, so make it a generic helper (after widening its address argument to 64-bits).
Philippe Mathieu-Daudé (2):
target/arm: Widen probe_access()'s address argument to 64-bits accel/tcg: Make probe_access() a generic TCG helper
accel/tcg/tcg-runtime.h | 2 ++ target/arm/helper.h | 2 -- accel/tcg/tcg-runtime.c | 16 ++++++++++++++++ target/arm/tcg/op_helper.c | 16 ---------------- 4 files changed, 18 insertions(+), 18 deletions(-)
Signature · 1 line
2.38.1
PATCH v2 1/2 target/arm: Widen probe_access()'s address argument to 64-bits
Make probe_access() agnostic to the address size of the guest, using a uint64_t type since usage varies between guests.
Since we don't access any CPUARMState particular env field, use the generic CPUArchState type insted.
--- target/arm/helper.h | 2 +- target/arm/tcg/op_helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
target/arm/helper.h +1 -1
@@ -101,7 +101,7 @@ DEF_HELPER_FLAGS_1(rebuild_hflags_a32_newel, TCG_CALL_NO_RWG, void, env) DEF_HELPER_FLAGS_2(rebuild_hflags_a32, TCG_CALL_NO_RWG, void, env, int) DEF_HELPER_FLAGS_2(rebuild_hflags_a64, TCG_CALL_NO_RWG, void, env, int) -DEF_HELPER_FLAGS_5(probe_access, TCG_CALL_NO_WG, void, env, tl, i32, i32, i32) +DEF_HELPER_FLAGS_5(probe_access, TCG_CALL_NO_WG, void, env, i64, i32, i32, i32) DEF_HELPER_1(vfp_get_fpscr, i32, env)DEF_HELPER_2 (vfp_set_fpscr, void, env, i32)
target/arm/tcg/op_helper.c +1 -1
@@ -1009,7 +1009,7 @@ uint32_t HELPER(ror_cc)(CPUARMState *env, uint32_t x, uint32_t i) } } -void HELPER (probe_access )(CPUARMState *env,target_ulong ptr, +void HELPER (probe_access )(CPUArchState *env,uint64_t ptr,uint32_t access_type,uint32_t mmu_idx,uint32_t size) {
Signature · 1 line
2.38.1
PATCH v2 2/2 accel/tcg: Make probe_access() a generic TCG helper
In reply to Philippe Mathieu-Daudéprobe_access() is not ARM specific and can be reused by other targets.
--- accel/tcg/tcg-runtime.h | 2 ++ target/arm/helper.h | 2 -- accel/tcg/tcg-runtime.c | 16 ++++++++++++++++ target/arm/tcg/op_helper.c | 16 ---------------- 4 files changed, 18 insertions(+), 18 deletions(-)
accel/tcg/tcg-runtime.h +2 -0
@@ -28,6 +28,8 @@ DEF_HELPER_FLAGS_1(lookup_tb_ptr, TCG_CALL_NO_WG_SE, cptr, env) DEF_HELPER_FLAGS_1(exit_atomic, TCG_CALL_NO_WG, noreturn, env) +DEF_HELPER_FLAGS_5(probe_access, TCG_CALL_NO_WG, void, env, i64, i32, i32, i32) +#ifndef IN_HELPER_PROTO /* * Pass calls to memset directly to libc, without a thunk in qemu.
target/arm/helper.h +0 -2
@@ -101,8 +101,6 @@ DEF_HELPER_FLAGS_1(rebuild_hflags_a32_newel, TCG_CALL_NO_RWG, void, env) DEF_HELPER_FLAGS_2(rebuild_hflags_a32, TCG_CALL_NO_RWG, void, env, int) DEF_HELPER_FLAGS_2(rebuild_hflags_a64, TCG_CALL_NO_RWG, void, env, int) -DEF_HELPER_FLAGS_5(probe_access, TCG_CALL_NO_WG, void, env, i64, i32, i32, i32) - DEF_HELPER_1(vfp_get_fpscr, i32, env)DEF_HELPER_2 (vfp_set_fpscr, void, env, i32)
accel/tcg/tcg-runtime.c +16 -0
@@ -152,3 +152,19 @@ void HELPER(exit_atomic)(CPUArchState *env) {cpu_loop_exit_atomic (env_cpu (env),GETPC ()); } + +void HELPER (probe_access )(CPUArchState *env,uint64_t ptr, +uint32_t access_type,uint32_t mmu_idx, +uint32_t size) +{ +uint32_t in_page = -((uint32_t )ptr |TARGET_PAGE_SIZE ); +uintptr_t ra =GETPC (); + +if (likely (size <= in_page)) { +probe_access (env, ptr, size, access_type, mmu_idx, ra); + }else { +probe_access (env, ptr, in_page, access_type, mmu_idx, ra); +probe_access (env, ptr + in_page, size - in_page, + access_type, mmu_idx, ra); + } +}
target/arm/tcg/op_helper.c +0 -16
@@ -1009,22 +1009,6 @@ uint32_t HELPER(ror_cc)(CPUARMState *env, uint32_t x, uint32_t i) } } -void HELPER (probe_access )(CPUArchState *env,uint64_t ptr, -uint32_t access_type,uint32_t mmu_idx, -uint32_t size) -{ -uint32_t in_page = -((uint32_t )ptr |TARGET_PAGE_SIZE ); -uintptr_t ra =GETPC (); - -if (likely (size <= in_page)) { -probe_access (env, ptr, size, access_type, mmu_idx, ra); - }else { -probe_access (env, ptr, in_page, access_type, mmu_idx, ra); -probe_access (env, ptr + in_page, size - in_page, - access_type, mmu_idx, ra); - } -} -/* * This function corresponds to AArch64.vESBOperation(). * Note that the AArch32 version is not functionally different.
Signature · 1 line
2.38.1
Quoted 6 lines · Philippe Mathieu-Daudé
accel/tcg/tcg-runtime.c +6
-0+ +void HELPER (probe_access )(CPUArchState *env,uint64_t ptr, +uint32_t access_type,uint32_t mmu_idx, +uint32_t size) +{ +uint32_t in_page = -((uint32_t )ptr |TARGET_PAGE_SIZE );
accel/tcg/tcg-runtime.c void HELPER(exit_atomic)(CPUArchState *env) · line 170
Quoted 10 lines
accel/tcg/tcg-runtime.c +10
-0+uintptr_t ra =GETPC (); + +if (likely (size <= in_page)) { +probe_access (env, ptr, size, access_type, mmu_idx, ra); + }else { +probe_access (env, ptr, in_page, access_type, mmu_idx, ra); +probe_access (env, ptr + in_page, size - in_page, + access_type, mmu_idx, ra); + } +}
This works if and only if size is <= TARGET_PAGE_SIZE. This should probably have been documented for Arm, but should definitely be documented for its new location.
It looks like this could be used for
hexagon: HELPER(probe_noshuf_load) s390x/tcg/mem_helper.c:void HELPER(probe_write_access)
Although s390x is written to handle much larger SIZE, the maximum that it will ever issue is 16 * 16 = 256 for op_vstm. But it also handles target-specific address wrap at the end of the address space, which the above does not.
So perhaps it's not worth moving this after all?
r~