From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 16 Aug 2019 16:21:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190816' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=afd760539308a5524accf964107cdb1d54a059e3;p=qemu.git

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190816' into staging

target-arm queue:
 * target/arm: generate a custom MIDR for -cpu max
 * hw/misc/zynq_slcr: refactor to use standard register definition
 * Set ENET_BD_BDU in I.MX FEC controller
 * target/arm: Fix routing of singlestep exceptions
 * refactor a32/t32 decoder handling of PC
 * minor optimisations/cleanups of some a32/t32 codegen
 * target/arm/cpu64: Ensure kvm really supports aarch64=off
 * target/arm/cpu: Ensure we can use the pmu with kvm
 * target/arm: Minor cleanups preparatory to KVM SVE support

# gpg: Signature made Fri 16 Aug 2019 14:15:55 BST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20190816: (29 commits)
  target/arm: Use tcg_gen_extrh_i64_i32 to extract the high word
  target/arm: Simplify SMMLA, SMMLAR, SMMLS, SMMLSR
  target/arm: Use tcg_gen_rotri_i32 for gen_swap_half
  target/arm: Use ror32 instead of open-coding the operation
  target/arm: Remove redundant shift tests
  target/arm: Use tcg_gen_deposit_i32 for PKHBT, PKHTB
  target/arm: Use tcg_gen_extract_i32 for shifter_out_im
  target/arm/kvm64: Move the get/put of fpsimd registers out
  target/arm/kvm64: Fix error returns
  target/arm/cpu: Use div-round-up to determine predicate register array size
  target/arm/helper: zcr: Add build bug next to value range assumption
  target/arm/cpu: Ensure we can use the pmu with kvm
  target/arm/cpu64: Ensure kvm really supports aarch64=off
  target/arm: Remove helper_double_saturate
  target/arm: Use unallocated_encoding for aarch32
  target/arm: Remove offset argument to gen_exception_bkpt_insn
  target/arm: Replace offset with pc in gen_exception_internal_insn
  target/arm: Replace offset with pc in gen_exception_insn
  target/arm: Replace s->pc with s->base.pc_next
  target/arm: Remove redundant s->pc & ~1
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

afd760539308a5524accf964107cdb1d54a059e3
diff --cc hw/misc/zynq_slcr.c
index 04adf618e5,dd766a6779..b9a38272d9
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@@ -15,12 -15,13 +15,13 @@@
   */
  
  #include "qemu/osdep.h"
 -#include "hw/hw.h"
  #include "qemu/timer.h"
 +#include "sysemu/runstate.h"
  #include "hw/sysbus.h"
 -#include "sysemu/sysemu.h"
 +#include "migration/vmstate.h"
  #include "qemu/log.h"
  #include "qemu/module.h"
+ #include "hw/registerfields.h"
  
  #ifndef ZYNQ_SLCR_ERR_DEBUG
  #define ZYNQ_SLCR_ERR_DEBUG 0
diff --cc target/arm/kvm64.c
index 59ed579d02,0b004d5d30..28f6db57d5
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@@ -21,10 -21,12 +21,12 @@@
  #include "qemu/timer.h"
  #include "qemu/error-report.h"
  #include "qemu/host-utils.h"
 +#include "qemu/main-loop.h"
  #include "exec/gdbstub.h"
 -#include "sysemu/sysemu.h"
  #include "sysemu/kvm.h"
+ #include "sysemu/kvm_int.h"
  #include "kvm_arm.h"
+ #include "hw/boards.h"
  #include "internals.h"
  
  static bool have_guest_debug;