[23/24] accel/tcg: Restrict icount to system emulation

Commit Message

Philippe Mathieu-Daudé April 28, 2024, 10:14 p.m. UTC

So far we don't support icount on user emulation.

Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
---
 accel/tcg/cpu-exec.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Richard Henderson April 29, 2024, 9:07 p.m. UTC | #1

On 4/28/24 15:14, Philippe Mathieu-Daudé wrote:
> So far we don't support icount on user emulation.
> 
> Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
> ---
>   accel/tcg/cpu-exec.c | 6 ++++++
>   1 file changed, 6 insertions(+)


Reviewed-by: Richard Henderson <[e-mail]>


r~

Patch

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 84fd041aec..1f618f6c2e 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -780,6 +780,9 @@  static inline bool cpu_handle_exception(CPUState *cpu, int *ret)
 
 static inline bool icount_exit_request(CPUState *cpu)
 {
+#if defined(CONFIG_USER_ONLY)
+    return false;
+#else
     if (!icount_enabled()) {
         return false;
     }
@@ -787,6 +790,7 @@  static inline bool icount_exit_request(CPUState *cpu)
         return false;
     }
     return cpu->neg.icount_decr.u16.low + cpu->icount_extra == 0;
+#endif
 }
 
 static inline bool cpu_handle_interrupt(CPUState *cpu,
@@ -801,12 +805,14 @@  static inline bool cpu_handle_interrupt(CPUState *cpu,
         return false;
     }
 
+#if !defined(CONFIG_USER_ONLY)
     /* Clear the interrupt flag now since we're processing
      * cpu->interrupt_request and cpu->exit_request.
      * Ensure zeroing happens before reading cpu->exit_request or
      * cpu->interrupt_request (see also smp_wmb in cpu_exit())
      */
     qatomic_set_mb(&cpu->neg.icount_decr.u16.high, 0);
+#endif /* !CONFIG_USER_ONLY */
 
     if (unlikely(qatomic_read(&cpu->interrupt_request))) {
         int interrupt_request;