[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 55/69] target/s390x: improve 24-bit and 31-bit length
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 55/69] target/s390x: improve 24-bit and 31-bit lengths read/write |
Date: |
Sun, 4 Jun 2017 10:34:55 -0700 |
From: Aurelien Jarno <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Richard Henderson <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 2113494..98a7aa2 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -407,6 +407,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)
@@ -598,19 +623,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) {
@@ -632,10 +652,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);
@@ -647,9 +666,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;
@@ -671,9 +690,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.9.4
- [Qemu-devel] [PULL 47/69] target/s390x: implement STORE PAIR TO QUADWORD, (continued)
- [Qemu-devel] [PULL 47/69] target/s390x: implement STORE PAIR TO QUADWORD, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 44/69] target/s390x: implement TEST ADDRESSING MODE, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 45/69] target/s390x: implement PACK, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 48/69] target/s390x: implement COMPARE AND SIGNAL, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 49/69] target/s390x: implement MOVE INVERSE, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 50/69] target/s390x: implement MOVE NUMERICS, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 53/69] target/s390x: improve 24-bit and 31-bit addresses read, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 51/69] target/s390x: implement MOVE WITH OFFSET, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 52/69] target/s390x: implement MOVE ZONES, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 54/69] target/s390x: improve 24-bit and 31-bit addresses write, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 55/69] target/s390x: improve 24-bit and 31-bit lengths read/write,
Richard Henderson <=
- [Qemu-devel] [PULL 56/69] target/s390x: fix COMPARE LOGICAL LONG EXTENDED, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 58/69] target/s390x: fix adj_len_to_page, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 60/69] target/s390x: implement COMPARE LOGICAL LONG UNICODE, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 61/69] target/s390x: implement MOVE LONG UNICODE, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 57/69] target/s390x: implement COMPARE LOGICAL LONG, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 59/69] target/s390x: improve MOVE LONG and MOVE LONG EXTENDED, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 62/69] target/s390x: implement PACK ASCII, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 63/69] target/s390x: implement PACK UNICODE, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 66/69] target/s390x: implement TEST DECIMAL, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 65/69] target/s390x: implement UNPACK UNICODE, Richard Henderson, 2017/06/04