From: Philippe Mathieu-Daudé <[email protected]> By inverting the 'tcg_enabled()' check in s390_cpu_set_psw() we can let the compiler elide the s390_cpu_recompute_watchpoints() call when TCG is not available. Move this function -- along with s390x_cpu_debug_excp_handler() which was introduced in the same commit 311918b979c ("target-s390x: PER storage-alteration event support") -- to a TCG specific file to avoid compiling dead code on KVM. This restricts the WatchPoint API calls to TCG.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Thomas Huth <[email protected]> Message-ID: <[email protected]> Signed-off-by: Thomas Huth <[email protected]> --- target/s390x/s390x-internal.h | 2 - target/s390x/tcg/tcg_s390x.h | 5 ++ target/s390x/cpu.c | 30 ++++++------ target/s390x/helper.c | 38 --------------- target/s390x/tcg/debug.c | 85 ++++++++++++++++++++++++++++++++++ target/s390x/tcg/excp_helper.c | 32 ------------- target/s390x/tcg/meson.build | 3 ++ 7 files changed, 108 insertions(+), 87 deletions(-) create mode 100644 target/s390x/tcg/debug.c diff --git a/target/s390x/s390x-internal.h b/target/s390x/s390x-internal.h index 9691366ec91..a4b54dc441c 100644 --- a/target/s390x/s390x-internal.h +++ b/target/s390x/s390x-internal.h @@ -259,7 +259,6 @@ ObjectClass *s390_cpu_class_by_name(const char *name); /* excp_helper.c */ -void s390x_cpu_debug_excp_handler(CPUState *cs); void s390_cpu_do_interrupt(CPUState *cpu); bool s390_cpu_exec_interrupt(CPUState *cpu, int int_req); @@ -317,7 +316,6 @@ void s390_cpu_gdb_init(CPUState *cs); void s390_cpu_dump_state(CPUState *cpu, FILE *f, int flags); void do_restart_interrupt(CPUS390XState *env); #ifndef CONFIG_USER_ONLY -void s390_cpu_recompute_watchpoints(CPUState *cs); void s390x_tod_timer(void *opaque); void s390x_cpu_timer(void *opaque); void s390_handle_wait(S390CPU *cpu); diff --git a/target/s390x/tcg/tcg_s390x.h b/target/s390x/tcg/tcg_s390x.h index 78558912f99..7c8aede80d2 100644 --- a/target/s390x/tcg/tcg_s390x.h +++ b/target/s390x/tcg/tcg_s390x.h @@ -21,4 +21,9 @@ G_NORETURN void tcg_s390_data_exception(CPUS390XState *env, uint32_t dxc, G_NORETURN void tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc, uintptr_t ra); +#ifndef CONFIG_USER_ONLY +void s390_cpu_recompute_watchpoints(CPUState *cs); +void s390x_cpu_debug_excp_handler(CPUState *cs); +#endif + #endif /* TCG_S390X_H */ diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 6af7446fd9f..cd472d38be7 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -40,6 +40,7 @@ #include "system/reset.h" #endif #include "hw/s390x/cpu-topology.h" +#include "tcg/tcg_s390x.h" #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; @@ -74,26 +75,25 @@ void s390_cpu_set_psw(CPUS390XState *env, uint64_t mask, uint64_t addr) env->psw.mask = mask; /* KVM will handle all WAITs and trigger a WAIT exit on disabled_wait */ - if (!tcg_enabled()) { - return; - } - env->cc_op = (mask >> 44) & 3; + if (tcg_enabled()) { + env->cc_op = (mask >> 44) & 3; #ifndef CONFIG_USER_ONLY - if (is_early_exception_psw(mask, addr)) { - env->int_pgm_ilen = 0; - trigger_pgm_exception(env, PGM_SPECIFICATION); - return; - } + if (is_early_exception_psw(mask, addr)) { + env->int_pgm_ilen = 0; + trigger_pgm_exception(env, PGM_SPECIFICATION); + return; + } - if ((old_mask ^ mask) & PSW_MASK_PER) { - s390_cpu_recompute_watchpoints(env_cpu(env)); - } + if ((old_mask ^ mask) & PSW_MASK_PER) { + s390_cpu_recompute_watchpoints(env_cpu(env)); + } - if (mask & PSW_MASK_WAIT) { - s390_handle_wait(env_archcpu(env)); - } + if (mask & PSW_MASK_WAIT) { + s390_handle_wait(env_archcpu(env)); + } #endif + } } uint64_t s390_cpu_get_psw_mask(CPUS390XState *env) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 184428c6d9d..8d1e03f6768 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -143,41 +143,3 @@ void do_restart_interrupt(CPUS390XState *env) s390_cpu_set_psw(env, mask, addr); } - -void s390_cpu_recompute_watchpoints(CPUState *cs) -{ - const int wp_flags = BP_CPU | BP_MEM_WRITE | BP_STOP_BEFORE_ACCESS; - CPUS390XState *env = cpu_env(cs); - - /* We are called when the watchpoints have changed. First - remove them all. */ - cpu_watchpoint_remove_all(cs, BP_CPU); - - /* Return if PER is not enabled */ - if (!(env->psw.mask & PSW_MASK_PER)) { - return; - } - - /* Return if storage-alteration event is not enabled. */ - if (!(env->cregs[9] & PER_CR9_EVENT_STORE)) { - return; - } - - if (env->cregs[10] == 0 && env->cregs[11] == -1LL) { - /* We can't create a watchoint spanning the whole memory range, so - split it in two parts. */ - cpu_watchpoint_insert(cs, 0, 1ULL << 63, wp_flags, NULL); - cpu_watchpoint_insert(cs, 1ULL << 63, 1ULL << 63, wp_flags, NULL); - } else if (env->cregs[10] > env->cregs[11]) { - /* The address range loops, create two watchpoints. */ - cpu_watchpoint_insert(cs, env->cregs[10], -env->cregs[10], - wp_flags, NULL); - cpu_watchpoint_insert(cs, 0, env->cregs[11] + 1, wp_flags, NULL); - - } else { - /* Default case, create a single watchpoint. */ - cpu_watchpoint_insert(cs, env->cregs[10], - env->cregs[11] - env->cregs[10] + 1, - wp_flags, NULL); - } -} diff --git a/target/s390x/tcg/debug.c b/target/s390x/tcg/debug.c new file mode 100644 index 00000000000..50d2853d443 --- /dev/null +++ b/target/s390x/tcg/debug.c @@ -0,0 +1,85 @@ +/* + * QEMU S/390 debug routines + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "exec/breakpoint.h" +#include "exec/watchpoint.h" +#include "target/s390x/cpu.h" +#include "target/s390x/s390x-internal.h" +#include "tcg_s390x.h" + +void s390_cpu_recompute_watchpoints(CPUState *cs) +{ + const int wp_flags = BP_CPU | BP_MEM_WRITE | BP_STOP_BEFORE_ACCESS; + CPUS390XState *env = cpu_env(cs); + + /* We are called when the watchpoints have changed. First + remove them all. */ + cpu_watchpoint_remove_all(cs, BP_CPU); + + /* Return if PER is not enabled */ + if (!(env->psw.mask & PSW_MASK_PER)) { + return; + } + + /* Return if storage-alteration event is not enabled. */ + if (!(env->cregs[9] & PER_CR9_EVENT_STORE)) { + return; + } + + if (env->cregs[10] == 0 && env->cregs[11] == -1LL) { + /* We can't create a watchoint spanning the whole memory range, so + split it in two parts. */ + cpu_watchpoint_insert(cs, 0, 1ULL << 63, wp_flags, NULL); + cpu_watchpoint_insert(cs, 1ULL << 63, 1ULL << 63, wp_flags, NULL); + } else if (env->cregs[10] > env->cregs[11]) { + /* The address range loops, create two watchpoints. */ + cpu_watchpoint_insert(cs, env->cregs[10], -env->cregs[10], + wp_flags, NULL); + cpu_watchpoint_insert(cs, 0, env->cregs[11] + 1, wp_flags, NULL); + + } else { + /* Default case, create a single watchpoint. */ + cpu_watchpoint_insert(cs, env->cregs[10], + env->cregs[11] - env->cregs[10] + 1, + wp_flags, NULL); + } +} + +void s390x_cpu_debug_excp_handler(CPUState *cs) +{ + CPUS390XState *env = cpu_env(cs); + CPUWatchpoint *wp_hit = cs->watchpoint_hit; + + if (wp_hit && wp_hit->flags & BP_CPU) { + /* + * FIXME: When the storage-alteration-space control bit is set, + * the exception should only be triggered if the memory access + * is done using an address space with the storage-alteration-event + * bit set. We have no way to detect that with the current + * watchpoint code. + */ + cs->watchpoint_hit = NULL; + + env->per_address = env->psw.addr; + env->per_perc_atmid |= PER_CODE_EVENT_STORE | get_per_atmid(env); + /* + * FIXME: We currently no way to detect the address space used + * to trigger the watchpoint. For now just consider it is the + * current default ASC. This turn to be true except when MVCP + * and MVCS instructions are not used. + */ + env->per_perc_atmid |= env->psw.mask & (PSW_MASK_ASC) >> 46; + + /* + * Remove all watchpoints to re-execute the code. A PER exception + * will be triggered, it will call s390_cpu_set_psw which will + * recompute the watchpoints. + */ + cpu_watchpoint_remove_all(cs, BP_CPU); + cpu_loop_exit_noexc(cs); + } +} diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index d4a096f5998..019eb4fba1f 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -24,7 +24,6 @@ #include "exec/helper-proto.h" #include "exec/cputlb.h" #include "exec/target_page.h" -#include "exec/watchpoint.h" #include "s390x-internal.h" #include "tcg_s390x.h" #ifndef CONFIG_USER_ONLY @@ -607,37 +606,6 @@ bool s390_cpu_exec_interrupt(CPUState *cs, int interrupt_request) return false; } -void s390x_cpu_debug_excp_handler(CPUState *cs) -{ - CPUS390XState *env = cpu_env(cs); - CPUWatchpoint *wp_hit = cs->watchpoint_hit; - - if (wp_hit && wp_hit->flags & BP_CPU) { - /* FIXME: When the storage-alteration-space control bit is set, - the exception should only be triggered if the memory access - is done using an address space with the storage-alteration-event - bit set. We have no way to detect that with the current - watchpoint code. */ - cs->watchpoint_hit = NULL; - - env->per_address = env->psw.addr; - env->per_perc_atmid |= PER_CODE_EVENT_STORE | get_per_atmid(env); - /* FIXME: We currently no way to detect the address space used - to trigger the watchpoint. For now just consider it is the - current default ASC. This turn to be true except when MVCP - and MVCS instrutions are not used. */ - env->per_perc_atmid |= env->psw.mask & (PSW_MASK_ASC) >> 46; - - /* - * Remove all watchpoints to re-execute the code. A PER exception - * will be triggered, it will call s390_cpu_set_psw which will - * recompute the watchpoints. - */ - cpu_watchpoint_remove_all(cs, BP_CPU); - cpu_loop_exit_noexc(cs); - } -} - void s390x_cpu_do_unaligned_access(CPUState *cs, vaddr addr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index ee4e8fec77c..515cb8b473d 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -12,3 +12,6 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'vec_int_helper.c', 'vec_string_helper.c', )) +s390x_system_ss.add(when: 'CONFIG_TCG', if_true: files( + 'debug.c', +)) -- 2.52.0
