Commit 52341ed6 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x: move tcg_s390_program_interrupt() into TCG code and mark it noreturn 



Move it into TCG-only code and provide a stub. Turn it into noreturn.

As Richard noted, we currently don't log the psw.addr before restoring
the state, fix that by moving (duplicating) the qemu_log_mask in the
tcg/kvm handlers.

Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20180927130303.12236-2-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent ae4b5a54

target/s390x/excp_helper.c

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "exec/cpu_ldst.h"

#include "hw/s390x/ioinst.h"

#include "exec/address-spaces.h"

#include "tcg_s390x.h"

#ifndef CONFIG_USER_ONLY

#include "sysemu/sysemu.h"

#include "hw/s390x/s390_flic.h"
@@ -48,6 +49,18 @@ 
    do { } while (0)

#endif



void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,

                                              int ilen, uintptr_t ra)

{

    CPUState *cs = CPU(s390_env_get_cpu(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);

    cpu_loop_exit(cs);

}



#if defined(CONFIG_USER_ONLY)



void s390_cpu_do_interrupt(CPUState *cs)

target/s390x/interrupt.c

+1 −14
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "exec/exec-all.h"

#include "sysemu/kvm.h"

#include "hw/s390x/ioinst.h"

#include "tcg_s390x.h"

#if !defined(CONFIG_USER_ONLY)

#include "hw/s390x/s390_flic.h"

#endif
@@ -29,25 +30,11 @@ void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen) 
    env->int_pgm_ilen = ilen;

}



static void tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,

                                       int ilen, uintptr_t ra)

{

#ifdef CONFIG_TCG

    trigger_pgm_exception(env, code, ilen);

    cpu_loop_exit_restore(CPU(s390_env_get_cpu(env)), ra);

#else

    g_assert_not_reached();

#endif

}



void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,

                            uintptr_t ra)

{

    S390CPU *cpu = s390_env_get_cpu(env);



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

                  env->psw.addr);



    if (kvm_enabled()) {

        kvm_s390_program_interrupt(cpu, code);

    } else if (tcg_enabled()) {

target/s390x/kvm.c

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "qemu/timer.h"

#include "qemu/units.h"

#include "qemu/mmap-alloc.h"

#include "qemu/log.h"

#include "sysemu/sysemu.h"

#include "sysemu/hw_accel.h"

#include "hw/hw.h"
@@ -1115,7 +1116,8 @@ void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code) 
        .type = KVM_S390_PROGRAM_INT,

        .u.pgm.code = code,

    };



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

                  cpu->env.psw.addr);

    kvm_s390_vcpu_interrupt(cpu, &irq);

}

target/s390x/tcg-stub.c

+5 −0
Original line number Diff line number Diff line
@@ -18,3 +18,8 @@ 
void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque)

{

}

void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,

                                              int ilen, uintptr_t ra)

{

    g_assert_not_reached();

}

target/s390x/tcg_s390x.h

+2 −0
Original line number Diff line number Diff line
@@ -14,5 +14,7 @@ 
#define TCG_S390X_H



void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque);

void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,

                                              int ilen, uintptr_t ra);



#endif /* TCG_S390X_H */