From: David Hildenbrand <david@redhat.com>
Date: Tue, 3 Sep 2019 13:09:23 +0000 (+0200)
Subject: s390x/tcg: MVPG: Check for specification exceptions
X-Git-Tag: v4.2.0-rc0~87^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf349f1a0daf86481ad62df405f84ad70eaa7e68;p=thirdparty%2Fqemu.git

s390x/tcg: MVPG: Check for specification exceptions

Perform the checks documented in the PoP.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
---

diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index c31cf495935..7dfa848744a 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -672,6 +672,13 @@ uint64_t HELPER(clst)(CPUS390XState *env, uint64_t c, uint64_t s1, uint64_t s2)
 /* move page */
 uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2)
 {
+    const bool f = extract64(r0, 11, 1);
+    const bool s = extract64(r0, 10, 1);
+
+    if ((f && s) || extract64(r0, 12, 4)) {
+        s390_program_interrupt(env, PGM_SPECIFICATION, ILEN_AUTO, GETPC());
+    }
+
     /* ??? missing r0 handling, which includes access keys, but more
        importantly optional suppression of the exception!  */
     fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, GETPC());