xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 21:40:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target/i386: fix "info mem" for LA57 mode

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2017-09-12 12:24:03 +02:00
parent 8e1fe1753a
commit 128b52e8d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/i386/monitor.c
View File

@ -447,7 +447,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
start = -1; start = -1;
for (l0 = 0; l0 < 512; l0++) { for (l0 = 0; l0 < 512; l0++) {
cpu_physical_memory_read(pml5_addr + l0 * 8, &pml5e, 8); cpu_physical_memory_read(pml5_addr + l0 * 8, &pml5e, 8);
pml4e = le64_to_cpu(pml5e); pml5e = le64_to_cpu(pml5e);
end = l0 << 48; end = l0 << 48;
if (!(pml5e & PG_PRESENT_MASK)) { if (!(pml5e & PG_PRESENT_MASK)) {
prot = 0; prot = 0;
@ -480,7 +480,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
if (pdpe & PG_PSE_MASK) { if (pdpe & PG_PSE_MASK) {
prot = pdpe & (PG_USER_MASK | PG_RW_MASK | prot = pdpe & (PG_USER_MASK | PG_RW_MASK |
PG_PRESENT_MASK); PG_PRESENT_MASK);
prot &= pml4e; prot &= pml5e & pml4e;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, &start, &last_prot, end, prot);
continue; continue;
} }
@ -499,7 +499,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
if (pde & PG_PSE_MASK) { if (pde & PG_PSE_MASK) {
prot = pde & (PG_USER_MASK | PG_RW_MASK | prot = pde & (PG_USER_MASK | PG_RW_MASK |
PG_PRESENT_MASK); PG_PRESENT_MASK);
prot &= pml4e & pdpe; prot &= pml5e & pml4e & pdpe;
mem_print(mon, &start, &last_prot, end, prot); mem_print(mon, &start, &last_prot, end, prot);
continue; continue;
} }
@ -513,7 +513,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env)
if (pte & PG_PRESENT_MASK) { if (pte & PG_PRESENT_MASK) {
prot = pte & (PG_USER_MASK | PG_RW_MASK | prot = pte & (PG_USER_MASK | PG_RW_MASK |
PG_PRESENT_MASK); PG_PRESENT_MASK);
prot &= pml4e & pdpe & pde; prot &= pml5e & pml4e & pdpe & pde;
} else { } else {
prot = 0; prot = 0;
} }