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

target/s390x: Remove ilen argument from trigger_access_exception 



The single caller passes ILEN_UNWIND; pass that along to
trigger_pgm_exception directly.

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

target/s390x/mmu_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define FS_WRITE 0x400



static void trigger_access_exception(CPUS390XState *env, uint32_t type,

                                     uint32_t ilen, uint64_t tec)

                                     uint64_t tec)

{

    S390CPU *cpu = env_archcpu(env);
@@ -44,7 +44,7 @@ static void trigger_access_exception(CPUS390XState *env, uint32_t type, 
        if (type != PGM_ADDRESSING) {

            stq_phys(cs->as, env->psa + offsetof(LowCore, trans_exc_code), tec);

        }

        trigger_pgm_exception(env, type, ilen);

        trigger_pgm_exception(env, type, ILEN_UNWIND);

    }

}
@@ -510,7 +510,7 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf, 


    ret = translate_pages(cpu, laddr, nr_pages, pages, is_write, &tec);

    if (ret) {

        trigger_access_exception(&cpu->env, ret, ILEN_UNWIND, tec);

        trigger_access_exception(&cpu->env, ret, tec);

    } else if (hostbuf != NULL) {

        /* Copy data by stepping through the area page by page */

        for (i = 0; i < nr_pages; i++) {