Queued hppa patch

-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJbxmoaAAoJEGTfOOivfiFfED8H/1d8aZJnLF4jUYsSPOc6/NyK
 ra45GAZlwC7DhMw7eppg1tI+qSNxKswcuhpHgXUOo6CV7xn7B2ajDVxpnWo4WpxC
 HTLDfMT+WmkgL1xOVEa2PYTt5ktvp0gzzZRq0ZfFnhwZzTTwYVlSaSM6eXEAhdLx
 3gUM3q0p16gHI61GKqr1QlTdDd6F814wLajyjMo/vPwnRUKy6vbvuu1JKKPM5xLg
 2H61zRX4NGCAkzARQI4qyd2o3T6G1J5NTJfwEY0HewDacXWVRVCLEb+xkGpuI2VL
 6zwifzR9pGl6lNUq0P+d4E0N8X1C0mqAkO4HyMxT6jG36nMz7dYKZkhs+VZTM2k=
 =sf5e
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20181016' into staging

Queued hppa patch

# gpg: Signature made Tue 16 Oct 2018 23:45:46 BST
# gpg:                using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-hppa-20181016:
  target/hppa: Raise exception 26 on emulated hardware

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
Peter Maydell 2018-10-18 11:35:00 +01:00
commit b151fc0e43
1 changed files with 2 additions and 1 deletions

View File

@ -137,7 +137,8 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx,
if (unlikely(!(prot & type))) {
/* The access isn't allowed -- Inst/Data Memory Protection Fault. */
ret = (type & PAGE_EXEC ? EXCP_IMP : EXCP_DMP);
ret = (type & PAGE_EXEC ? EXCP_IMP :
prot & PAGE_READ ? EXCP_DMP : EXCP_DMAR);
goto egress;
}