[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/26] target/s390x: improve 24-bit and 31-bit lengt
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PATCH 14/26] target/s390x: improve 24-bit and 31-bit lengths read/write |
Date: |
Thu, 25 May 2017 23:04:56 +0200 |
Signed-off-by: Aurelien Jarno <address@hidden>
---
target/s390x/mem_helper.c | 47 +++++++++++++++++++++++++++++++++--------------
1 file changed, 33 insertions(+), 14 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index bbb3eceb71..1dc71fe5f0 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -421,6 +421,31 @@ static inline void set_address(CPUS390XState *env, int
reg, uint64_t address)
}
}
+static inline uint64_t wrap_length(CPUS390XState *env, uint64_t length)
+{
+ if (!(env->psw.mask & PSW_MASK_64)) {
+ /* 24-Bit and 31-Bit mode */
+ length &= 0x7fffffff;
+ }
+ return length;
+}
+
+static inline uint64_t get_length(CPUS390XState *env, int reg)
+{
+ return wrap_length(env, env->regs[reg]);
+}
+
+static inline void set_length(CPUS390XState *env, int reg, uint64_t length)
+{
+ if (env->psw.mask & PSW_MASK_64) {
+ /* 64-Bit mode */
+ env->regs[reg] = length;
+ } else {
+ /* 24-Bit and 31-Bit mode */
+ env->regs[reg] = deposit64(env->regs[reg], 0, 32, length);
+ }
+}
+
/* search string (c is byte to search, r2 is string, r1 end of string) */
uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end,
uint64_t str)
@@ -643,19 +668,14 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
uint32_t r3)
{
uintptr_t ra = GETPC();
- uint64_t destlen = env->regs[r1 + 1];
+ uint64_t destlen = get_length(env, r1 + 1);
uint64_t dest = get_address(env, r1);
- uint64_t srclen = env->regs[r3 + 1];
+ uint64_t srclen = get_length(env, r3 + 1);
uint64_t src = get_address(env, r3);
uint8_t pad = a2 & 0xff;
uint8_t v;
uint32_t cc;
- if (!(env->psw.mask & PSW_MASK_64)) {
- destlen = (uint32_t)destlen;
- srclen = (uint32_t)srclen;
- }
-
if (destlen == srclen) {
cc = 0;
} else if (destlen < srclen) {
@@ -677,10 +697,9 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
cpu_stb_data_ra(env, dest, pad, ra);
}
- env->regs[r1 + 1] = destlen;
+ set_length(env, r1 + 1 , destlen);
/* can't use srclen here, we trunc'ed it */
- /* FIXME: 31-bit mode! */
- env->regs[r3 + 1] -= src - env->regs[r3];
+ set_length(env, r3 + 1, env->regs[r3 + 1] - src - env->regs[r3]);
set_address(env, r1, dest);
set_address(env, r3, src);
@@ -692,9 +711,9 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
uint32_t r3)
{
uintptr_t ra = GETPC();
- uint64_t destlen = env->regs[r1 + 1];
+ uint64_t destlen = get_length(env, r1 + 1);
uint64_t dest = get_address(env, r1);
- uint64_t srclen = env->regs[r3 + 1];
+ uint64_t srclen = get_length(env, r3 + 1);
uint64_t src = get_address(env, r3);
uint8_t pad = a2 & 0xff;
uint32_t cc = 0;
@@ -716,9 +735,9 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
}
}
- env->regs[r1 + 1] = destlen;
+ set_length(env, r1 + 1, destlen);
/* can't use srclen here, we trunc'ed it */
- env->regs[r3 + 1] -= src - env->regs[r3];
+ set_length(env, r3 + 1, env->regs[r3 + 1] - src - env->regs[r3]);
set_address(env, r1, dest);
set_address(env, r3, src);
--
2.11.0
- [Qemu-devel] [PATCH 03/26] target/s390x: implement TEST AND SET, (continued)
- [Qemu-devel] [PATCH 03/26] target/s390x: implement TEST AND SET, Aurelien Jarno, 2017/05/25
- [Qemu-devel] [PATCH 05/26] target/s390x: implement PACK, Aurelien Jarno, 2017/05/25
- [Qemu-devel] [PATCH 01/26] target/s390x: remove dead code in translate.c, Aurelien Jarno, 2017/05/25
- [Qemu-devel] [PATCH 08/26] target/s390x: implement MOVE INVERSE, Aurelien Jarno, 2017/05/25
- [Qemu-devel] [PATCH 09/26] target/s390x: implement MOVE NUMERICS, Aurelien Jarno, 2017/05/25
- [Qemu-devel] [PATCH 14/26] target/s390x: improve 24-bit and 31-bit lengths read/write,
Aurelien Jarno <=
- [Qemu-devel] [PATCH 26/26] target/s390x: update maximum TCG model to z800, Aurelien Jarno, 2017/05/25
- [Qemu-devel] [PATCH 15/26] target/s390x: fix COMPARE LOGICAL LONG EXTENDED, Aurelien Jarno, 2017/05/25
- [Qemu-devel] [PATCH 16/26] target/s390x: implement COMPARE LOGICAL LONG, Aurelien Jarno, 2017/05/25
- [Qemu-devel] [PATCH 22/26] target/s390x: implement UNPACK ASCII, Aurelien Jarno, 2017/05/25