From: Ilya Leoshkevich <iii@linux.ibm.com>
To: Richard Henderson <richard.henderson@linaro.org>,
David Hildenbrand <david@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>,
qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
Ilya Leoshkevich <iii@linux.ibm.com>,
Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Subject: [PATCH v4 02/12] target/s390x: Handle EXECUTE of odd addresses
Date: Thu, 16 Mar 2023 17:44:18 +0100 [thread overview]
Message-ID: <20230316164428.275147-3-iii@linux.ibm.com> (raw)
In-Reply-To: <20230316164428.275147-1-iii@linux.ibm.com>
Generate a specification exception in the helper before trying to fetch
the instruction.
Reported-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
target/s390x/tcg/mem_helper.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index 6835c26dda4..9d1c4bb7374 100644
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -2468,8 +2468,16 @@ void HELPER(stpq_parallel)(CPUS390XState *env, uint64_t addr,
*/
void HELPER(ex)(CPUS390XState *env, uint32_t ilen, uint64_t r1, uint64_t addr)
{
- uint64_t insn = cpu_lduw_code(env, addr);
- uint8_t opc = insn >> 8;
+ uint64_t insn;
+ uint8_t opc;
+
+ /* EXECUTE targets must be at even addresses. */
+ if (addr & 1) {
+ tcg_s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());
+ }
+
+ insn = cpu_lduw_code(env, addr);
+ opc = insn >> 8;
/* Or in the contents of R1[56:63]. */
insn |= r1 & 0xff;
--
2.39.2
next prev parent reply other threads:[~2023-03-16 16:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-16 16:44 [PATCH v4 00/12] target/s390x: Handle unaligned accesses Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 01/12] target/s390x: Handle branching to odd addresses Ilya Leoshkevich
2023-03-16 16:44 ` Ilya Leoshkevich [this message]
2023-03-16 16:44 ` [PATCH v4 03/12] target/s390x: Handle LGRL from non-aligned addresses Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 04/12] target/s390x: Handle LRL and LGFRL " Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 05/12] target/s390x: Handle LLGFRL " Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 06/12] target/s390x: Handle CRL and CGFRL with " Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 07/12] target/s390x: Handle CGRL and CLGRL " Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 08/12] target/s390x: Handle CLRL and CLGFRL " Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 09/12] target/s390x: Handle STRL to " Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 10/12] target/s390x: Handle STGRL " Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 11/12] target/s390x: Update do_unaligned_access() comment Ilya Leoshkevich
2023-03-16 16:44 ` [PATCH v4 12/12] tests/tcg/s390x: Test unaligned accesses Ilya Leoshkevich
2023-03-17 8:43 ` Thomas Huth
2023-03-17 10:54 ` Thomas Huth
2023-03-17 11:00 ` Thomas Huth
2023-03-17 11:02 ` Ilya Leoshkevich
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=20230316164428.275147-3-iii@linux.ibm.com \
--to=iii@linux.ibm.com \
--cc=david@redhat.com \
--cc=nsg@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).