[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL SUBSYSTEM s390x 10/29] s390x/tcg: MVCS/MVCP: Check fo
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PULL SUBSYSTEM s390x 10/29] s390x/tcg: MVCS/MVCP: Check for special operation exceptions |
Date: |
Wed, 18 Sep 2019 17:29:03 +0200 |
Let's perform the documented checks.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
target/s390x/mem_helper.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 86238e0163..20e1ac0ea9 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -1960,12 +1960,18 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2)
uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2)
{
+ const uint8_t psw_as = (env->psw.mask & PSW_MASK_ASC) >> PSW_SHIFT_ASC;
uintptr_t ra = GETPC();
int cc = 0, i;
HELPER_LOG("%s: %16" PRIx64 " %16" PRIx64 " %16" PRIx64 "\n",
__func__, l, a1, a2);
+ if (!(env->psw.mask & PSW_MASK_DAT) || !(env->cregs[0] & CR0_SECONDARY) ||
+ psw_as == AS_HOME || psw_as == AS_ACCREG) {
+ s390_program_interrupt(env, PGM_SPECIAL_OP, ILEN_AUTO, ra);
+ }
+
if (l > 256) {
/* max 256 */
l = 256;
@@ -1983,12 +1989,18 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l,
uint64_t a1, uint64_t a2)
uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2)
{
+ const uint8_t psw_as = (env->psw.mask & PSW_MASK_ASC) >> PSW_SHIFT_ASC;
uintptr_t ra = GETPC();
int cc = 0, i;
HELPER_LOG("%s: %16" PRIx64 " %16" PRIx64 " %16" PRIx64 "\n",
__func__, l, a1, a2);
+ if (!(env->psw.mask & PSW_MASK_DAT) || !(env->cregs[0] & CR0_SECONDARY) ||
+ psw_as == AS_HOME || psw_as == AS_ACCREG) {
+ s390_program_interrupt(env, PGM_SPECIAL_OP, ILEN_AUTO, ra);
+ }
+
if (l > 256) {
/* max 256 */
l = 256;
--
2.21.0
- [Qemu-devel] [PULL SUBSYSTEM s390x 00/29] s390x/tcg: mem_helper: Fault-safe handling, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 01/29] s390x/tcg: Reset exception_index to -1 instead of 0, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 02/29] s390x/tcg: MVCL: Zero out unused bits of address, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 03/29] s390x/tcg: MVCL: Detect destructive overlaps, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 04/29] s390x/tcg: MVCL: Process max 4k bytes at a time, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 05/29] s390x/tcg: MVC: Increment the length once, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 06/29] s390x/tcg: MVC: Use is_destructive_overlap(), David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 07/29] s390x/tcg: MVPG: Check for specification exceptions, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 08/29] s390x/tcg: MVPG: Properly wrap the addresses, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 09/29] s390x/tcg: MVCLU/MVCLE: Process max 4k bytes at a time, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 10/29] s390x/tcg: MVCS/MVCP: Check for special operation exceptions,
David Hildenbrand <=
- [Qemu-devel] [PULL SUBSYSTEM s390x 11/29] s390x/tcg: MVCOS: Lengths are 32 bit in 24/31-bit mode, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 12/29] s390x/tcg: MVCS/MVCP: Properly wrap the length, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 13/29] s390x/tcg: MVST: Check for specification exceptions, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 14/29] s390x/tcg: MVST: Fix storing back the addresses to registers, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 15/29] s390x/tcg: Always use MMU_USER_IDX for CONFIG_USER_ONLY, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 16/29] s390x/tcg: Fault-safe memset, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 17/29] s390x/tcg: Fault-safe memmove, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 18/29] s390x/tcg: MVCS/MVCP: Use access_memmove(), David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 19/29] s390x/tcg: MVC: Fault-safe handling on destructive overlaps, David Hildenbrand, 2019/09/18
- [Qemu-devel] [PULL SUBSYSTEM s390x 22/29] s390x/tcg: XC: Fault-safe handling, David Hildenbrand, 2019/09/18