target/arm: Fix ubfx et al for aarch64

The patch in 59a71b4c5b suffered from a merge failure
when compared to the original patch in

  http://lists.nongnu.org/archive/html/qemu-devel/2016-12/msg00137.html

Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2017-01-13 09:48:20 -08:00
parent a32b6ae897
commit 86c9ab2776

View File

@ -3217,7 +3217,7 @@ static void disas_bitfield(DisasContext *s, uint32_t insn)
tcg_tmp = read_cpu_reg(s, rn, 1); tcg_tmp = read_cpu_reg(s, rn, 1);
/* Recognize simple(r) extractions. */ /* Recognize simple(r) extractions. */
if (si <= ri) { if (si >= ri) {
/* Wd<s-r:0> = Wn<s:r> */ /* Wd<s-r:0> = Wn<s:r> */
len = (si - ri) + 1; len = (si - ri) + 1;
if (opc == 0) { /* SBFM: ASR, SBFX, SXTB, SXTH, SXTW */ if (opc == 0) { /* SBFM: ASR, SBFX, SXTB, SXTH, SXTW */