From 9924e85829fe21b5f38a5d267c9aea44c5d478ac Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 14 Sep 2015 14:39:48 +0100 Subject: [PATCH] target-arm: Recognize UXTB, UXTH, LSR, LSL These are all special case aliases of UBFM. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 1441909103-24666-9-git-send-email-rth@twiddle.net Signed-off-by: Peter Maydell --- target-arm/translate-a64.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 8ae68148ef..f2f8443483 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -3038,6 +3038,23 @@ static void disas_bitfield(DisasContext *s, uint32_t insn) tcg_gen_sari_i64(tcg_rd, tcg_tmp, ri); goto done; } + } else if (opc == 2) { /* UBFM */ + if (ri == 0) { /* UXTB, UXTH, plus non-canonical AND */ + tcg_gen_andi_i64(tcg_rd, tcg_tmp, bitmask64(si + 1)); + return; + } + if (si == 63 || (si == 31 && ri <= si)) { /* LSR */ + if (si == 31) { + tcg_gen_ext32u_i64(tcg_tmp, tcg_tmp); + } + tcg_gen_shri_i64(tcg_rd, tcg_tmp, ri); + return; + } + if (si + 1 == ri && si != bitsize - 1) { /* LSL */ + int shift = bitsize - 1 - si; + tcg_gen_shli_i64(tcg_rd, tcg_tmp, shift); + goto done; + } } if (opc != 1) { /* SBFM or UBFM */