[Qemu-commits] [qemu/qemu] a32b6a: tcg/s390: Fix merge error with facilities

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a32b6ae8976ca78483001e98cedea2329076055f
      
https://github.com/qemu/qemu/commit/a32b6ae8976ca78483001e98cedea2329076055f
  Author: Richard Henderson <address@hidden>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M tcg/s390/tcg-target.inc.c

  Log Message:
  -----------
  tcg/s390: Fix merge error with facilities

The variable was renamed s390_facilities.

Signed-off-by: Richard Henderson <address@hidden>


  Commit: 86c9ab277615af4e0389eb80a83073873ff96c86
      
https://github.com/qemu/qemu/commit/86c9ab277615af4e0389eb80a83073873ff96c86
  Author: Richard Henderson <address@hidden>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M target/arm/translate-a64.c

  Log Message:
  -----------
  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 <address@hidden>


  Commit: b1eb20da625897244e9621dabcf63d899deca54d
      
https://github.com/qemu/qemu/commit/b1eb20da625897244e9621dabcf63d899deca54d
  Author: Richard Henderson <address@hidden>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M tcg/aarch64/tcg-target.inc.c

  Log Message:
  -----------
  tcg/aarch64: Fix addsub2 for 0+C

When al == xzr, we cannot use addi/subi because that encodes xsp.
Force a zero into the temp register for that (rare) case.

Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>


  Commit: 8cf9a3d3f7a4b95f33e0bda5416b9c93ec887dd3
      
https://github.com/qemu/qemu/commit/8cf9a3d3f7a4b95f33e0bda5416b9c93ec887dd3
  Author: Richard Henderson <address@hidden>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M tcg/aarch64/tcg-target.inc.c

  Log Message:
  -----------
  tcg/aarch64: Fix tcg_out_movi

There were some patterns, like 0x0000_ffff_ffff_00ff, for which we
would select to begin a multi-insn sequence with MOVN, but would
fail to set the 0x0000 lane back from 0xffff.

Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>


  Commit: 02f50ca0ded973bfff69915ce5dad74a1308fdd2
      
https://github.com/qemu/qemu/commit/02f50ca0ded973bfff69915ce5dad74a1308fdd2
  Author: Peter Maydell <address@hidden>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

  Changed paths:
    M target/arm/translate-a64.c
    M tcg/aarch64/tcg-target.inc.c
    M tcg/s390/tcg-target.inc.c

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Richard Henderson <address@hidden>"
# gpg:                 aka "Richard Henderson <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b6af8ea60282...02f50ca0ded9