OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/i386: Fix test for paging enabled 

If CR0.PG is unset, pg_mode will be zero, but it will also be zero
for non-PAE/non-PSE page tables with CR0.WP=0.  Restore the
correct test for paging enabled.

Fixes: 98281984a3 ("target/i386: Add MMU_PHYS_IDX and MMU_NESTED_IDX")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1269
Reported-by: Andreas Gustafsson <gson@gson.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20221102091232.1092552-1-richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Richard Henderson 2022-11-02 20:12:32 +11:00 committed by Paolo Bonzini
parent eff3de52f2
commit 03a60ae9ca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/i386/tcg/sysemu/excp_helper.c
View File

@ -553,12 +553,12 @@ static bool get_physical_address(CPUX86State *env, vaddr addr,
break; break;
default: default:
in.cr3 = env->cr[3]; if (likely(env->cr[0] & CR0_PG_MASK)) {
in.mmu_idx = mmu_idx; in.cr3 = env->cr[3];
in.ptw_idx = use_stage2 ? MMU_NESTED_IDX : MMU_PHYS_IDX; in.mmu_idx = mmu_idx;
in.pg_mode = get_pg_mode(env); in.ptw_idx = use_stage2 ? MMU_NESTED_IDX : MMU_PHYS_IDX;
in.pg_mode = get_pg_mode(env);
if (likely(in.pg_mode)) {
if (in.pg_mode & PG_MODE_LMA) { if (in.pg_mode & PG_MODE_LMA) {
/* test virtual address sign extension */ /* test virtual address sign extension */
int shift = in.pg_mode & PG_MODE_LA57 ? 56 : 47; int shift = in.pg_mode & PG_MODE_LA57 ? 56 : 47;