diff options
| author | Helge Deller <deller@gmx.de> | 2018-10-07 22:51:53 +0200 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2018-10-16 15:32:22 -0700 |
| commit | 5f538f75324ef69d624b5f71ab2c7f4e72a7d744 (patch) | |
| tree | f51b2206a8b8a62467933cacc8cbbd853bc91995 /target | |
| parent | 09558375a634e17cea6cfbfec883ac2376d2dc7f (diff) | |
| download | qemu-5f538f75324ef69d624b5f71ab2c7f4e72a7d744.zip qemu-5f538f75324ef69d624b5f71ab2c7f4e72a7d744.tar.gz qemu-5f538f75324ef69d624b5f71ab2c7f4e72a7d744.tar.bz2 | |
target/hppa: Raise exception 26 on emulated hardware
On PCXS chips (PA7000, pa 1.1a), trap #18 is raised on memory faults,
while all later chips (>= PA7100) generate either trap #26, #27 or #28
(depending on the fault type).
Since the current qemu emulation emulates a B160L machine (with a
PA7300LC PCX-L2 chip, we should raise trap #26 (EXCP_DMAR) instead
of #18 (EXCP_DMP) on access faults by the Linux kernel to page zero.
With the patch we now get the correct output (I tested against real
hardware):
Kernel Fault: Code=26 (Data memory access rights trap)
instead of:
Kernel Fault: Code=18 (Data memory protection/unaligned access trap)
Signed-off-by: Helge Deller <deller@gmx.de>
Message-Id: <20181007205153.GA30270@ls3530.fritz.box>
Signed-off-by: Richard Henderson <richard.henderson@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; } |