Re: [PATCH v4 22/28] target/arm: Restrict watchpoint code to system emulation

[Richard Henderson]

On 3/3/21 1:47 PM, Philippe Mathieu-Daudé wrote:
diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c
index 844db08bd57..ed3f22d78a5 100644
--- a/target/arm/sve_helper.c
+++ b/target/arm/sve_helper.c
@@ -4849,6 +4849,7 @@ void sve_ldnfff1_r(CPUARMState *env, void *vg, const 
target_ulong addr,
                  /* Some page is MMIO, see below. */
                  goto do_fault;
              }
+#ifndef CONFIG_USER_ONLY
              if (unlikely(flags & TLB_WATCHPOINT) &&
                  (cpu_watchpoint_address_matches
                   (env_cpu(env), addr + mem_off, 1 << msz)
@@ -4856,6 +4857,7 @@ void sve_ldnfff1_r(CPUARMState *env, void *vg, const 
target_ulong addr,
                  /* Watchpoint hit, see below. */
                  goto do_fault;
              }
+#endif
  

Nack.  These are eliminated via TLB_WATCHPOINT 0 in exec/cpu-all.h, and an 
empty inline function in hw/core/cpu.h.


r~