[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 63/69] target/s390x: implement PACK UNICODE
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 63/69] target/s390x: implement PACK UNICODE |
Date: |
Sun, 4 Jun 2017 10:35:03 -0700 |
From: Aurelien Jarno <address@hidden>
Use a common helper with PACK ASCII as the differences are limited to
the stride of the source operand.
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/helper.h | 1 +
target/s390x/insn-data.def | 2 ++
target/s390x/mem_helper.c | 30 +++++++++++++++++++++---------
target/s390x/translate.c | 16 ++++++++++++++++
4 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/target/s390x/helper.h b/target/s390x/helper.h
index 7898064..5b61a0d 100644
--- a/target/s390x/helper.h
+++ b/target/s390x/helper.h
@@ -84,6 +84,7 @@ DEF_HELPER_FLAGS_3(sqxb, TCG_CALL_NO_WG, i64, env, i64, i64)
DEF_HELPER_FLAGS_1(cvd, TCG_CALL_NO_RWG_SE, i64, s32)
DEF_HELPER_FLAGS_4(pack, TCG_CALL_NO_WG, void, env, i32, i64, i64)
DEF_HELPER_FLAGS_4(pka, TCG_CALL_NO_WG, void, env, i64, i64, i32)
+DEF_HELPER_FLAGS_4(pku, TCG_CALL_NO_WG, void, env, i64, i64, i32)
DEF_HELPER_FLAGS_4(unpk, TCG_CALL_NO_WG, void, env, i32, i64, i64)
DEF_HELPER_FLAGS_4(tr, TCG_CALL_NO_WG, void, env, i32, i64, i64)
DEF_HELPER_4(tre, i64, env, i64, i64, i64)
diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def
index 41431af..16f788c 100644
--- a/target/s390x/insn-data.def
+++ b/target/s390x/insn-data.def
@@ -669,6 +669,8 @@
C(0xf200, PACK, SS_a, Z, la1, a2, 0, 0, pack, 0)
/* PACK ASCII */
C(0xe900, PKA, SS_f, E2, la1, a2, 0, 0, pka, 0)
+/* PACK UNICODE */
+ C(0xe100, PKU, SS_f, E2, la1, a2, 0, 0, pku, 0)
/* PREFETCH */
/* Implemented as nops of course. */
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 425d4b6..d827a12 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -914,10 +914,9 @@ void HELPER(pack)(CPUS390XState *env, uint32_t len,
uint64_t dest, uint64_t src)
}
}
-void HELPER(pka)(CPUS390XState *env, uint64_t dest, uint64_t src,
- uint32_t srclen)
+static inline void do_pkau(CPUS390XState *env, uint64_t dest, uint64_t src,
+ uint32_t srclen, int ssize, uintptr_t ra)
{
- uintptr_t ra = GETPC();
int i;
/* The destination operand is always 16 bytes long. */
const int destlen = 16;
@@ -932,16 +931,16 @@ void HELPER(pka)(CPUS390XState *env, uint64_t dest,
uint64_t src,
/* Start with a positive sign */
if (i == 0) {
b = 0xc;
- } else if (srclen > 1) {
+ } else if (srclen > ssize) {
b = cpu_ldub_data_ra(env, src, ra) & 0x0f;
- src--;
- srclen--;
+ src -= ssize;
+ srclen -= ssize;
}
- if (srclen > 1) {
+ if (srclen > ssize) {
b |= cpu_ldub_data_ra(env, src, ra) << 4;
- src--;
- srclen--;
+ src -= ssize;
+ srclen -= ssize;
}
cpu_stb_data_ra(env, dest, b, ra);
@@ -949,6 +948,19 @@ void HELPER(pka)(CPUS390XState *env, uint64_t dest,
uint64_t src,
}
}
+
+void HELPER(pka)(CPUS390XState *env, uint64_t dest, uint64_t src,
+ uint32_t srclen)
+{
+ do_pkau(env, dest, src, srclen, 1, GETPC());
+}
+
+void HELPER(pku)(CPUS390XState *env, uint64_t dest, uint64_t src,
+ uint32_t srclen)
+{
+ do_pkau(env, dest, src, srclen, 2, GETPC());
+}
+
void HELPER(unpk)(CPUS390XState *env, uint32_t len, uint64_t dest,
uint64_t src)
{
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 5093995..d8b0515 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -3317,6 +3317,22 @@ static ExitStatus op_pka(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
+static ExitStatus op_pku(DisasContext *s, DisasOps *o)
+{
+ int l2 = get_field(s->fields, l2) + 1;
+ TCGv_i32 l;
+
+ /* The length must be even and should not exceed 64 bytes. */
+ if ((l2 & 1) || (l2 > 64)) {
+ gen_program_exception(s, PGM_SPECIFICATION);
+ return EXIT_NORETURN;
+ }
+ l = tcg_const_i32(l2);
+ gen_helper_pku(cpu_env, o->addr1, o->in2, l);
+ tcg_temp_free_i32(l);
+ return NO_EXIT;
+}
+
static ExitStatus op_popcnt(DisasContext *s, DisasOps *o)
{
gen_helper_popcnt(o->out, o->in2);
--
2.9.4
- [Qemu-devel] [PULL 52/69] target/s390x: implement MOVE ZONES, (continued)
- [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, 2017/06/04
- [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 <=
- [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
- [Qemu-devel] [PULL 67/69] target/s390x: implement TRANSLATE ONE/TWO TO ONE/TWO, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 68/69] target/s390x: mark ETF2 and ETF2-ENH facilities as available, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 64/69] target/s390x: implement UNPACK ASCII, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 69/69] target/s390x: addressing exceptions are suppressing, Richard Henderson, 2017/06/04
- Re: [Qemu-devel] [PULL 00/69] target/s390x tcg patches, no-reply, 2017/06/04
- Re: [Qemu-devel] [PULL 00/69] target/s390x tcg patches, Aurelien Jarno, 2017/06/04