diff options
author | Paul Brook <paul@codesourcery.com> | 2010-03-01 03:31:14 +0000 |
---|---|---|
committer | Paul Brook <paul@codesourcery.com> | 2010-03-01 04:40:22 +0000 |
commit | c04b2b78992589b112affac608e74354bfa0c247 (patch) | |
tree | b374ed2cc5e0743be79ea622cd65a6c1cf4b732a /exec.c | |
parent | 9f9f030928a3d17ea8b87905fafc1e447328df2d (diff) |
Move subpage definitions
Move definitions for subpage handling into !CONFIG_USER_ONLY code.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'exec.c')
-rw-r--r-- | exec.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -208,15 +208,6 @@ static int tlb_flush_count; static int tb_flush_count; static int tb_phys_invalidate_count; -#define SUBPAGE_IDX(addr) ((addr) & ~TARGET_PAGE_MASK) -typedef struct subpage_t { - target_phys_addr_t base; - CPUReadMemoryFunc * const *mem_read[TARGET_PAGE_SIZE][4]; - CPUWriteMemoryFunc * const *mem_write[TARGET_PAGE_SIZE][4]; - void *opaque[TARGET_PAGE_SIZE][2][4]; - ram_addr_t region_offset[TARGET_PAGE_SIZE][2][4]; -} subpage_t; - #ifdef _WIN32 static void map_exec(void *addr, long size) { @@ -2381,6 +2372,15 @@ static inline void tlb_set_dirty(CPUState *env, #if !defined(CONFIG_USER_ONLY) +#define SUBPAGE_IDX(addr) ((addr) & ~TARGET_PAGE_MASK) +typedef struct subpage_t { + target_phys_addr_t base; + CPUReadMemoryFunc * const *mem_read[TARGET_PAGE_SIZE][4]; + CPUWriteMemoryFunc * const *mem_write[TARGET_PAGE_SIZE][4]; + void *opaque[TARGET_PAGE_SIZE][2][4]; + ram_addr_t region_offset[TARGET_PAGE_SIZE][2][4]; +} subpage_t; + static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end, ram_addr_t memory, ram_addr_t region_offset); static void *subpage_init (target_phys_addr_t base, ram_addr_t *phys, |