Commit 51dcdbd3 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

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: 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: <20171130162744.25442-16-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 5e8f154e

target/s390x/cpu.h

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

/* automatically detect the instruction length */

#define ILEN_AUTO                   0xff

void program_interrupt(CPUS390XState *env, uint32_t code, int ilen);

#define RA_IGNORED                  0

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

                            uintptr_t ra);

target/s390x/interrupt.c

+5 −17
Original line number Diff line number Diff line
@@ -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,

                                       int ilen)

                                       int ilen, uintptr_t ra)

{

#ifdef CONFIG_TCG

    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

    g_assert_not_reached();

#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);
@@ -47,25 +48,12 @@ void program_interrupt(CPUS390XState *env, uint32_t code, int ilen) 
    if (kvm_enabled()) {

        kvm_s390_program_interrupt(cpu, code);

    } else if (tcg_enabled()) {

        tcg_s390_program_interrupt(env, code, ilen);

        tcg_s390_program_interrupt(env, code, ilen, ra);

    } else {

        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)

static void cpu_inject_service(S390CPU *cpu, uint32_t param)

{