falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec: extend skip field to 6 bit, page entry to 32 bit 

Extend skip to 6 bit. As page entry doesn't fit in 16 bit
any longer anyway, extend it to 32 bit.
This doubles node map memory requirements, but follow-up
patches will save this memory.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2013-11-11 14:51:56 +02:00
parent 9736e55b78
commit 8b795765db
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
exec.c
View File

@ -84,11 +84,13 @@ typedef struct PhysPageEntry PhysPageEntry;
struct PhysPageEntry { struct PhysPageEntry {
/* How many bits skip to next level (in units of L2_SIZE). 0 for a leaf. */ /* How many bits skip to next level (in units of L2_SIZE). 0 for a leaf. */
uint16_t skip : 1; uint32_t skip : 6;
/* index into phys_sections (!skip) or phys_map_nodes (skip) */ /* index into phys_sections (!skip) or phys_map_nodes (skip) */
uint16_t ptr : 15; uint32_t ptr : 26;
}; };
#define PHYS_MAP_NODE_NIL (((uint32_t)~0) >> 6)
/* Size of the L2 (and L3, etc) page tables. */ /* Size of the L2 (and L3, etc) page tables. */
#define ADDR_SPACE_BITS TARGET_PHYS_ADDR_SPACE_BITS #define ADDR_SPACE_BITS TARGET_PHYS_ADDR_SPACE_BITS
@ -134,8 +136,6 @@ typedef struct PhysPageMap {
static PhysPageMap *prev_map; static PhysPageMap *prev_map;
static PhysPageMap next_map; static PhysPageMap next_map;
#define PHYS_MAP_NODE_NIL (((uint16_t)~0) >> 1)
static void io_mem_init(void); static void io_mem_init(void);
static void memory_map_init(void); static void memory_map_init(void);
@ -156,10 +156,10 @@ static void phys_map_node_reserve(unsigned nodes)
} }
} }
static uint16_t phys_map_node_alloc(void) static uint32_t phys_map_node_alloc(void)
{ {
unsigned i; unsigned i;
uint16_t ret; uint32_t ret;
ret = next_map.nodes_nb++; ret = next_map.nodes_nb++;
assert(ret != PHYS_MAP_NODE_NIL); assert(ret != PHYS_MAP_NODE_NIL);