Commit 75478279 authored by Richard Henderson's avatar Richard Henderson
Browse files

tcg/i386: Implement INDEX_op_extr{lh}_i64_i32 for 32-bit guests 



This preserves the invariant that all TCG_TYPE_I32 values are
zero-extended in the 64-bit host register.

Reviewed-by: default avatarEmilio G. Cota <cota@braap.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 3dbc8c61

tcg/i386/tcg-target.h

+3 −2
Original line number Diff line number Diff line
@@ -135,8 +135,9 @@ extern bool have_avx2; 
#define TCG_TARGET_HAS_direct_jump      1



#if TCG_TARGET_REG_BITS == 64

#define TCG_TARGET_HAS_extrl_i64_i32    0

#define TCG_TARGET_HAS_extrh_i64_i32    0

/* Keep target addresses zero-extended in a register.  */

#define TCG_TARGET_HAS_extrl_i64_i32    (TARGET_LONG_BITS == 32)

#define TCG_TARGET_HAS_extrh_i64_i32    (TARGET_LONG_BITS == 32)

#define TCG_TARGET_HAS_div2_i64         1

#define TCG_TARGET_HAS_rot_i64          1

#define TCG_TARGET_HAS_ext8s_i64        1

tcg/i386/tcg-target.inc.c

+6 −0
Original line number Diff line number Diff line
@@ -2549,12 +2549,16 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, 
        break;

    case INDEX_op_extu_i32_i64:

    case INDEX_op_ext32u_i64:

    case INDEX_op_extrl_i64_i32:

        tcg_out_ext32u(s, a0, a1);

        break;

    case INDEX_op_ext_i32_i64:

    case INDEX_op_ext32s_i64:

        tcg_out_ext32s(s, a0, a1);

        break;

    case INDEX_op_extrh_i64_i32:

        tcg_out_shifti(s, SHIFT_SHR + P_REXW, a0, 32);

        break;

#endif



    OP_32_64(deposit):
@@ -2918,6 +2922,7 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) 
    case INDEX_op_neg_i64:

    case INDEX_op_not_i32:

    case INDEX_op_not_i64:

    case INDEX_op_extrh_i64_i32:

        return &r_0;



    case INDEX_op_ext8s_i32:
@@ -2933,6 +2938,7 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) 
    case INDEX_op_ext32u_i64:

    case INDEX_op_ext_i32_i64:

    case INDEX_op_extu_i32_i64:

    case INDEX_op_extrl_i64_i32:

    case INDEX_op_extract_i32:

    case INDEX_op_extract_i64:

    case INDEX_op_sextract_i32: