From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
Alexander Graf <agraf@suse.de>,
Richard Henderson <rth@twiddle.net>,
David Hildenbrand <david@redhat.com>,
Thomas Huth <thuth@redhat.com>,
qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
Cornelia Huck <cohuck@redhat.com>
Subject: [Qemu-devel] [PULL 11/15] s390x/tcg: check for AFP-register, BFP and DFP data exceptions
Date: Thu, 4 Oct 2018 17:28:53 +0200 [thread overview]
Message-ID: <20181004152857.14525-12-cohuck@redhat.com> (raw)
In-Reply-To: <20181004152857.14525-1-cohuck@redhat.com>
From: David Hildenbrand <david@redhat.com>
With the annotated functions, we can now easily check this at a central
place.
DXC 1 is to be injected if an AFP register is used (for a HFP AND FPS
instruction) when AFP is disabled.
DXC 2 is to be injected if a BFP instruction is used when AFP is
disabled.
DXC 3 is to be injected if a DFP instruction is used when AFP is
disabled.
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-7-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
target/s390x/translate.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 49e5e2cc58..67049975fa 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -6094,6 +6094,11 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s,
return info;
}
+static bool is_afp_reg(int reg)
+{
+ return reg % 2 || reg > 6;
+}
+
static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
{
const DisasInsn *insn;
@@ -6120,6 +6125,34 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
}
#endif
+ /* process flags */
+ if (insn->flags) {
+ /* if AFP is not enabled, instructions and registers are forbidden */
+ if (!(s->base.tb->flags & FLAG_MASK_AFP)) {
+ uint8_t dxc = 0;
+
+ if ((insn->flags & IF_AFP1) && is_afp_reg(get_field(&f, r1))) {
+ dxc = 1;
+ }
+ if ((insn->flags & IF_AFP2) && is_afp_reg(get_field(&f, r2))) {
+ dxc = 1;
+ }
+ if ((insn->flags & IF_AFP3) && is_afp_reg(get_field(&f, r3))) {
+ dxc = 1;
+ }
+ if (insn->flags & IF_BFP) {
+ dxc = 2;
+ }
+ if (insn->flags & IF_DFP) {
+ dxc = 3;
+ }
+ if (dxc) {
+ gen_data_exception(dxc);
+ return DISAS_NORETURN;
+ }
+ }
+ }
+
/* Check for insn specification exceptions. */
if (insn->spec) {
int spec = insn->spec, excp = 0, r;
--
2.14.4
next prev parent reply other threads:[~2018-10-04 15:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 15:28 [Qemu-devel] [PULL 00/15] s390x updates Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 01/15] hw/s390x/ipl: Fix alignment problems of S390IPLState members Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 02/15] hw/s390x/css: Remove QEMU_PACKED from struct SenseId Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 03/15] hw/s390x/ioinst: Fix alignment problem in struct SubchDev Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 04/15] s390x: Fence huge pages prior to 3.1 Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 05/15] target/s390x: exception on non-aligned LPSW(E) Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 06/15] s390x: move tcg_s390_program_interrupt() into TCG code and mark it noreturn Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 07/15] s390x/tcg: factor out and fix DATA exception injection Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 08/15] s390x/tcg: store in the TB flags if AFP is enabled Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 09/15] s390x/tcg: support flags for instructions Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 10/15] s390x/tcg: add instruction flags for floating point instructions Cornelia Huck
2018-10-04 15:28 ` Cornelia Huck [this message]
2018-10-04 15:28 ` [Qemu-devel] [PULL 12/15] s390x/tcg: handle privileged instructions via flags Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 13/15] s390x/tcg: fix FP register pair checks Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 14/15] s390x/tcg: refactor specification checking Cornelia Huck
2018-10-04 15:28 ` [Qemu-devel] [PULL 15/15] hw/s390x/s390-pci-bus: Convert sysbus init function to realize function Cornelia Huck
2018-10-05 16:53 ` [Qemu-devel] [PULL 00/15] s390x updates Peter Maydell
2018-10-08 15:02 ` Alex Bennée
2018-10-08 15:14 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181004152857.14525-12-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=david@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.