Commit ce5d64c2 authored by Avi Kivity's avatar Avi Kivity
Browse files

exec: fix code tlb entry misused as iotlb in get_page_addr_code() 



get_page_addr_code() reads a code tlb entry, but interprets it as an
iotlb entry.  This works by accident since the low bits of a RAM code
tlb entry are clear, and match a RAM iotlb entry.  This accident is
about to unhappen, so fix the code to use an iotlb entry (using the
code entry with TLB_MMIO may fail if the page is a watchpoint).

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent aa102231

exec.c

+1 −1
Original line number Diff line number Diff line
@@ -4685,7 +4685,7 @@ tb_page_addr_t get_page_addr_code(CPUState *env1, target_ulong addr) 
                 (addr & TARGET_PAGE_MASK))) {

        ldub_code(addr);

    }

    pd = env1->tlb_table[mmu_idx][page_index].addr_code & ~TARGET_PAGE_MASK;

    pd = env1->iotlb[mmu_idx][page_index] & ~TARGET_PAGE_MASK;

    if (pd != io_mem_ram.ram_addr && pd != io_mem_rom.ram_addr

        && !io_mem_region[pd]->rom_device) {

#if defined(TARGET_ALPHA) || defined(TARGET_MIPS) || defined(TARGET_SPARC)