Commit 72d8ad67 authored by Richard Henderson's avatar Richard Henderson
Browse files

target/s390x: Skip wout, cout helpers if op helper does not return 



When op raises an exception, it may not have initialized the output
temps that would be written back by wout or cout.

Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 0c9fa168

target/s390x/translate.c

+15 −5
Original line number Diff line number Diff line
@@ -1128,11 +1128,19 @@ struct DisasInsn { 


    const char *name;



    /* Pre-process arguments before HELP_OP.  */

    void (*help_in1)(DisasContext *, DisasFields *, DisasOps *);

    void (*help_in2)(DisasContext *, DisasFields *, DisasOps *);

    void (*help_prep)(DisasContext *, DisasFields *, DisasOps *);



    /*

     * Post-process output after HELP_OP.

     * Note that these are not called if HELP_OP returns DISAS_NORETURN.

     */

    void (*help_wout)(DisasContext *, DisasFields *, DisasOps *);

    void (*help_cout)(DisasContext *, DisasOps *);



    /* Implement the operation itself.  */

    DisasJumpType (*help_op)(DisasContext *, DisasOps *);



    uint64_t data;
@@ -6125,12 +6133,14 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s) 
    if (insn->help_op) {

        ret = insn->help_op(s, &o);

    }

    if (ret != DISAS_NORETURN) {

        if (insn->help_wout) {

            insn->help_wout(s, &f, &o);

        }

        if (insn->help_cout) {

            insn->help_cout(s, &o);

        }

    }



    /* Free any temporaries created by the helpers.  */

    if (o.out && !o.g_out) {