Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
philmd authored and rth7680 committed Jun 20, 2023
1 parent a3e7f70 commit 708906d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions include/exec/cpu-defs.h
Expand Up @@ -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 */
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 708906d

Please sign in to comment.