From 0844e007624acb6dbf45bfb232286ce9502b424e Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 24 May 2013 14:37:28 +0200 Subject: exec: make io_mem_unassigned private There is no reason to avoid a recompile before accessing unassigned memory. In the end it will be treated as MMIO anyway. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- exec.c | 4 ++-- include/exec/cpu-common.h | 1 - include/exec/softmmu_template.h | 10 ++-------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/exec.c b/exec.c index 7728ea3..7e22980 100644 --- a/exec.c +++ b/exec.c @@ -66,8 +66,8 @@ AddressSpace address_space_io; AddressSpace address_space_memory; DMAContext dma_context_memory; -MemoryRegion io_mem_rom, io_mem_unassigned, io_mem_notdirty; -static MemoryRegion io_mem_subpage_ram; +MemoryRegion io_mem_rom, io_mem_notdirty; +static MemoryRegion io_mem_unassigned, io_mem_subpage_ram; #endif diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 1686b8f..e061e21 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -111,7 +111,6 @@ void cpu_physical_memory_write_rom(hwaddr addr, const uint8_t *buf, int len); extern struct MemoryRegion io_mem_rom; -extern struct MemoryRegion io_mem_unassigned; extern struct MemoryRegion io_mem_notdirty; #endif diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h index 4501dac..ca91fd0 100644 --- a/include/exec/softmmu_template.h +++ b/include/exec/softmmu_template.h @@ -68,10 +68,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, physaddr = (physaddr & TARGET_PAGE_MASK) + addr; env->mem_io_pc = retaddr; - if (mr != &io_mem_rom - && mr != &io_mem_unassigned - && mr != &io_mem_notdirty - && !can_do_io(env)) { + if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) { cpu_io_recompile(env, retaddr); } @@ -218,10 +215,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env, MemoryRegion *mr = iotlb_to_region(physaddr); physaddr = (physaddr & TARGET_PAGE_MASK) + addr; - if (mr != &io_mem_rom - && mr != &io_mem_unassigned - && mr != &io_mem_notdirty - && !can_do_io(env)) { + if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) { cpu_io_recompile(env, retaddr); } -- cgit v1.1