diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-09-12 12:24:03 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-09-19 16:20:49 +0200 |
| commit | 128b52e8d15f98c6a0734208d85f83e78a7ac652 (patch) | |
| tree | 99ba7924b414f065954d6ed87ba6b2f9de53ab2c | |
| parent | 8e1fe1753ae110f5003aa83da24326667045c3ae (diff) | |
| download | focaccia-qemu-128b52e8d15f98c6a0734208d85f83e78a7ac652.tar.gz focaccia-qemu-128b52e8d15f98c6a0734208d85f83e78a7ac652.zip | |
target/i386: fix "info mem" for LA57 mode
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | target/i386/monitor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/i386/monitor.c b/target/i386/monitor.c index fe7d57b6aa..75e155ffb1 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -447,7 +447,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) start = -1; for (l0 = 0; l0 < 512; l0++) { cpu_physical_memory_read(pml5_addr + l0 * 8, &pml5e, 8); - pml4e = le64_to_cpu(pml5e); + pml5e = le64_to_cpu(pml5e); end = l0 << 48; if (!(pml5e & PG_PRESENT_MASK)) { prot = 0; @@ -480,7 +480,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) if (pdpe & PG_PSE_MASK) { prot = pdpe & (PG_USER_MASK | PG_RW_MASK | PG_PRESENT_MASK); - prot &= pml4e; + prot &= pml5e & pml4e; mem_print(mon, &start, &last_prot, end, prot); continue; } @@ -499,7 +499,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) if (pde & PG_PSE_MASK) { prot = pde & (PG_USER_MASK | PG_RW_MASK | PG_PRESENT_MASK); - prot &= pml4e & pdpe; + prot &= pml5e & pml4e & pdpe; mem_print(mon, &start, &last_prot, end, prot); continue; } @@ -513,7 +513,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) if (pte & PG_PRESENT_MASK) { prot = pte & (PG_USER_MASK | PG_RW_MASK | PG_PRESENT_MASK); - prot &= pml4e & pdpe & pde; + prot &= pml5e & pml4e & pdpe & pde; } else { prot = 0; } |