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

target/s390x: Remove ilen argument from trigger_pgm_exception 



All but one caller passes ILEN_UNWIND, which is not stored.
For the one use case in s390_cpu_tlb_fill, set int_pgm_ilen
directly, simply to avoid the assert within do_program_interrupt.

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

target/s390x/excp_helper.c

+4 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, 
    cpu_restore_state(cs, ra, true);

    qemu_log_mask(CPU_LOG_INT, "program interrupt at %#" PRIx64 "\n",

                  env->psw.addr);

    trigger_pgm_exception(env, code, ILEN_UNWIND);

    trigger_pgm_exception(env, code);

    cpu_loop_exit(cs);

}
@@ -96,7 +96,7 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size, 
{

    S390CPU *cpu = S390_CPU(cs);



    trigger_pgm_exception(&cpu->env, PGM_ADDRESSING, ILEN_UNWIND);

    trigger_pgm_exception(&cpu->env, PGM_ADDRESSING);

    /* On real machines this value is dropped into LowMem.  Since this

       is userland, simply put this someplace that cpu_loop can find it.  */

    cpu->env.__excp_addr = address;
@@ -186,7 +186,8 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size, 
     * and so unwinding will not occur.  However, ILEN is also undefined

     * for that case -- we choose to set ILEN = 2.

     */

    trigger_pgm_exception(env, excp, 2);

    env->int_pgm_ilen = 2;

    trigger_pgm_exception(env, excp);

    cpu_loop_exit_restore(cs, retaddr);

}

target/s390x/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ void cpu_unmap_lowcore(LowCore *lowcore); 




/* interrupt.c */

void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen);

void trigger_pgm_exception(CPUS390XState *env, uint32_t code);

void cpu_inject_clock_comparator(S390CPU *cpu);

void cpu_inject_cpu_timer(S390CPU *cpu);

void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr);

target/s390x/interrupt.c

+2 −5
Original line number Diff line number Diff line
@@ -22,16 +22,13 @@ 
#endif



/* Ensure to exit the TB after this call! */

void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen)

void trigger_pgm_exception(CPUS390XState *env, uint32_t code)

{

    CPUState *cs = env_cpu(env);



    cs->exception_index = EXCP_PGM;

    env->int_pgm_code = code;

    /* If ILEN_UNWIND, int_pgm_ilen already has the correct value.  */

    if (ilen != ILEN_UNWIND) {

        env->int_pgm_ilen = ilen;

    }

    /* env->int_pgm_ilen is already set, or will be set during unwinding */

}



void s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t ra)

target/s390x/mmu_helper.c

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

        trigger_pgm_exception(env, type);

    }

}