diff options
| author | David Hildenbrand | 2018-09-27 15:03:02 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2018-10-04 10:32:39 +0200 |
| commit | eba7170b55ba77a391b2b1b9cd49ffbac6561b0d (patch) | |
| tree | 5d4dc16e9cc7ae3472f0819f687555a945363a41 /target/s390x | |
| parent | s390x/tcg: handle privileged instructions via flags (diff) | |
| download | qemu-eba7170b55ba77a391b2b1b9cd49ffbac6561b0d.tar.gz qemu-eba7170b55ba77a391b2b1b9cd49ffbac6561b0d.tar.xz qemu-eba7170b55ba77a391b2b1b9cd49ffbac6561b0d.zip | |
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: 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-9-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target/s390x')
| -rw-r--r-- | target/s390x/translate.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/s390x/translate.c b/target/s390x/translate.c index f93ad20951..f6813d0674 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -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,17 +6112,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); |