[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 15/30] target/s390x: improve 24-bit and 31-bit ad
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PATCH v3 15/30] target/s390x: improve 24-bit and 31-bit addresses write |
Date: |
Thu, 1 Jun 2017 00:01:14 +0200 |
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
---
target/s390x/mem_helper.c | 37 ++++++++++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 7 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 2425bfc984..2113494983 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -384,6 +384,29 @@ static inline uint64_t get_address(CPUS390XState *env, int
reg)
return wrap_address(env, env->regs[reg]);
}
+static inline void set_address(CPUS390XState *env, int reg, uint64_t address)
+{
+ if (env->psw.mask & PSW_MASK_64) {
+ /* 64-Bit mode */
+ env->regs[reg] = address;
+ } else {
+ if (!(env->psw.mask & PSW_MASK_32)) {
+ /* 24-Bit mode. According to the PoO it is implementation
+ dependent if bits 32-39 remain unchanged or are set to
+ zeros. Choose the former so that the function can also be
+ used for TRT. */
+ env->regs[reg] = deposit64(env->regs[reg], 0, 24, address);
+ } else {
+ /* 31-Bit mode. According to the PoO it is implementation
+ dependent if bit 32 remains unchanged or is set to zero.
+ Choose the latter so that the function can also be used for
+ TRT. */
+ address &= 0x7fffffff;
+ env->regs[reg] = deposit64(env->regs[reg], 0, 32, address);
+ }
+ }
+}
+
/* 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)
@@ -564,8 +587,8 @@ uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1,
uint32_t r2)
env->regs[r1 + 1] = destlen;
/* can't use srclen here, we trunc'ed it */
env->regs[r2 + 1] -= src - env->regs[r2];
- env->regs[r1] = dest;
- env->regs[r2] = src;
+ set_address(env, r1, dest);
+ set_address(env, r2, src);
return cc;
}
@@ -613,8 +636,8 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
/* can't use srclen here, we trunc'ed it */
/* FIXME: 31-bit mode! */
env->regs[r3 + 1] -= src - env->regs[r3];
- env->regs[r1] = dest;
- env->regs[r3] = src;
+ set_address(env, r1, dest);
+ set_address(env, r3, src);
return cc;
}
@@ -651,8 +674,8 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
env->regs[r1 + 1] = destlen;
/* can't use srclen here, we trunc'ed it */
env->regs[r3 + 1] -= src - env->regs[r3];
- env->regs[r1] = dest;
- env->regs[r3] = src;
+ set_address(env, r1, dest);
+ set_address(env, r3, src);
return cc;
}
@@ -858,7 +881,7 @@ static uint32_t do_helper_trt(CPUS390XState *env, uint32_t
len, uint64_t array,
uint8_t sbyte = cpu_ldub_data_ra(env, trans + byte, ra);
if (sbyte != 0) {
- env->regs[1] = array + i;
+ set_address(env, 1, array + i);
env->regs[2] = deposit64(env->regs[2], 0, 8, sbyte);
return (i == len) ? 2 : 1;
}
--
2.11.0
- [Qemu-devel] [PATCH v3 28/30] target/s390x: implement TRANSLATE ONE/TWO TO ONE/TWO, (continued)
- [Qemu-devel] [PATCH v3 28/30] target/s390x: implement TRANSLATE ONE/TWO TO ONE/TWO, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 16/30] target/s390x: improve 24-bit and 31-bit lengths read/write, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 27/30] target/s390x: implement TEST DECIMAL, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 30/30] target/s390x: update maximum TCG model to z800, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 26/30] target/s390x: implement UNPACK UNICODE, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 22/30] target/s390x: implement MOVE LONG UNICODE, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 21/30] target/s390x: implement COMPARE LOGICAL LONG UNICODE, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 29/30] target/s390x: mark ETF2 and ETF2-ENH facilities as available, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 23/30] target/s390x: implement PACK ASCII, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 01/30] target/s390x: remove dead code in translate.c, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 15/30] target/s390x: improve 24-bit and 31-bit addresses write,
Aurelien Jarno <=
- [Qemu-devel] [PATCH v3 05/30] target/s390x: implement TEST ADDRESSING MODE, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 19/30] target/s390x: fix adj_len_to_page, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 04/30] target/s390x: implement TEST AND SET, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 09/30] target/s390x: implement COMPARE AND SIGNAL, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 10/30] target/s390x: implement MOVE INVERSE, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 18/30] target/s390x: implement COMPARE LOGICAL LONG, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 13/30] target/s390x: implement MOVE ZONES, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 11/30] target/s390x: implement MOVE NUMERICS, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 12/30] target/s390x: implement MOVE WITH OFFSET, Aurelien Jarno, 2017/05/31
- [Qemu-devel] [PATCH v3 06/30] target/s390x: implement PACK, Aurelien Jarno, 2017/05/31