diff options
| author | Peter Maydell | 2017-01-16 12:17:38 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-01-16 12:17:38 +0100 |
| commit | 02f50ca0ded973bfff69915ce5dad74a1308fdd2 (patch) | |
| tree | e423409b726b4d94981140eb37dc51087753d7e4 /target | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-requ... (diff) | |
| parent | tcg/aarch64: Fix tcg_out_movi (diff) | |
| download | qemu-02f50ca0ded973bfff69915ce5dad74a1308fdd2.tar.gz qemu-02f50ca0ded973bfff69915ce5dad74a1308fdd2.tar.xz qemu-02f50ca0ded973bfff69915ce5dad74a1308fdd2.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170113' into staging
Fixes and more queued patches
# gpg: Signature made Fri 13 Jan 2017 20:00:53 GMT
# gpg: using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B
* remotes/rth/tags/pull-tcg-20170113:
tcg/aarch64: Fix tcg_out_movi
tcg/aarch64: Fix addsub2 for 0+C
target/arm: Fix ubfx et al for aarch64
tcg/s390: Fix merge error with facilities
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/translate-a64.c | 2 |
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 */ |