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

tcg: Use extract2 in tcg_gen_deposit_{i32,i64} 



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

tcg/tcg-op.c

+30 −4
Original line number Diff line number Diff line
@@ -611,9 +611,22 @@ void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2, 
        return;

    }



    mask = (1u << len) - 1;

    t1 = tcg_temp_new_i32();



    if (TCG_TARGET_HAS_extract2_i32) {

        if (ofs + len == 32) {

            tcg_gen_shli_i32(t1, arg1, len);

            tcg_gen_extract2_i32(ret, t1, arg2, len);

            goto done;

        }

        if (ofs == 0) {

            tcg_gen_extract2_i32(ret, arg1, arg2, len);

            tcg_gen_rotli_i32(ret, ret, len);

            goto done;

        }

    }



    mask = (1u << len) - 1;

    if (ofs + len < 32) {

        tcg_gen_andi_i32(t1, arg2, mask);

        tcg_gen_shli_i32(t1, t1, ofs);
@@ -622,7 +635,7 @@ void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2, 
    }

    tcg_gen_andi_i32(ret, arg1, ~(mask << ofs));

    tcg_gen_or_i32(ret, ret, t1);



 done:

    tcg_temp_free_i32(t1);

}
@@ -2024,9 +2037,22 @@ void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2, 
        }

    }



    mask = (1ull << len) - 1;

    t1 = tcg_temp_new_i64();



    if (TCG_TARGET_HAS_extract2_i64) {

        if (ofs + len == 64) {

            tcg_gen_shli_i64(t1, arg1, len);

            tcg_gen_extract2_i64(ret, t1, arg2, len);

            goto done;

        }

        if (ofs == 0) {

            tcg_gen_extract2_i64(ret, arg1, arg2, len);

            tcg_gen_rotli_i64(ret, ret, len);

            goto done;

        }

    }



    mask = (1ull << len) - 1;

    if (ofs + len < 64) {

        tcg_gen_andi_i64(t1, arg2, mask);

        tcg_gen_shli_i64(t1, t1, ofs);
@@ -2035,7 +2061,7 @@ void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2, 
    }

    tcg_gen_andi_i64(ret, arg1, ~(mask << ofs));

    tcg_gen_or_i64(ret, ret, t1);



 done:

    tcg_temp_free_i64(t1);

}