Commit ef5dae68 authored by Shahab Vahedi's avatar Shahab Vahedi Committed by Richard Henderson
Browse files

cputlb: Fix io_readx() to respect the access_type 

This change adapts io_readx() to its input access_type. Currently
io_readx() treats any memory access as a read, although it has an
input argument "MMUAccessType access_type". This results in:

1) Calling the tlb_fill() only with MMU_DATA_LOAD
2) Considering only entry->addr_read as the tlb_addr

Buglink: https://bugs.launchpad.net/qemu/+bug/1825359


Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarShahab Vahedi <shahab.vahedi@gmail.com>
Message-Id: <20190420072236.12347-1-shahab.vahedi@gmail.com>
[rth: Remove assert; fix expression formatting.]
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent b4b82d7e

accel/tcg/cputlb.c

+3 −2
Original line number Diff line number Diff line
@@ -878,10 +878,11 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry, 
        CPUTLBEntry *entry;

        target_ulong tlb_addr;



        tlb_fill(cpu, addr, size, MMU_DATA_LOAD, mmu_idx, retaddr);

        tlb_fill(cpu, addr, size, access_type, mmu_idx, retaddr);



        entry = tlb_entry(env, mmu_idx, addr);

        tlb_addr = entry->addr_read;

        tlb_addr = (access_type == MMU_DATA_LOAD ?

                    entry->addr_read : entry->addr_code);

        if (!(tlb_addr & ~(TARGET_PAGE_MASK | TLB_RECHECK))) {

            /* RAM access */

            uintptr_t haddr = addr + entry->addend;