Commit 80ac954c authored by Richard Henderson's avatar Richard Henderson Committed by Peter Maydell
Browse files

target/arm: Use extract2 for EXTR 



This is, after all, how we implement extract2 in tcg/aarch64.

Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20190514011129.11330-2-richard.henderson@linaro.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent d418238d

target/arm/translate-a64.c

+18 −16
Original line number Diff line number Diff line
@@ -4114,25 +4114,27 @@ static void disas_extract(DisasContext *s, uint32_t insn) 
            } else {

                tcg_gen_ext32u_i64(tcg_rd, cpu_reg(s, rm));

            }

        } else if (rm == rn) { /* ROR */

        } else {

            tcg_rm = cpu_reg(s, rm);

            tcg_rn = cpu_reg(s, rn);



            if (sf) {

                tcg_gen_rotri_i64(tcg_rd, tcg_rm, imm);

                /* Specialization to ROR happens in EXTRACT2.  */

                tcg_gen_extract2_i64(tcg_rd, tcg_rm, tcg_rn, imm);

            } else {

                TCGv_i32 tmp = tcg_temp_new_i32();

                tcg_gen_extrl_i64_i32(tmp, tcg_rm);

                tcg_gen_rotri_i32(tmp, tmp, imm);

                tcg_gen_extu_i32_i64(tcg_rd, tmp);

                tcg_temp_free_i32(tmp);

            }

                TCGv_i32 t0 = tcg_temp_new_i32();



                tcg_gen_extrl_i64_i32(t0, tcg_rm);

                if (rm == rn) {

                    tcg_gen_rotri_i32(t0, t0, imm);

                } else {

            tcg_rm = read_cpu_reg(s, rm, sf);

            tcg_rn = read_cpu_reg(s, rn, sf);

            tcg_gen_shri_i64(tcg_rm, tcg_rm, imm);

            tcg_gen_shli_i64(tcg_rn, tcg_rn, bitsize - imm);

            tcg_gen_or_i64(tcg_rd, tcg_rm, tcg_rn);

            if (!sf) {

                tcg_gen_ext32u_i64(tcg_rd, tcg_rd);

                    TCGv_i32 t1 = tcg_temp_new_i32();

                    tcg_gen_extrl_i64_i32(t1, tcg_rn);

                    tcg_gen_extract2_i32(t0, t0, t1, imm);

                    tcg_temp_free_i32(t1);

                }

                tcg_gen_extu_i32_i64(tcg_rd, t0);

                tcg_temp_free_i32(t0);

            }

        }

    }