Received: from eggs.gnu.org ([2001:4830:134:3::10]:52969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Za6RB-0000Uf-5O for qemu-devel@nongnu.org; Thu, 10 Sep 2015 14:19:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Za6R8-0001pb-V1 for qemu-devel@nongnu.org; Thu, 10 Sep 2015 14:19:09 -0400 Received: from mail-qk0-x235.google.com ([2607:f8b0:400d:c09::235]:34700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Za6R8-0001pR-On for qemu-devel@nongnu.org; Thu, 10 Sep 2015 14:19:06 -0400 Received: by qkfq186 with SMTP id q186so22017843qkf.1 for ; Thu, 10 Sep 2015 11:19:06 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Thu, 10 Sep 2015 11:18:22 -0700 Message-Id: <1441909103-24666-11-git-send-email-rth@twiddle.net> In-Reply-To: <1441909103-24666-1-git-send-email-rth@twiddle.net> References: <1441909103-24666-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v3 10/11] target-arm: Recognize ROR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target-arm/translate-a64.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 56aa043..0bb12c2 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -3117,17 +3117,7 @@ static void disas_extract(DisasContext *s, uint32_t insn) tcg_rd = cpu_reg(s, rd); - if (imm) { - /* OPTME: we can special case rm==rn as a rotate */ - 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); - } - } else { + if (unlikely(imm == 0)) { /* tcg shl_i32/shl_i64 is undefined for 32/64 bit shifts, * so an extract from bit 0 is a special case. */ @@ -3136,8 +3126,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 */ + tcg_rm = cpu_reg(s, rm); + if (sf) { + tcg_gen_rotri_i64(tcg_rd, tcg_rm, 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); + } + } 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); + } } - } } -- 2.4.3