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

s390x/tcg: fix FP register pair checks 



Valid register pairs are 0/2, 1/3, 4/6, 5/7, 8/10, 9/11, 12/14, 13/15.

R1/R2 always selects the lower number, so the current checks are not
correct as e.g. 2/4 could be selected as a pair.

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

target/s390x/translate.c

+10 −10
Original line number Diff line number Diff line
@@ -6024,6 +6024,12 @@ static bool is_afp_reg(int reg) 
    return reg % 2 || reg > 6;

}



static bool is_fp_pair(int reg)

{

    /* 0,1,4,5,8,9,12,13: to exclude the others, check for single bit */

    return !(reg & 0x2);

}



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

{

    const DisasInsn *insn;
@@ -6106,18 +6112,12 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s) 
                excp = PGM_SPECIFICATION;

            }

        }

        if (spec & SPEC_r1_f128) {

            r = get_field(&f, r1);

            if (r > 13) {

        if (spec & SPEC_r1_f128 && !is_fp_pair(get_field(&f, r1))) {

            excp = PGM_SPECIFICATION;

        }

        }

        if (spec & SPEC_r2_f128) {

            r = get_field(&f, r2);

            if (r > 13) {

        if (spec & SPEC_r2_f128 && !is_fp_pair(get_field(&f, r2))) {

            excp = PGM_SPECIFICATION;

        }

        }

        if (excp) {

            gen_program_exception(s, excp);

            return DISAS_NORETURN;