[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PATCH v1 8/8] s390x/tcg: refactor specification checking
From: |
David Hildenbrand |
Subject: |
[qemu-s390x] [PATCH v1 8/8] s390x/tcg: refactor specification checking |
Date: |
Wed, 22 Aug 2018 09:57:50 +0200 |
We can fit this nicely into less LOC, without harming readability.
Signed-off-by: David Hildenbrand <address@hidden>
---
target/s390x/translate.c | 34 ++++++----------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 27d2405ef4..3675da1270 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -6053,34 +6053,12 @@ static DisasJumpType translate_one(CPUS390XState *env,
DisasContext *s)
/* Check for insn specification exceptions. */
if (insn->spec) {
- int spec = insn->spec, excp = 0, r;
-
- if (spec & SPEC_r1_even) {
- r = get_field(&f, r1);
- if (r & 1) {
- excp = 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);
+ if (((insn->spec & SPEC_r1_even) && (get_field(&f, r1) & 1)) ||
+ ((insn->spec & SPEC_r2_even) && (get_field(&f, r2) & 1)) ||
+ ((insn->spec & SPEC_r3_even) && (get_field(&f, r3) & 1)) ||
+ ((insn->spec & SPEC_r1_f128) && !is_fp_pair(get_field(&f, r1))) ||
+ ((insn->spec & SPEC_r2_f128) && !is_fp_pair(get_field(&f, r2)))) {
+ gen_program_exception(s, PGM_SPECIFICATION);
return DISAS_NORETURN;
}
}
--
2.17.1
- [qemu-s390x] [PATCH v1 0/8] s390x/tcg: instruction flags and AFP registers, David Hildenbrand, 2018/08/22
- [qemu-s390x] [PATCH v1 7/8] s390x/tcg: fix FP register pair checks, David Hildenbrand, 2018/08/22
- [qemu-s390x] [PATCH v1 8/8] s390x/tcg: refactor specification checking,
David Hildenbrand <=
- [qemu-s390x] [PATCH v1 6/8] s390x/tcg: handle privileged instructions via flags, David Hildenbrand, 2018/08/22
- [qemu-s390x] [PATCH v1 4/8] s390x/tcg: add instruction flags for floating point instructions, David Hildenbrand, 2018/08/22
- [qemu-s390x] [PATCH v1 5/8] s390x/tcg: check for AFP-register, BFP and DFP data exceptions, David Hildenbrand, 2018/08/22
- [qemu-s390x] [PATCH v1 2/8] s390x/tcg: store in the TB flags if AFP is enabled, David Hildenbrand, 2018/08/22
- [qemu-s390x] [PATCH v1 3/8] s390x/tcg: support flags for instructions, David Hildenbrand, 2018/08/22
- [qemu-s390x] [PATCH v1 1/8] s390x/tcg: factor out and fix DATA exception injection, David Hildenbrand, 2018/08/22