diff options
| author | Avi Kivity <avi@redhat.com> | 2012-01-02 15:40:52 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-01-04 13:34:50 +0200 |
| commit | 75c578dcaae48f239fc87b545022efa8fa13f455 (patch) | |
| tree | e3a7182da298ce03bb894fa166c236fb6689a5d4 /exec.c | |
| parent | b3b00c78d8247cdffc25839d4b8ff0310a889480 (diff) | |
| download | focaccia-qemu-75c578dcaae48f239fc87b545022efa8fa13f455.tar.gz focaccia-qemu-75c578dcaae48f239fc87b545022efa8fa13f455.zip | |
Drop IO_MEM_ROMD
Unlike ->readonly, ->readable is not inherited from aliase, so we can simply query the memory region. Signed-off-by: Avi Kivity <avi@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/exec.c b/exec.c index d5b82aabba..8916825688 100644 --- a/exec.c +++ b/exec.c @@ -2091,9 +2091,18 @@ static bool is_ram_rom(ram_addr_t pd) return pd == io_mem_ram.ram_addr || pd == io_mem_rom.ram_addr; } +static bool is_romd(ram_addr_t pd) +{ + MemoryRegion *mr; + + pd &= ~TARGET_PAGE_MASK; + mr = io_mem_region[pd >> IO_MEM_SHIFT]; + return mr->rom_device && mr->readable; +} + static bool is_ram_rom_romd(ram_addr_t pd) { - return is_ram_rom(pd) || (pd & IO_MEM_ROMD); + return is_ram_rom(pd) || is_romd(pd); } /* Add a new TLB entry. At most one entry for a given virtual address @@ -2179,8 +2188,7 @@ void tlb_set_page(CPUState *env, target_ulong vaddr, te->addr_code = -1; } if (prot & PAGE_WRITE) { - if ((pd & ~TARGET_PAGE_MASK) == io_mem_rom.ram_addr || - (pd & IO_MEM_ROMD)) { + if ((pd & ~TARGET_PAGE_MASK) == io_mem_rom.ram_addr || is_romd(pd)) { /* Write access calls the I/O callback. */ te->addr_write = address | TLB_MMIO; } else if ((pd & ~TARGET_PAGE_MASK) == io_mem_ram.ram_addr && @@ -2528,10 +2536,6 @@ void cpu_register_physical_memory_log(MemoryRegionSection *section, region_offset = 0; } - if (!readable) { - phys_offset &= ~TARGET_PAGE_MASK & ~IO_MEM_ROMD; - } - if (readonly) { phys_offset |= io_mem_rom.ram_addr; } @@ -4379,7 +4383,7 @@ tb_page_addr_t get_page_addr_code(CPUState *env1, target_ulong addr) } pd = env1->tlb_table[mmu_idx][page_index].addr_code & ~TARGET_PAGE_MASK; if (pd != io_mem_ram.ram_addr && pd != io_mem_rom.ram_addr - && !(pd & IO_MEM_ROMD)) { + && !is_romd(pd)) { #if defined(TARGET_ALPHA) || defined(TARGET_MIPS) || defined(TARGET_SPARC) cpu_unassigned_access(env1, addr, 0, 1, 0, 4); #else |