s390x/tcg: drop program_interrupt()
All users are gone, we can finally drop it and make sure that all new program interrupt injections are reminded of the retaddr - as they have to use s390_program_interrupt() now. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20171130162744.25442-16-david@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
parent
5e8f154e88
commit
51dcdbd319
|
@ -719,7 +719,6 @@ void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,
|
||||||
uint32_t io_int_parm, uint32_t io_int_word);
|
uint32_t io_int_parm, uint32_t io_int_word);
|
||||||
/* automatically detect the instruction length */
|
/* automatically detect the instruction length */
|
||||||
#define ILEN_AUTO 0xff
|
#define ILEN_AUTO 0xff
|
||||||
void program_interrupt(CPUS390XState *env, uint32_t code, int ilen);
|
|
||||||
#define RA_IGNORED 0
|
#define RA_IGNORED 0
|
||||||
void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,
|
void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,
|
||||||
uintptr_t ra);
|
uintptr_t ra);
|
||||||
|
|
|
@ -27,17 +27,18 @@ void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,
|
static void tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code,
|
||||||
int ilen)
|
int ilen, uintptr_t ra)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_TCG
|
#ifdef CONFIG_TCG
|
||||||
trigger_pgm_exception(env, code, ilen);
|
trigger_pgm_exception(env, code, ilen);
|
||||||
cpu_loop_exit(CPU(s390_env_get_cpu(env)));
|
cpu_loop_exit_restore(CPU(s390_env_get_cpu(env)), ra);
|
||||||
#else
|
#else
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void program_interrupt(CPUS390XState *env, uint32_t code, int ilen)
|
void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,
|
||||||
|
uintptr_t ra)
|
||||||
{
|
{
|
||||||
S390CPU *cpu = s390_env_get_cpu(env);
|
S390CPU *cpu = s390_env_get_cpu(env);
|
||||||
|
|
||||||
|
@ -47,25 +48,12 @@ void program_interrupt(CPUS390XState *env, uint32_t code, int ilen)
|
||||||
if (kvm_enabled()) {
|
if (kvm_enabled()) {
|
||||||
kvm_s390_program_interrupt(cpu, code);
|
kvm_s390_program_interrupt(cpu, code);
|
||||||
} else if (tcg_enabled()) {
|
} else if (tcg_enabled()) {
|
||||||
tcg_s390_program_interrupt(env, code, ilen);
|
tcg_s390_program_interrupt(env, code, ilen, ra);
|
||||||
} else {
|
} else {
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen,
|
|
||||||
uintptr_t ra)
|
|
||||||
{
|
|
||||||
#ifdef CONFIG_TCG
|
|
||||||
S390CPU *cpu = s390_env_get_cpu(env);
|
|
||||||
|
|
||||||
if (tcg_enabled()) {
|
|
||||||
cpu_restore_state(CPU(cpu), ra);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
program_interrupt(env, code, ilen);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if !defined(CONFIG_USER_ONLY)
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
static void cpu_inject_service(S390CPU *cpu, uint32_t param)
|
static void cpu_inject_service(S390CPU *cpu, uint32_t param)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue