On Fri, Feb 23, 2024 at 02:09:45PM +0100, Paolo Bonzini wrote:
> Date: Fri, 23 Feb 2024 14:09:45 +0100
> From: Paolo Bonzini <pbonz...@redhat.com>
> Subject: [PATCH v2 4/7] target/i386: use separate MMU indexes for 32-bit
> accesses
> X-Mailer: git-send-email 2.43.0
>
> Accesses from a 32-bit environment (32-bit code segment for instruction
> accesses, EFER.LMA==0 for processor accesses) have to mask away the
> upper 32 bits of the address. While a bit wasteful, the easiest way
> to do so is to use separate MMU indexes. These days, QEMU anyway is
> compiled with a fixed value for NB_MMU_MODES. Split MMU_USER_IDX,
> MMU_KSMAP_IDX and MMU_KNOSMAP_IDX in two.
Maybe s/in/into/ ?
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> target/i386/cpu.h | 34 ++++++++++++++++++++--------
> target/i386/cpu.c | 11 +++++----
> target/i386/tcg/sysemu/excp_helper.c | 3 ++-
> 3 files changed, 33 insertions(+), 15 deletions(-)
>
[snip]
>
> static inline int cpu_mmu_index_kernel(CPUX86State *env)
> {
> - return !(env->hflags & HF_SMAP_MASK) ? MMU_KNOSMAP_IDX :
> - ((env->hflags & HF_CPL_MASK) < 3 && (env->eflags & AC_MASK))
> - ? MMU_KNOSMAP_IDX : MMU_KSMAP_IDX;
> + int mmu_index_32 = (env->hflags & HF_LMA_MASK) ? 1 : 0;
> + int mmu_index_base =
> + !(env->hflags & HF_SMAP_MASK) ? MMU_KNOSMAP64_IDX :
> + ((env->hflags & HF_CPL_MASK) < 3 && (env->eflags & AC_MASK)) ?
> MMU_KNOSMAP64_IDX : MMU_KSMAP64_IDX;
Change the line?
