We no longer need to test for BP_CPU, or clear watchpoint_hit.
Signed-off-by: Richard Henderson <[email protected]>
---
target/s390x/tcg/debug.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/target/s390x/tcg/debug.c b/target/s390x/tcg/debug.c
index 58d9cc6e79..ef0d953e01 100644
--- a/target/s390x/tcg/debug.c
+++ b/target/s390x/tcg/debug.c
@@ -52,9 +52,9 @@ void s390_cpu_recompute_watchpoints(CPUState *cs)
void s390x_cpu_debug_excp_handler(CPUState *cs, CPUBreakpoint *hit)
{
CPUS390XState *env = cpu_env(cs);
- CPUBreakpoint *wp_hit = cs->watchpoint_hit;
- if (wp_hit && wp_hit->flags & BP_CPU) {
+ if (hit->flags & BP_MEM_ACCESS) {
+ /* watchpoint */
/*
* FIXME: When the storage-alteration-space control bit is set,
* the exception should only be triggered if the memory access
@@ -62,7 +62,6 @@ void s390x_cpu_debug_excp_handler(CPUState *cs, CPUBreakpoint
*hit)
* 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);
--
2.43.0
