Commit ba18b07d authored by Richard Henderson's avatar Richard Henderson Committed by Richard Henderson
Browse files

tcg/s390: Merge add2i facilities check to tcg_target_op_def 



Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent a8f0269e

tcg/s390/tcg-target.inc.c

+14 −24
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#define TCG_CT_CONST_ORI   0x400

#define TCG_CT_CONST_XORI  0x800

#define TCG_CT_CONST_U31   0x1000

#define TCG_CT_CONST_ADLI  0x2000

#define TCG_CT_CONST_S33   0x2000

#define TCG_CT_CONST_ZERO  0x4000



/* Several places within the instruction set 0 means "no register"
@@ -387,7 +387,7 @@ static const char *target_parse_constraint(TCGArgConstraint *ct, 
        tcg_regset_set_reg(ct->u.regs, TCG_REG_R3);

        break;

    case 'A':

        ct->ct |= TCG_CT_CONST_ADLI;

        ct->ct |= TCG_CT_CONST_S33;

        break;

    case 'I':

        ct->ct |= TCG_CT_CONST_S16;
@@ -478,20 +478,6 @@ static int tcg_match_xori(TCGType type, tcg_target_long val) 
    return 1;

}



/* Immediates to be used with add2/sub2.  */



static int tcg_match_add2i(TCGType type, tcg_target_long val)

{

    if (s390_facilities & FACILITY_EXT_IMM) {

        if (type == TCG_TYPE_I32) {

            return 1;

        } else if (val >= -0xffffffffll && val <= 0xffffffffll) {

            return 1;

        }

    }

    return 0;

}



/* Test if a constant matches the constraint. */

static int tcg_target_const_match(tcg_target_long val, TCGType type,

                                  const TCGArgConstraint *arg_ct)
@@ -511,8 +497,8 @@ static int tcg_target_const_match(tcg_target_long val, TCGType type, 
        return val == (int16_t)val;

    } else if (ct & TCG_CT_CONST_S32) {

        return val == (int32_t)val;

    } else if (ct & TCG_CT_CONST_ADLI) {

        return tcg_match_add2i(type, val);

    } else if (ct & TCG_CT_CONST_S33) {

        return val >= -0xffffffffll && val <= 0xffffffffll;

    } else if (ct & TCG_CT_CONST_ORI) {

        return tcg_match_ori(type, val);

    } else if (ct & TCG_CT_CONST_XORI) {
@@ -2241,6 +2227,12 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) 
    static const TCGTargetOpDef r_0_rJ = { .args_ct_str = { "r", "0", "rJ" } };

    static const TCGTargetOpDef r_0_rO = { .args_ct_str = { "r", "0", "rO" } };

    static const TCGTargetOpDef r_0_rX = { .args_ct_str = { "r", "0", "rX" } };

    static const TCGTargetOpDef a2_r

        = { .args_ct_str = { "r", "r", "0", "1", "r", "r" } };

    static const TCGTargetOpDef a2_ri

        = { .args_ct_str = { "r", "r", "0", "1", "ri", "r" } };

    static const TCGTargetOpDef a2_rA

        = { .args_ct_str = { "r", "r", "0", "1", "rA", "r" } };



    switch (op) {

    case INDEX_op_goto_ptr:
@@ -2389,15 +2381,13 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) 
                = { .args_ct_str = { "b", "a", "0", "r" } };

            return &mul2;

        }



    case INDEX_op_add2_i32:

    case INDEX_op_add2_i64:

    case INDEX_op_sub2_i32:

        return (s390_facilities & FACILITY_EXT_IMM ? &a2_ri : &a2_r);

    case INDEX_op_add2_i64:

    case INDEX_op_sub2_i64:

        {

            static const TCGTargetOpDef arith2

                = { .args_ct_str = { "r", "r", "0", "1", "rA", "r" } };

            return &arith2;

        }

        return (s390_facilities & FACILITY_EXT_IMM ? &a2_rA : &a2_r);



    default:

        break;