Commit b151fc0e authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 09558375 5f538f75

target/hppa/mem_helper.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }