aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-08-19 09:35:29 -0700
committerRichard Henderson <richard.henderson@linaro.org>2022-08-19 09:35:29 -0700
commitba58ccbef60338d0b7334c714589a6423a3e7f91 (patch)
treeb525d7a7337eff44ae76e84316fd381718a49747
parenta78241a62b55b202b29f3b190bdca3c3a425e693 (diff)
parent6fab0c182dabaca5b3d56e60a8de3122ce9afbea (diff)
downloadqemu-ba58ccbef60338d0b7334c714589a6423a3e7f91.zip
qemu-ba58ccbef60338d0b7334c714589a6423a3e7f91.tar.gz
qemu-ba58ccbef60338d0b7334c714589a6423a3e7f91.tar.bz2
Merge tag 'for-7.1-hppa' of https://github.com/hdeller/qemu-hppa into staging
target/hppa: Fix proberi instruction emulation for linux-user # -----BEGIN PGP SIGNATURE----- # # iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCYv+X7AAKCRD3ErUQojoP # XyGaAQCUaZmTFIEMz7TOjPCz1ix8MaLTrQH8B/gAt3Ss9hXvKgD/ZtOItG3Iz8y0 # tHslvPvJKHlr8s5Ol9rxRPzRG7iigAo= # =DQho # -----END PGP SIGNATURE----- # gpg: Signature made Fri 19 Aug 2022 07:02:20 AM PDT # gpg: using EDDSA key BCE9123E1AD29F07C049BBDEF712B510A23A0F5F # gpg: Good signature from "Helge Deller <deller@gmx.de>" [unknown] # gpg: aka "Helge Deller <deller@kernel.org>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 4544 8228 2CD9 10DB EF3D 25F8 3E5F 3D04 A7A2 4603 # Subkey fingerprint: BCE9 123E 1AD2 9F07 C049 BBDE F712 B510 A23A 0F5F * tag 'for-7.1-hppa' of https://github.com/hdeller/qemu-hppa: target/hppa: Fix proberi instruction emulation for linux-user Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-rw-r--r--target/hppa/op_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c
index cd304f0..fbd80e4 100644
--- a/target/hppa/op_helper.c
+++ b/target/hppa/op_helper.c
@@ -170,7 +170,7 @@ target_ureg HELPER(probe)(CPUHPPAState *env, target_ulong addr,
uint32_t level, uint32_t want)
{
#ifdef CONFIG_USER_ONLY
- return page_check_range(addr, 1, want);
+ return (page_check_range(addr, 1, want) == 0) ? 1 : 0;
#else
int prot, excp;
hwaddr phys;