Commit 5e8f154e authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/tcg: use s390_program_interrupt() in STSI 



STSI needs some more love, but let's do one step at a time.
We can now drop potential_page_fault().

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-15-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 005a0491

target/s390x/misc_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, 
    if ((r0 & STSI_LEVEL_MASK) <= STSI_LEVEL_3 &&

        ((r0 & STSI_R0_RESERVED_MASK) || (r1 & STSI_R1_RESERVED_MASK))) {

        /* valid function code, invalid reserved bits */

        program_interrupt(env, PGM_SPECIFICATION, 4);

        s390_program_interrupt(env, PGM_SPECIFICATION, 4, GETPC());

    }



    sel1 = r0 & STSI_R0_SEL1_MASK;

target/s390x/translate.c

+0 −1
Original line number Diff line number Diff line
@@ -3988,7 +3988,6 @@ static ExitStatus op_stpt(DisasContext *s, DisasOps *o) 
static ExitStatus op_stsi(DisasContext *s, DisasOps *o)

{

    check_privileged(s);

    potential_page_fault(s);

    gen_helper_stsi(cc_op, cpu_env, o->in2, regs[0], regs[1]);

    set_cc_static(s);

    return NO_EXIT;