s390x/tcg: refactor specification checking

We can fit this nicely into less LOC, without harming readability.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180927130303.12236-10-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
David Hildenbrand 2018-09-27 15:03:03 +02:00 committed by Cornelia Huck
parent eba7170b55
commit 74fbae31cf

View File

@ -6092,34 +6092,12 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
/* Check for insn specification exceptions. */ /* Check for insn specification exceptions. */
if (insn->spec) { if (insn->spec) {
int spec = insn->spec, excp = 0, r; if ((insn->spec & SPEC_r1_even && get_field(&f, r1) & 1) ||
(insn->spec & SPEC_r2_even && get_field(&f, r2) & 1) ||
if (spec & SPEC_r1_even) { (insn->spec & SPEC_r3_even && get_field(&f, r3) & 1) ||
r = get_field(&f, r1); (insn->spec & SPEC_r1_f128 && !is_fp_pair(get_field(&f, r1))) ||
if (r & 1) { (insn->spec & SPEC_r2_f128 && !is_fp_pair(get_field(&f, r2)))) {
excp = PGM_SPECIFICATION; gen_program_exception(s, PGM_SPECIFICATION);
}
}
if (spec & SPEC_r2_even) {
r = get_field(&f, r2);
if (r & 1) {
excp = PGM_SPECIFICATION;
}
}
if (spec & SPEC_r3_even) {
r = get_field(&f, r3);
if (r & 1) {
excp = PGM_SPECIFICATION;
}
}
if (spec & SPEC_r1_f128 && !is_fp_pair(get_field(&f, r1))) {
excp = PGM_SPECIFICATION;
}
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; return DISAS_NORETURN;
} }
} }