diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-18 11:35:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-18 11:35:00 +0100 |
| commit | b151fc0e431ae75f456e3f768bcb73c9920f70c5 (patch) | |
| tree | f51b2206a8b8a62467933cacc8cbbd853bc91995 /target | |
| parent | 09558375a634e17cea6cfbfec883ac2376d2dc7f (diff) | |
| parent | 5f538f75324ef69d624b5f71ab2c7f4e72a7d744 (diff) | |
| download | qemu-b151fc0e431ae75f456e3f768bcb73c9920f70c5.zip qemu-b151fc0e431ae75f456e3f768bcb73c9920f70c5.tar.gz qemu-b151fc0e431ae75f456e3f768bcb73c9920f70c5.tar.bz2 | |
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>
Diffstat (limited to 'target')
| -rw-r--r-- | target/hppa/mem_helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index ab160c2..aecf307 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -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; } |