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

target/s390x: Simplify helper_lra 



We currently call trigger_pgm_exception to set cs->exception_index
and env->int_pgm_code and then read the values back and then
reset cs->exception_index so that the exception is not delivered.

Instead, use the exception type that we already have directly
without ever triggering an exception that must be suppressed.

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

target/s390x/mem_helper.c

+3 −14
Original line number Diff line number Diff line
@@ -2361,34 +2361,23 @@ void HELPER(sturg)(CPUS390XState *env, uint64_t addr, uint64_t v1) 
/* load real address */

uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr)

{

    CPUState *cs = env_cpu(env);

    uint32_t cc = 0;

    uint64_t asc = env->psw.mask & PSW_MASK_ASC;

    uint64_t ret, tec;

    int old_exc, flags, exc;

    int flags, exc, cc;



    /* XXX incomplete - has more corner cases */

    if (!(env->psw.mask & PSW_MASK_64) && (addr >> 32)) {

        tcg_s390_program_interrupt(env, PGM_SPECIAL_OP, GETPC());

    }



    old_exc = cs->exception_index;

    exc = mmu_translate(env, addr, 0, asc, &ret, &flags, &tec);

    if (exc) {

        /*

         * We don't care about ILEN or TEC, as we're not going to

         * deliver the exception -- thus resetting exception_index below.

         * TODO: clean this up.

         */

        trigger_pgm_exception(env, exc, ILEN_UNWIND);

        cc = 3;

    }

    if (cs->exception_index == EXCP_PGM) {

        ret = env->int_pgm_code | 0x80000000;

        ret = exc | 0x80000000;

    } else {

        cc = 0;

        ret |= addr & ~TARGET_PAGE_MASK;

    }

    cs->exception_index = old_exc;



    env->cc_op = cc;

    return ret;