ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec/cpu-defs: Check for SOFTMMU instead of !USER_ONLY 

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>
This commit is contained in:
Philippe Mathieu-Daudé 2023-06-06 01:02:16 +02:00 committed by Richard Henderson
parent a3e7f70229
commit 708906dcd6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/exec/cpu-defs.h
View File

@ -60,7 +60,7 @@
*/ */
#define NB_MMU_MODES 16 #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" #include "exec/tlb-common.h"
/* use a fully associative victim tlb of 8 entries */ /* use a fully associative victim tlb of 8 entries */
@ -89,9 +89,9 @@
# endif # endif
# 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, * 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 * so the layout is not as critical as that of CPUTLBEntry. This is
@ -133,9 +133,9 @@ typedef struct CPUTLBEntryFull {
TARGET_PAGE_ENTRY_EXTRA TARGET_PAGE_ENTRY_EXTRA
#endif #endif
} CPUTLBEntryFull; } 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 * Data elements that are per MMU mode, minus the bits accessed by
* the TCG fast path. * the TCG fast path.
@ -201,7 +201,7 @@ typedef struct CPUTLB {
typedef struct CPUTLB { } CPUTLB; typedef struct CPUTLB { } CPUTLB;
#endif /* !CONFIG_USER_ONLY && CONFIG_TCG */ #endif /* CONFIG_SOFTMMU && CONFIG_TCG */
/* /*
* This structure must be placed in ArchCPU immediately * This structure must be placed in ArchCPU immediately