Commit c2a85316 authored by Bobby Bingham's avatar Bobby Bingham Committed by Paolo Bonzini
Browse files

cpu_ldst.h: use correct guest address parameter 



In the user emulation code path, tlb_vaddr_to_host erronesously passed
vaddr as the guest address to be translated, instead of addr, the parameter
which actually contained the guest address.

This resulted in incorrect addresses being used when emulating block copy
(mvc/mvpg) and block clear (xc) instructions for the s390x target.

Signed-off-by: default avatarBobby Bingham <koorogi@koorogi.info>
Message-Id: <20161113050523.23909-1-koorogi@koorogi.info>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a7764f15

include/exec/cpu_ldst.h

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static inline void *tlb_vaddr_to_host(CPUArchState *env, target_ulong addr, 
                                      int access_type, int mmu_idx)

{

#if defined(CONFIG_USER_ONLY)

    return g2h(vaddr);

    return g2h(addr);

#else

    int index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);

    CPUTLBEntry *tlbentry = &env->tlb_table[mmu_idx][index];