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

s390x/tcg: wire up STORE CHANNEL REPORT WORD 



CRW machine check handling requires STCRW. So let's wire it up.

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

target/s390x/helper.h

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ DEF_HELPER_3(msch, void, env, i64, i64) 
DEF_HELPER_2(rchp, void, env, i64)

DEF_HELPER_2(rsch, void, env, i64)

DEF_HELPER_3(ssch, void, env, i64, i64)

DEF_HELPER_2(stcrw, void, env, i64)

DEF_HELPER_3(stsch, void, env, i64, i64)

DEF_HELPER_3(tsch, void, env, i64, i64)

DEF_HELPER_2(chsc, void, env, i64)

target/s390x/insn-data.def

+1 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,7 @@ 
    C(0xb23b, RCHP,    S,     Z,   0, 0, 0, 0, rchp, 0)

    C(0xb238, RSCH,    S,     Z,   0, 0, 0, 0, rsch, 0)

    C(0xb233, SSCH,    S,     Z,   0, insn, 0, 0, ssch, 0)

    C(0xb239, STCRW,   S,     Z,   0, insn, 0, 0, stcrw, 0)

    C(0xb234, STSCH,   S,     Z,   0, insn, 0, 0, stsch, 0)

    C(0xb235, TSCH,    S,     Z,   0, insn, 0, 0, tsch, 0)

    /* ??? Not listed in PoO ninth edition, but there's a linux driver that

target/s390x/misc_helper.c

+9 −0
Original line number Diff line number Diff line
@@ -385,6 +385,15 @@ void HELPER(ssch)(CPUS390XState *env, uint64_t r1, uint64_t inst) 
    qemu_mutex_unlock_iothread();

}



void HELPER(stcrw)(CPUS390XState *env, uint64_t inst)

{

    S390CPU *cpu = s390_env_get_cpu(env);



    qemu_mutex_lock_iothread();

    ioinst_handle_stcrw(cpu, inst >> 16, GETPC());

    qemu_mutex_unlock_iothread();

}



void HELPER(stsch)(CPUS390XState *env, uint64_t r1, uint64_t inst)

{

    S390CPU *cpu = s390_env_get_cpu(env);

target/s390x/translate.c

+8 −0
Original line number Diff line number Diff line
@@ -4071,6 +4071,14 @@ static ExitStatus op_stsch(DisasContext *s, DisasOps *o) 
    return NO_EXIT;

}



static ExitStatus op_stcrw(DisasContext *s, DisasOps *o)

{

    check_privileged(s);

    gen_helper_stcrw(cpu_env, o->in2);

    set_cc_static(s);

    return NO_EXIT;

}



static ExitStatus op_tsch(DisasContext *s, DisasOps *o)

{

    check_privileged(s);