diff options
| author | Peter Maydell | 2017-10-31 15:28:25 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-10-31 15:28:25 +0100 |
| commit | 7fa00e204902cee0b33a0c60de87e87319d1809f (patch) | |
| tree | 7c8c89f0d14e2c1f676a1bfcd1265fefdcc3b5d2 /target/arm/helper.h | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-10-30' into st... (diff) | |
| parent | hw/pci-host/gpex: Improve INTX to gsi routing error checking (diff) | |
| download | qemu-7fa00e204902cee0b33a0c60de87e87319d1809f.tar.gz qemu-7fa00e204902cee0b33a0c60de87e87319d1809f.tar.xz qemu-7fa00e204902cee0b33a0c60de87e87319d1809f.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171031' into staging
target-arm queue:
* fix instruction-length bit in syndrome for WFI/WFE traps
* xlnx-zcu102: Specify the max number of CPUs
* msf2: Remove dead code reported by Coverity
* msf2: Wire up SYSRESETREQ in SoC for system reset
* hw/pci-host/gpex: Improve INTX to gsi routing error checking
# gpg: Signature made Tue 31 Oct 2017 13:10:02 GMT
# gpg: using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE
* remotes/pmaydell/tags/pull-target-arm-20171031:
hw/pci-host/gpex: Improve INTX to gsi routing error checking
msf2: Wire up SYSRESETREQ in SoC for system reset
msf2: Remove dead code reported by Coverity
xlnx-zcu102: Specify the max number of CPUs
fix WFI/WFE length in syndrome register
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm/helper.h')
| -rw-r--r-- | target/arm/helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/helper.h b/target/arm/helper.h index 2cf6f74152..439d228420 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -48,7 +48,7 @@ DEF_HELPER_FLAGS_3(sel_flags, TCG_CALL_NO_RWG_SE, DEF_HELPER_2(exception_internal, void, env, i32) DEF_HELPER_4(exception_with_syndrome, void, env, i32, i32, i32) DEF_HELPER_1(setend, void, env) -DEF_HELPER_1(wfi, void, env) +DEF_HELPER_2(wfi, void, env, i32) DEF_HELPER_1(wfe, void, env) DEF_HELPER_1(yield, void, env) DEF_HELPER_1(pre_hvc, void, env) |