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

s390x/tcg: check for AFP-register, BFP and DFP data exceptions 



With the annotated functions, we can now easily check this at a central
place.

DXC 1 is to be injected if an AFP register is used (for a HFP AND FPS
instruction) when AFP is disabled.
DXC 2 is to be injected if a BFP instruction is used when AFP is
disabled.
DXC 3 is to be injected if a DFP instruction is used when AFP is
disabled.

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

target/s390x/translate.c

+33 −0
Original line number Diff line number Diff line
@@ -6094,6 +6094,11 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s, 
    return info;

}



static bool is_afp_reg(int reg)

{

    return reg % 2 || reg > 6;

}



static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)

{

    const DisasInsn *insn;
@@ -6120,6 +6125,34 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s) 
    }

#endif



    /* process flags */

    if (insn->flags) {

        /* if AFP is not enabled, instructions and registers are forbidden */

        if (!(s->base.tb->flags & FLAG_MASK_AFP)) {

            uint8_t dxc = 0;



            if ((insn->flags & IF_AFP1) && is_afp_reg(get_field(&f, r1))) {

                dxc = 1;

            }

            if ((insn->flags & IF_AFP2) && is_afp_reg(get_field(&f, r2))) {

                dxc = 1;

            }

            if ((insn->flags & IF_AFP3) && is_afp_reg(get_field(&f, r3))) {

                dxc = 1;

            }

            if (insn->flags & IF_BFP) {

                dxc = 2;

            }

            if (insn->flags & IF_DFP) {

                dxc = 3;

            }

            if (dxc) {

                gen_data_exception(dxc);

                return DISAS_NORETURN;

            }

        }

    }



    /* Check for insn specification exceptions.  */

    if (insn->spec) {

        int spec = insn->spec, excp = 0, r;