[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PULL 14/15] s390x/tcg: refactor specification checking
From: |
Cornelia Huck |
Subject: |
[qemu-s390x] [PULL 14/15] s390x/tcg: refactor specification checking |
Date: |
Thu, 4 Oct 2018 17:28:56 +0200 |
From: David Hildenbrand <address@hidden>
We can fit this nicely into less LOC, without harming readability.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <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 f6813d0674..18861cd186 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -6092,34 +6092,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.14.4
- [qemu-s390x] [PULL 01/15] hw/s390x/ipl: Fix alignment problems of S390IPLState members, (continued)
- [qemu-s390x] [PULL 01/15] hw/s390x/ipl: Fix alignment problems of S390IPLState members, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 04/15] s390x: Fence huge pages prior to 3.1, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 05/15] target/s390x: exception on non-aligned LPSW(E), Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 02/15] hw/s390x/css: Remove QEMU_PACKED from struct SenseId, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 06/15] s390x: move tcg_s390_program_interrupt() into TCG code and mark it noreturn, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 07/15] s390x/tcg: factor out and fix DATA exception injection, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 08/15] s390x/tcg: store in the TB flags if AFP is enabled, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 09/15] s390x/tcg: support flags for instructions, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 10/15] s390x/tcg: add instruction flags for floating point instructions, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 11/15] s390x/tcg: check for AFP-register, BFP and DFP data exceptions, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 14/15] s390x/tcg: refactor specification checking,
Cornelia Huck <=
- [qemu-s390x] [PULL 12/15] s390x/tcg: handle privileged instructions via flags, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 13/15] s390x/tcg: fix FP register pair checks, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 15/15] hw/s390x/s390-pci-bus: Convert sysbus init function to realize function, Cornelia Huck, 2018/10/04
- [qemu-s390x] [PULL 03/15] hw/s390x/ioinst: Fix alignment problem in struct SubchDev, Cornelia Huck, 2018/10/04
- Re: [qemu-s390x] [PULL 00/15] s390x updates, Peter Maydell, 2018/10/05