summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRichard Henderson2017-01-13 18:48:20 +0100
committerRichard Henderson2017-01-13 18:48:20 +0100
commit86c9ab277615af4e0389eb80a83073873ff96c86 (patch)
treeecc3296283a035e0b27a130bd4c94ec208ea6ffa /target
parenttcg/s390: Fix merge error with facilities (diff)
downloadqemu-86c9ab277615af4e0389eb80a83073873ff96c86.tar.gz
qemu-86c9ab277615af4e0389eb80a83073873ff96c86.tar.xz
qemu-86c9ab277615af4e0389eb80a83073873ff96c86.zip
target/arm: Fix ubfx et al for aarch64
The patch in 59a71b4c5b4e 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>
Diffstat (limited to 'target')
-rw-r--r--target/arm/translate-a64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index 4f09dfb95a..d0352e2045 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -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 */