[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 8/9] s390x/tcg: fix FP register pair checks
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v4 8/9] s390x/tcg: fix FP register pair checks |
Date: |
Thu, 27 Sep 2018 15:03:02 +0200 |
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: Richard Henderson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
target/s390x/translate.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 0acf9dd546..c4e31a8000 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -6022,6 +6022,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;
@@ -6104,17 +6110,11 @@ static DisasJumpType translate_one(CPUS390XState *env,
DisasContext *s)
excp = PGM_SPECIFICATION;
}
}
- if (spec & SPEC_r1_f128) {
- r = get_field(&f, r1);
- if (r > 13) {
- excp = PGM_SPECIFICATION;
- }
+ 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) {
- 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);
--
2.17.1
- [Qemu-devel] [PATCH v4 2/9] s390x/tcg: factor out and fix DATA exception injection, (continued)
- [Qemu-devel] [PATCH v4 2/9] s390x/tcg: factor out and fix DATA exception injection, David Hildenbrand, 2018/09/27
- [Qemu-devel] [PATCH v4 1/9] s390x: move tcg_s390_program_interrupt() into TCG code and mark it noreturn, David Hildenbrand, 2018/09/27
- [Qemu-devel] [PATCH v4 6/9] s390x/tcg: check for AFP-register, BFP and DFP data exceptions, David Hildenbrand, 2018/09/27
- [Qemu-devel] [PATCH v4 3/9] s390x/tcg: store in the TB flags if AFP is enabled, David Hildenbrand, 2018/09/27
- [Qemu-devel] [PATCH v4 4/9] s390x/tcg: support flags for instructions, David Hildenbrand, 2018/09/27
- [Qemu-devel] [PATCH v4 5/9] s390x/tcg: add instruction flags for floating point instructions, David Hildenbrand, 2018/09/27
- [Qemu-devel] [PATCH v4 7/9] s390x/tcg: handle privileged instructions via flags, David Hildenbrand, 2018/09/27
- [Qemu-devel] [PATCH v4 9/9] s390x/tcg: refactor specification checking, David Hildenbrand, 2018/09/27
- [Qemu-devel] [PATCH v4 8/9] s390x/tcg: fix FP register pair checks,
David Hildenbrand <=