diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-24 14:37:28 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-29 16:26:41 +0200 |
| commit | 0844e007624acb6dbf45bfb232286ce9502b424e (patch) | |
| tree | ad0170e9d3db1f44bbb0cdc878d86fa872173be4 /include | |
| parent | 8f3e03cb73dce9eac207cfe0f37d87d6490421a0 (diff) | |
| download | qemu-0844e007624acb6dbf45bfb232286ce9502b424e.zip | |
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 <rth@twiddle.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/cpu-common.h | 1 | ||||
| -rw-r--r-- | include/exec/softmmu_template.h | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 1686b8f546..e061e21093 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 4501dacad1..ca91fd0b22 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); } |