Commit 31b59419 authored by Richard Henderson's avatar Richard Henderson Committed by David Hildenbrand
Browse files

target/s390x: Return exception from mmu_translate_real 



Do not raise the exception directly within mmu_translate_real,
but pass it back so that caller may do so.

Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20191001171614.8405-8-richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
parent 1ab33028

target/s390x/excp_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size, 
        if (!(env->psw.mask & PSW_MASK_64)) {

            vaddr &= 0x7fffffff;

        }

        fail = mmu_translate_real(env, vaddr, access_type, &raddr, &prot);

        excp = 0; /* exception already raised */

        excp = mmu_translate_real(env, vaddr, access_type, &raddr, &prot, &tec);

        fail = excp;

    } else {

        g_assert_not_reached();

    }

target/s390x/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ void probe_write_access(CPUS390XState *env, uint64_t addr, uint64_t len, 
int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc,

                  target_ulong *raddr, int *flags, bool exc);

int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw,

                       target_ulong *addr, int *flags);

                       target_ulong *addr, int *flags, uint64_t *tec);





/* misc_helper.c */

target/s390x/mmu_helper.c

+6 −8
Original line number Diff line number Diff line
@@ -554,14 +554,11 @@ void s390_cpu_virt_mem_handle_exc(S390CPU *cpu, uintptr_t ra) 
 * @param rw     0 = read, 1 = write, 2 = code fetch

 * @param addr   the translated address is stored to this pointer

 * @param flags  the PAGE_READ/WRITE/EXEC flags are stored to this pointer

 * @return       0 if the translation was successful, < 0 if a fault occurred

 * @return       0 = success, != 0, the exception to raise

 */

int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw,

                       target_ulong *addr, int *flags)

                       target_ulong *addr, int *flags, uint64_t *tec)

{

    /* Code accesses have an undefined ilc, let's use 2 bytes. */

    uint64_t tec = (raddr & TARGET_PAGE_MASK) |

                   (rw == MMU_DATA_STORE ? FS_WRITE : FS_READ);

    const bool lowprot_enabled = env->cregs[0] & CR0_LOWPROT;



    *flags = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
@@ -570,9 +567,10 @@ int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw, 
        *flags |= PAGE_WRITE_INV;

        if (is_low_address(raddr) && rw == MMU_DATA_STORE) {

            /* LAP sets bit 56 */

            tec |= 0x80;

            trigger_access_exception(env, PGM_PROTECTION, ILEN_AUTO, tec);

            return -EACCES;

            *tec = (raddr & TARGET_PAGE_MASK)

                 | (rw == MMU_DATA_STORE ? FS_WRITE : FS_READ)

                 | 0x80;

            return PGM_PROTECTION;

        }

    }