[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/16] accel/tcg: Check for USER_ONLY definition instead of SOFTMM
From: |
Richard Henderson |
Subject: |
[PULL 09/16] accel/tcg: Check for USER_ONLY definition instead of SOFTMMU one |
Date: |
Tue, 20 Jun 2023 10:26:04 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Since we *might* have user emulation with softmmu,
replace the system emulation check by !user emulation one.
Invert some if() ladders for clarity.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230613133347.82210-7-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/internal.h | 6 +++---
accel/tcg/cpu-exec.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h
index 24f225cac7..65380ccb42 100644
--- a/accel/tcg/internal.h
+++ b/accel/tcg/internal.h
@@ -17,10 +17,10 @@
* memory related structures are protected with mmap_lock.
* In !user-mode we use per-page locks.
*/
-#ifdef CONFIG_SOFTMMU
-#define assert_memory_lock()
-#else
+#ifdef CONFIG_USER_ONLY
#define assert_memory_lock() tcg_debug_assert(have_mmap_lock())
+#else
+#define assert_memory_lock()
#endif
#if defined(CONFIG_SOFTMMU) && defined(CONFIG_DEBUG_TCG)
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index ebc1db03d7..c0ab00385f 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -566,7 +566,7 @@ void cpu_exec_step_atomic(CPUState *cpu)
cpu_tb_exec(cpu, tb, &tb_exit);
cpu_exec_exit(cpu);
} else {
-#ifndef CONFIG_SOFTMMU
+#ifdef CONFIG_USER_ONLY
clear_helper_retaddr();
if (have_mmap_lock()) {
mmap_unlock();
@@ -1023,7 +1023,7 @@ static int cpu_exec_setjmp(CPUState *cpu, SyncClocks *sc)
/* Non-buggy compilers preserve this; assert the correct value. */
g_assert(cpu == current_cpu);
-#ifndef CONFIG_SOFTMMU
+#ifdef CONFIG_USER_ONLY
clear_helper_retaddr();
if (have_mmap_lock()) {
mmap_unlock();
--
2.34.1
- [PULL 01/16] host/include/x86_64: Use __m128i for "x" constraints, (continued)
- [PULL 01/16] host/include/x86_64: Use __m128i for "x" constraints, Richard Henderson, 2023/06/20
- [PULL 03/16] tcg/ppc: Define _CALL_AIX for clang on ppc64(be), Richard Henderson, 2023/06/20
- [PULL 06/16] target/m68k: Check for USER_ONLY definition instead of SOFTMMU one, Richard Henderson, 2023/06/20
- [PULL 08/16] hw/core/cpu: Check for USER_ONLY definition instead of SOFTMMU one, Richard Henderson, 2023/06/20
- [PULL 13/16] plugins: Remove unused 'exec/helper-proto.h' header, Richard Henderson, 2023/06/20
- [PULL 02/16] accel/tcg: Handle MO_ATOM_WITHIN16 in do_st16_leN, Richard Henderson, 2023/06/20
- [PULL 04/16] target/i386: Simplify i386_tr_init_disas_context(), Richard Henderson, 2023/06/20
- [PULL 05/16] target/tricore: Remove pointless CONFIG_SOFTMMU guard, Richard Henderson, 2023/06/20
- [PULL 07/16] target/ppc: Check for USER_ONLY definition instead of SOFTMMU one, Richard Henderson, 2023/06/20
- [PULL 10/16] meson: Alias CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY, Richard Henderson, 2023/06/20
- [PULL 09/16] accel/tcg: Check for USER_ONLY definition instead of SOFTMMU one,
Richard Henderson <=
- [PULL 11/16] meson: Replace CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY, Richard Henderson, 2023/06/20
- [PULL 12/16] meson: Replace softmmu_ss -> system_ss, Richard Henderson, 2023/06/20
- [PULL 16/16] cputlb: Restrict SavedIOTLB to system emulation, Richard Henderson, 2023/06/20
- [PULL 14/16] accel/tcg/cpu-exec: Use generic 'helper-proto-common.h' header, Richard Henderson, 2023/06/20
- [PULL 15/16] exec/cpu-defs: Check for SOFTMMU instead of !USER_ONLY, Richard Henderson, 2023/06/20
- Re: [PULL 00/16] tcg patch queue, Richard Henderson, 2023/06/20