Commit 15417787 authored by Aurelien Jarno's avatar Aurelien Jarno Committed by Richard Henderson

target/s390x: implement UNPACK UNICODE

Reviewed-by: 's avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: 's avatarAurelien Jarno <aurelien@aurel32.net>
Message-Id: <20170531220129.27724-27-aurelien@aurel32.net>
Signed-off-by: 's avatarRichard Henderson <rth@twiddle.net>
parent 1a35f08a
......@@ -90,6 +90,7 @@ 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(unpka, TCG_CALL_NO_WG, i32, env, i64, i32, i64)
DEF_HELPER_FLAGS_4(unpku, TCG_CALL_NO_WG, i32, env, i64, i32, i64)
DEF_HELPER_FLAGS_4(tr, TCG_CALL_NO_WG, void, env, i32, i64, i64)
DEF_HELPER_4(tre, i64, env, i64, i64, i64)
DEF_HELPER_4(trt, i32, env, i32, i64, i64)
......
......@@ -873,6 +873,8 @@
C(0xf300, UNPK, SS_a, Z, la1, a2, 0, 0, unpk, 0)
/* UNPACK ASCII */
C(0xea00, UNPKA, SS_a, E2, la1, a2, 0, 0, unpka, 0)
/* UNPACK UNICODE */
C(0xe200, UNPKU, SS_a, E2, la1, a2, 0, 0, unpku, 0)
#ifndef CONFIG_USER_ONLY
/* COMPARE AND SWAP AND PURGE */
......
......@@ -93,6 +93,23 @@ static inline uint64_t cpu_ldusize_data_ra(CPUS390XState *env, uint64_t addr,
}
}
/* Store a to memory according to its size. */
static inline void cpu_stsize_data_ra(CPUS390XState *env, uint64_t addr,
uint64_t value, int wordsize,
uintptr_t ra)
{
switch (wordsize) {
case 1:
cpu_stb_data_ra(env, addr, value, ra);
break;
case 2:
cpu_stw_data_ra(env, addr, value, ra);
break;
default:
abort();
}
}
static void fast_memset(CPUS390XState *env, uint64_t dest, uint8_t byte,
uint32_t l, uintptr_t ra)
{
......@@ -1008,10 +1025,10 @@ void HELPER(unpk)(CPUS390XState *env, uint32_t len, uint64_t dest,
}
}
uint32_t HELPER(unpka)(CPUS390XState *env, uint64_t dest, uint32_t destlen,
uint64_t src)
static inline uint32_t do_unpkau(CPUS390XState *env, uint64_t dest,
uint32_t destlen, int dsize, uint64_t src,
uintptr_t ra)
{
uintptr_t ra = GETPC();
int i;
uint32_t cc;
uint8_t b;
......@@ -1020,7 +1037,7 @@ uint32_t HELPER(unpka)(CPUS390XState *env, uint64_t dest, uint32_t destlen,
/* The operands are processed from right to left. */
src += srclen - 1;
dest += destlen - 1;
dest += destlen - dsize;
/* Check for the sign. */
b = cpu_ldub_data_ra(env, src, ra);
......@@ -1042,23 +1059,35 @@ uint32_t HELPER(unpka)(CPUS390XState *env, uint64_t dest, uint32_t destlen,
}
/* Now pad every nibble with 0x30, advancing one nibble at a time. */
for (i = 0; i < destlen; i++) {
if (i == 31) {
/* If length is 32 bytes, the leftmost byte is 0. */
for (i = 0; i < destlen; i += dsize) {
if (i == (31 * dsize)) {
/* If length is 32/64 bytes, the leftmost byte is 0. */
b = 0;
} else if (i % 2) {
} else if (i % (2 * dsize)) {
b = cpu_ldub_data_ra(env, src, ra);
src--;
} else {
b >>= 4;
}
cpu_stb_data_ra(env, dest, 0x30 + (b & 0xf), ra);
dest--;
cpu_stsize_data_ra(env, dest, 0x30 + (b & 0xf), dsize, ra);
dest -= dsize;
}
return cc;
}
uint32_t HELPER(unpka)(CPUS390XState *env, uint64_t dest, uint32_t destlen,
uint64_t src)
{
return do_unpkau(env, dest, destlen, 1, src, GETPC());
}
uint32_t HELPER(unpku)(CPUS390XState *env, uint64_t dest, uint32_t destlen,
uint64_t src)
{
return do_unpkau(env, dest, destlen, 2, src, GETPC());
}
static uint32_t do_helper_tr(CPUS390XState *env, uint32_t len, uint64_t array,
uint64_t trans, uintptr_t ra)
{
......
......@@ -4366,6 +4366,24 @@ static ExitStatus op_unpka(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
static ExitStatus op_unpku(DisasContext *s, DisasOps *o)
{
int l1 = get_field(s->fields, l1) + 1;
TCGv_i32 l;
/* The length must be even and should not exceed 64 bytes. */
if ((l1 & 1) || (l1 > 64)) {
gen_program_exception(s, PGM_SPECIFICATION);
return EXIT_NORETURN;
}
l = tcg_const_i32(l1);
gen_helper_unpku(cc_op, cpu_env, o->addr1, l, o->in2);
tcg_temp_free_i32(l);
set_cc_static(s);
return NO_EXIT;
}
static ExitStatus op_xc(DisasContext *s, DisasOps *o)
{
int d1 = get_field(s->fields, d1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment