Commit 39dc85b9 authored by Richard Henderson's avatar Richard Henderson
Browse files

tcg-ppc64: Handle deposit of zero 



The TCG optimizer does great work when inserting constants, being able
to fold the open-coded deposit expansion to just an AND or an OR.  Avoid
a bit the regression caused by having the deposit opcode by expanding
deposit of zero as an AND.

Reviewed-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent 6645c147

tcg/ppc64/tcg-target.c

+16 −6
Original line number Diff line number Diff line
@@ -1928,12 +1928,22 @@ static void tcg_out_op (TCGContext *s, TCGOpcode opc, const TCGArg *args, 
        break;



    case INDEX_op_deposit_i32:

        if (const_args[2]) {

            uint32_t mask = ((2u << (args[4] - 1)) - 1) << args[3];

            tcg_out_andi32(s, args[0], args[0], ~mask);

        } else {

            tcg_out_rlw(s, RLWIMI, args[0], args[2], args[3],

                        32 - args[3] - args[4], 31 - args[3]);

        }

        break;

    case INDEX_op_deposit_i64:

        if (const_args[2]) {

            uint64_t mask = ((2ull << (args[4] - 1)) - 1) << args[3];

            tcg_out_andi64(s, args[0], args[0], ~mask);

        } else {

            tcg_out_rld(s, RLDIMI, args[0], args[2], args[3],

                        64 - args[3] - args[4]);

        }

        break;



    case INDEX_op_movcond_i32:
@@ -2136,8 +2146,8 @@ static const TCGTargetOpDef ppc_op_defs[] = { 
    { INDEX_op_bswap32_i64, { "r", "r" } },

    { INDEX_op_bswap64_i64, { "r", "r" } },



    { INDEX_op_deposit_i32, { "r", "0", "r" } },

    { INDEX_op_deposit_i64, { "r", "0", "r" } },

    { INDEX_op_deposit_i32, { "r", "0", "rZ" } },

    { INDEX_op_deposit_i64, { "r", "0", "rZ" } },



    { INDEX_op_add2_i64, { "r", "r", "r", "rI", "r", "rZM" } },

    { INDEX_op_sub2_i64, { "r", "r", "rI", "r", "rZM", "r" } },