[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/16] exec/cpu-defs: Check for SOFTMMU instead of !USER_ONLY
From: |
Richard Henderson |
Subject: |
[PULL 15/16] exec/cpu-defs: Check for SOFTMMU instead of !USER_ONLY |
Date: |
Tue, 20 Jun 2023 10:26:10 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
We want to check the softmmu tlb availability, not
if we are targetting system emulation. Besides, this
code could be used by user emulation in the future.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230605230216.17202-1-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu-defs.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index 0d418a0384..4cb77c8dec 100644
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -60,7 +60,7 @@
*/
#define NB_MMU_MODES 16
-#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
+#if defined(CONFIG_SOFTMMU) && defined(CONFIG_TCG)
#include "exec/tlb-common.h"
/* use a fully associative victim tlb of 8 entries */
@@ -89,9 +89,9 @@
# endif
# endif
-#endif /* !CONFIG_USER_ONLY && CONFIG_TCG */
+#endif /* CONFIG_SOFTMMU && CONFIG_TCG */
-#if !defined(CONFIG_USER_ONLY)
+#if defined(CONFIG_SOFTMMU)
/*
* The full TLB entry, which is not accessed by generated TCG code,
* so the layout is not as critical as that of CPUTLBEntry. This is
@@ -133,9 +133,9 @@ typedef struct CPUTLBEntryFull {
TARGET_PAGE_ENTRY_EXTRA
#endif
} CPUTLBEntryFull;
-#endif /* !CONFIG_USER_ONLY */
+#endif /* CONFIG_SOFTMMU */
-#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
+#if defined(CONFIG_SOFTMMU) && defined(CONFIG_TCG)
/*
* Data elements that are per MMU mode, minus the bits accessed by
* the TCG fast path.
@@ -201,7 +201,7 @@ typedef struct CPUTLB {
typedef struct CPUTLB { } CPUTLB;
-#endif /* !CONFIG_USER_ONLY && CONFIG_TCG */
+#endif /* CONFIG_SOFTMMU && CONFIG_TCG */
/*
* This structure must be placed in ArchCPU immediately
--
2.34.1
- [PULL 02/16] accel/tcg: Handle MO_ATOM_WITHIN16 in do_st16_leN, (continued)
- [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, 2023/06/20
- [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 <=
- Re: [PULL 00/16] tcg patch queue, Richard Henderson, 2023/06/20