Commit 3dbc8c61 authored by Richard Henderson's avatar Richard Henderson
Browse files

tcg/i386: Propagate is64 to tcg_out_qemu_ld_slow_path 



This helps preserve the invariant that all TCG_TYPE_I32 values
are stored zero-extended in the 64-bit host registers.

Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 1d21d95b

tcg/i386/tcg-target.inc.c

+8 −5
Original line number Diff line number Diff line
@@ -1692,7 +1692,8 @@ static inline void tcg_out_tlb_load(TCGContext *s, TCGReg addrlo, TCGReg addrhi, 
 * Record the context of a call to the out of line helper code for the slow path

 * for a load or store, so that we can later generate the correct helper code

 */

static void add_qemu_ldst_label(TCGContext *s, bool is_ld, TCGMemOpIdx oi,

static void add_qemu_ldst_label(TCGContext *s, bool is_ld, bool is_64,

                                TCGMemOpIdx oi,

                                TCGReg datalo, TCGReg datahi,

                                TCGReg addrlo, TCGReg addrhi,

                                tcg_insn_unit *raddr,
@@ -1702,6 +1703,7 @@ static void add_qemu_ldst_label(TCGContext *s, bool is_ld, TCGMemOpIdx oi, 


    label->is_ld = is_ld;

    label->oi = oi;

    label->type = is_64 ? TCG_TYPE_I64 : TCG_TYPE_I32;

    label->datalo_reg = datalo;

    label->datahi_reg = datahi;

    label->addrlo_reg = addrlo;
@@ -1722,6 +1724,7 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) 
    TCGMemOp opc = get_memop(oi);

    TCGReg data_reg;

    tcg_insn_unit **label_ptr = &l->label_ptr[0];

    int rexw = (l->type == TCG_TYPE_I64 ? P_REXW : 0);



    /* resolve label address */

    tcg_patch32(label_ptr[0], s->code_ptr - label_ptr[0] - 4);
@@ -1760,10 +1763,10 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) 
    data_reg = l->datalo_reg;

    switch (opc & MO_SSIZE) {

    case MO_SB:

        tcg_out_ext8s(s, data_reg, TCG_REG_EAX, P_REXW);

        tcg_out_ext8s(s, data_reg, TCG_REG_EAX, rexw);

        break;

    case MO_SW:

        tcg_out_ext16s(s, data_reg, TCG_REG_EAX, P_REXW);

        tcg_out_ext16s(s, data_reg, TCG_REG_EAX, rexw);

        break;

#if TCG_TARGET_REG_BITS == 64

    case MO_SL:
@@ -2014,7 +2017,7 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is64) 
    tcg_out_qemu_ld_direct(s, datalo, datahi, TCG_REG_L1, -1, 0, 0, is64, opc);



    /* Record the current context of a load into ldst label */

    add_qemu_ldst_label(s, true, oi, datalo, datahi, addrlo, addrhi,

    add_qemu_ldst_label(s, true, is64, oi, datalo, datahi, addrlo, addrhi,

                        s->code_ptr, label_ptr);

#else

    {
@@ -2154,7 +2157,7 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is64) 
    tcg_out_qemu_st_direct(s, datalo, datahi, TCG_REG_L1, 0, 0, opc);



    /* Record the current context of a store into ldst label */

    add_qemu_ldst_label(s, false, oi, datalo, datahi, addrlo, addrhi,

    add_qemu_ldst_label(s, false, is64, oi, datalo, datahi, addrlo, addrhi,

                        s->code_ptr, label_ptr);

#else

    {