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

s390x/tcg: MVPG: Properly wrap the addresses

We have to mask of any unused bits. While at it, document what exactly is
missing.

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 7dfa848744a..746f6473030 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -679,8 +679,15 @@ uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2)
         s390_program_interrupt(env, PGM_SPECIFICATION, ILEN_AUTO, GETPC());
     }
 
-    /* ??? missing r0 handling, which includes access keys, but more
-       importantly optional suppression of the exception!  */
+    r1 = wrap_address(env, r1 & TARGET_PAGE_MASK);
+    r2 = wrap_address(env, r2 & TARGET_PAGE_MASK);
+
+    /*
+     * TODO:
+     * - Access key handling
+     * - CC-option with surpression of page-translation exceptions
+     * - Store r1/r2 register identifiers at real location 162
+     */
     fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, GETPC());
     return 0; /* data moved */
 }