[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PULL 11/34] s390x/tcg: MVCOS: Lengths are 32 bit in 24/31-
From: |
Cornelia Huck |
Subject: |
[qemu-s390x] [PULL 11/34] s390x/tcg: MVCOS: Lengths are 32 bit in 24/31-bit mode |
Date: |
Thu, 19 Sep 2019 14:40:52 +0200 |
From: David Hildenbrand <address@hidden>
Triggered by a review comment from Richard, also MVCOS has a 32-bit
length in 24/31-bit addressing mode. Add a new helper.
Rename wrap_length() to wrap_length31().
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
target/s390x/mem_helper.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 20e1ac0ea9cd..320e9ee65c88 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -528,7 +528,15 @@ static inline void set_address(CPUS390XState *env, int
reg, uint64_t address)
}
}
-static inline uint64_t wrap_length(CPUS390XState *env, uint64_t length)
+static inline uint64_t wrap_length32(CPUS390XState *env, uint64_t length)
+{
+ if (!(env->psw.mask & PSW_MASK_64)) {
+ return (uint32_t)length;
+ }
+ return length;
+}
+
+static inline uint64_t wrap_length31(CPUS390XState *env, uint64_t length)
{
if (!(env->psw.mask & PSW_MASK_64)) {
/* 24-Bit and 31-Bit mode */
@@ -539,7 +547,7 @@ static inline uint64_t wrap_length(CPUS390XState *env,
uint64_t length)
static inline uint64_t get_length(CPUS390XState *env, int reg)
{
- return wrap_length(env, env->regs[reg]);
+ return wrap_length31(env, env->regs[reg]);
}
static inline void set_length(CPUS390XState *env, int reg, uint64_t length)
@@ -2378,7 +2386,7 @@ uint32_t HELPER(mvcos)(CPUS390XState *env, uint64_t dest,
uint64_t src,
s390_program_interrupt(env, PGM_PRIVILEGED, 6, ra);
}
- len = wrap_length(env, len);
+ len = wrap_length32(env, len);
if (len > 4096) {
cc = 3;
len = 4096;
--
2.20.1
- [qemu-s390x] [PULL 17/34] s390x/tcg: Fault-safe memmove, (continued)
- [qemu-s390x] [PULL 17/34] s390x/tcg: Fault-safe memmove, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 22/34] s390x/tcg: XC: Fault-safe handling, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 19/34] s390x/tcg: MVC: Fault-safe handling on destructive overlaps, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 18/34] s390x/tcg: MVCS/MVCP: Use access_memmove(), Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 13/34] s390x/tcg: MVST: Check for specification exceptions, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 10/34] s390x/tcg: MVCS/MVCP: Check for special operation exceptions, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 07/34] s390x/tcg: MVPG: Check for specification exceptions, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 15/34] s390x/tcg: Always use MMU_USER_IDX for CONFIG_USER_ONLY, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 14/34] s390x/tcg: MVST: Fix storing back the addresses to registers, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 16/34] s390x/tcg: Fault-safe memset, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 11/34] s390x/tcg: MVCOS: Lengths are 32 bit in 24/31-bit mode,
Cornelia Huck <=
- [qemu-s390x] [PULL 12/34] s390x/tcg: MVCS/MVCP: Properly wrap the length, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 09/34] s390x/tcg: MVCLU/MVCLE: Process max 4k bytes at a time, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 06/34] s390x/tcg: MVC: Use is_destructive_overlap(), Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 08/34] s390x/tcg: MVPG: Properly wrap the addresses, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 04/34] s390x/tcg: MVCL: Process max 4k bytes at a time, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 05/34] s390x/tcg: MVC: Increment the length once, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 03/34] s390x/tcg: MVCL: Detect destructive overlaps, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 01/34] s390x/tcg: Reset exception_index to -1 instead of 0, Cornelia Huck, 2019/09/19
- [qemu-s390x] [PULL 02/34] s390x/tcg: MVCL: Zero out unused bits of address, Cornelia Huck, 2019/09/19
- Re: [PULL 00/34] s390x update, Peter Maydell, 2019/09/20