Commit 2dd92606 authored by Richard Henderson's avatar Richard Henderson Committed by Alex Bennée
Browse files

cputlb: Do unaligned load recursion to outermost function 



If we attempt to recurse from load_helper back to load_helper,
even via intermediary, we do not get all of the constants
expanded away as desired.

But if we recurse back to the original helper (or a shim that
has a consistent function signature), the operands are folded
away as desired.

Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Tested-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
parent fc1bc777

accel/tcg/cputlb.c

+97 −20
Original line number Diff line number Diff line
@@ -1157,10 +1157,13 @@ static inline uint64_t handle_bswap(uint64_t val, int size, bool big_endian) 
 * is disassembled. It shouldn't be called directly by guest code.

 */



static uint64_t load_helper(CPUArchState *env, target_ulong addr,

                            TCGMemOpIdx oi, uintptr_t retaddr,

                            size_t size, bool big_endian,

                            bool code_read)

typedef uint64_t FullLoadHelper(CPUArchState *env, target_ulong addr,

                                TCGMemOpIdx oi, uintptr_t retaddr);



static inline uint64_t __attribute__((always_inline))

load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,

            uintptr_t retaddr, size_t size, bool big_endian, bool code_read,

            FullLoadHelper *full_load)

{

    uintptr_t mmu_idx = get_mmuidx(oi);

    uintptr_t index = tlb_index(env, mmu_idx, addr);
@@ -1233,8 +1236,8 @@ static uint64_t load_helper(CPUArchState *env, target_ulong addr, 
    do_unaligned_access:

        addr1 = addr & ~(size - 1);

        addr2 = addr1 + size;

        r1 = load_helper(env, addr1, oi, retaddr, size, big_endian, code_read);

        r2 = load_helper(env, addr2, oi, retaddr, size, big_endian, code_read);

        r1 = full_load(env, addr1, oi, retaddr);

        r2 = full_load(env, addr2, oi, retaddr);

        shift = (addr & (size - 1)) * 8;



        if (big_endian) {
@@ -1291,46 +1294,83 @@ static uint64_t load_helper(CPUArchState *env, target_ulong addr, 
 * We don't bother with this widened value for SOFTMMU_CODE_ACCESS.

 */



static uint64_t full_ldub_mmu(CPUArchState *env, target_ulong addr,

                              TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 1, false, false,

                       full_ldub_mmu);

}



tcg_target_ulong helper_ret_ldub_mmu(CPUArchState *env, target_ulong addr,

                                     TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 1, false, false);

    return full_ldub_mmu(env, addr, oi, retaddr);

}



static uint64_t full_le_lduw_mmu(CPUArchState *env, target_ulong addr,

                                 TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 2, false, false,

                       full_le_lduw_mmu);

}



tcg_target_ulong helper_le_lduw_mmu(CPUArchState *env, target_ulong addr,

                                    TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 2, false, false);

    return full_le_lduw_mmu(env, addr, oi, retaddr);

}



static uint64_t full_be_lduw_mmu(CPUArchState *env, target_ulong addr,

                                 TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 2, true, false,

                       full_be_lduw_mmu);

}



tcg_target_ulong helper_be_lduw_mmu(CPUArchState *env, target_ulong addr,

                                    TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 2, true, false);

    return full_be_lduw_mmu(env, addr, oi, retaddr);

}



static uint64_t full_le_ldul_mmu(CPUArchState *env, target_ulong addr,

                                 TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 4, false, false,

                       full_le_ldul_mmu);

}



tcg_target_ulong helper_le_ldul_mmu(CPUArchState *env, target_ulong addr,

                                    TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 4, false, false);

    return full_le_ldul_mmu(env, addr, oi, retaddr);

}



static uint64_t full_be_ldul_mmu(CPUArchState *env, target_ulong addr,

                                 TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 4, true, false,

                       full_be_ldul_mmu);

}



tcg_target_ulong helper_be_ldul_mmu(CPUArchState *env, target_ulong addr,

                                    TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 4, true, false);

    return full_be_ldul_mmu(env, addr, oi, retaddr);

}



uint64_t helper_le_ldq_mmu(CPUArchState *env, target_ulong addr,

                           TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 8, false, false);

    return load_helper(env, addr, oi, retaddr, 8, false, false,

                       helper_le_ldq_mmu);

}



uint64_t helper_be_ldq_mmu(CPUArchState *env, target_ulong addr,

                           TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 8, true, false);

    return load_helper(env, addr, oi, retaddr, 8, true, false,

                       helper_be_ldq_mmu);

}



/*
@@ -1613,44 +1653,81 @@ void helper_be_stq_mmu(CPUArchState *env, target_ulong addr, uint64_t val, 


/* Code access functions.  */



static uint64_t full_ldub_cmmu(CPUArchState *env, target_ulong addr,

                               TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 1, false, true,

                       full_ldub_cmmu);

}



uint8_t helper_ret_ldb_cmmu(CPUArchState *env, target_ulong addr,

                            TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 1, false, true);

    return full_ldub_cmmu(env, addr, oi, retaddr);

}



static uint64_t full_le_lduw_cmmu(CPUArchState *env, target_ulong addr,

                                  TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 2, false, true,

                       full_le_lduw_cmmu);

}



uint16_t helper_le_ldw_cmmu(CPUArchState *env, target_ulong addr,

                            TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 2, false, true);

    return full_le_lduw_cmmu(env, addr, oi, retaddr);

}



static uint64_t full_be_lduw_cmmu(CPUArchState *env, target_ulong addr,

                                  TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 2, true, true,

                       full_be_lduw_cmmu);

}



uint16_t helper_be_ldw_cmmu(CPUArchState *env, target_ulong addr,

                            TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 2, true, true);

    return full_be_lduw_cmmu(env, addr, oi, retaddr);

}



static uint64_t full_le_ldul_cmmu(CPUArchState *env, target_ulong addr,

                                  TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 4, false, true,

                       full_le_ldul_cmmu);

}



uint32_t helper_le_ldl_cmmu(CPUArchState *env, target_ulong addr,

                            TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 4, false, true);

    return full_le_ldul_cmmu(env, addr, oi, retaddr);

}



static uint64_t full_be_ldul_cmmu(CPUArchState *env, target_ulong addr,

                                  TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 4, true, true,

                       full_be_ldul_cmmu);

}



uint32_t helper_be_ldl_cmmu(CPUArchState *env, target_ulong addr,

                            TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 4, true, true);

    return full_be_ldul_cmmu(env, addr, oi, retaddr);

}



uint64_t helper_le_ldq_cmmu(CPUArchState *env, target_ulong addr,

                            TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 8, false, true);

    return load_helper(env, addr, oi, retaddr, 8, false, true,

                       helper_le_ldq_cmmu);

}



uint64_t helper_be_ldq_cmmu(CPUArchState *env, target_ulong addr,

                            TCGMemOpIdx oi, uintptr_t retaddr)

{

    return load_helper(env, addr, oi, retaddr, 8, true, true);

    return load_helper(env, addr, oi, retaddr, 8, true, true,

                       helper_be_ldq_cmmu);

}