Commit 86c9ab27 authored by Richard Henderson's avatar Richard Henderson
Browse files

target/arm: Fix ubfx et al for aarch64 

The patch in 59a71b4c 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: default avatarRichard Henderson <rth@twiddle.net>
parent a32b6ae8

target/arm/translate-a64.c

+1 −1
Original line number Diff line number Diff line
@@ -3217,7 +3217,7 @@ static void disas_bitfield(DisasContext *s, uint32_t insn) 
    tcg_tmp = read_cpu_reg(s, rn, 1);



    /* Recognize simple(r) extractions.  */

    if (si <= ri) {

    if (si >= ri) {

        /* Wd<s-r:0> = Wn<s:r> */

        len = (si - ri) + 1;

        if (opc == 0) { /* SBFM: ASR, SBFX, SXTB, SXTH, SXTW */