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

monitor: Prevent sign-extension of 32-bit addresses printed by info mem

Browse Source 
Previously, on 32-bit i386, info mem used signed 32-bit int's to store
the page table indexes.  As a result, address calculation was done in
32 bits and then incorrectly sign-extended to 64 bits, yielding output
like

ffffffffef000000-ffffffffef031000 0000000000031000 ur-
ffffffffef7bc000-ffffffffef7bd000 0000000000001000 urw
ffffffffef7bd000-ffffffffef7be000 0000000000001000 ur-

This makes these indexes unsigned, which yields correct output

00000000ef000000-00000000ef031000 0000000000031000 ur-
00000000ef7bc000-00000000ef7bd000 0000000000001000 urw
00000000ef7bd000-00000000ef7be000 0000000000001000 ur-

Signed-off-by: Austin Clements <amdragon@mit.edu>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Austin Clements 2011-08-14 23:19:21 -04:00 committed by Blue Swirl
parent 59ad3403c2
commit b49ca72dd7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monitor.c
View File

@ -2226,7 +2226,8 @@ static void mem_print(Monitor *mon, target_phys_addr_t *pstart,
static void mem_info_32(Monitor *mon, CPUState *env)
{
int l1, l2, prot, last_prot;
unsigned int l1, l2;
int prot, last_prot;
uint32_t pgd, pde, pte;
target_phys_addr_t start, end;
@ -2263,7 +2264,8 @@ static void mem_info_32(Monitor *mon, CPUState *env)
static void mem_info_pae32(Monitor *mon, CPUState *env)
{
int l1, l2, l3, prot, last_prot;
unsigned int l1, l2, l3;
int prot, last_prot;
uint64_t pdpe, pde, pte;
uint64_t pdp_addr, pd_addr, pt_addr;
target_phys_addr_t start, end;