Commit e59b1c5f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170803' into staging 



Queued misc tcg patches

# gpg: Signature made Thu 03 Aug 2017 19:07:18 BST
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* remotes/rth/tags/pull-tcg-20170803:
  tcg: Increase minimum alignment from tcg_malloc to 8
  target/s390x: Fix CSST for 16-byte store
  tcg/arm: Fix runtime overalignment test

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ac44ed2a 13aaef67

target/s390x/mem_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -1580,6 +1580,7 @@ uint32_t HELPER(csst)(CPUS390XState *env, uint32_t r3, uint64_t a1, uint64_t a2) 
                cpu_stq_data_ra(env, a2 + 0, svh, ra);

                cpu_stq_data_ra(env, a2 + 8, svl, ra);

            }

            break;

        default:

            g_assert_not_reached();

        }

tcg/arm/tcg-target.inc.c

+1 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ static TCGReg tcg_out_tlb_read(TCGContext *s, TCGReg addrlo, TCGReg addrhi, 
    /* Load the tlb addend.  */

    tcg_out_ld32_12(s, COND_AL, TCG_REG_R2, TCG_REG_R2, add_off);



    tcg_out_dat_reg(s, (s_bits ? COND_EQ : COND_AL), ARITH_CMP, 0,

    tcg_out_dat_reg(s, (a_bits ? COND_EQ : COND_AL), ARITH_CMP, 0,

                    TCG_REG_R0, TCG_REG_TMP, SHIFT_IMM_LSL(TARGET_PAGE_BITS));



    if (TARGET_LONG_BITS == 64) {

tcg/tcg.h

+4 −1
Original line number Diff line number Diff line
@@ -762,7 +762,10 @@ static inline void *tcg_malloc(int size) 
{

    TCGContext *s = &tcg_ctx;

    uint8_t *ptr, *ptr_end;

    size = (size + sizeof(long) - 1) & ~(sizeof(long) - 1);



    /* ??? This is a weak placeholder for minimum malloc alignment.  */

    size = QEMU_ALIGN_UP(size, 8);



    ptr = s->pool_cur;

    ptr_end = ptr + size;

    if (unlikely(ptr_end > s->pool_end)) {