OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/s390x: implement COMPARE LOGICAL LONG 

As CLCL and CLCLE mostly differ by their operands, use a common do_clcl
helper. Another difference is that CLCL is not interruptible.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <20170531220129.27724-19-aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Aurelien Jarno 2017-06-01 00:01:17 +02:00 committed by Richard Henderson
parent 84aa07f109
commit 5c2b48a8f0
4 changed files with 99 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/s390x/helper.h
View File

@ -6,6 +6,7 @@ DEF_HELPER_FLAGS_4(mvc, TCG_CALL_NO_WG, void, env, i32, i64, i64)
DEF_HELPER_FLAGS_4(mvcin, TCG_CALL_NO_WG, void, env, i32, i64, i64)
DEF_HELPER_FLAGS_4(clc, TCG_CALL_NO_WG, i32, env, i32, i64, i64)
DEF_HELPER_3(mvcl, i32, env, i32, i32)
DEF_HELPER_3(clcl, i32, env, i32, i32)
DEF_HELPER_FLAGS_4(clm, TCG_CALL_NO_WG, i32, env, i32, i32, i64)
DEF_HELPER_FLAGS_3(divs32, TCG_CALL_NO_WG, s64, env, s64, s64)
DEF_HELPER_FLAGS_3(divu32, TCG_CALL_NO_WG, i64, env, i64, i64)

2
target/s390x/insn-data.def
View File

@ -216,6 +216,8 @@
C(0xc60e, CLGFRL, RIL_b, GIE, r1_o, mri2_32u, 0, 0, 0, cmpu64)
C(0xc607, CLHRL, RIL_b, GIE, r1_o, mri2_16u, 0, 0, 0, cmpu32)
C(0xc606, CLGHRL, RIL_b, GIE, r1_o, mri2_16u, 0, 0, 0, cmpu64)
/* COMPARE LOGICAL LONG */
C(0x0f00, CLCL, RR_a, Z, 0, 0, 0, 0, clcl, 0)
/* COMPARE LOGICAL LONG EXTENDED */
C(0xa900, CLCLE, RS_a, Z, 0, a2, 0, 0, clcle, 0)
/* COMPARE LOGICAL CHARACTERS UNDER MASK */

114
target/s390x/mem_helper.c
View File

@ -661,6 +661,78 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2,
return cc;
}
/* compare logical long helper */
static inline uint32_t do_clcl(CPUS390XState *env,
uint64_t *src1, uint64_t *src1len,
uint64_t *src3, uint64_t *src3len,
uint8_t pad, uint64_t limit,
uintptr_t ra)
{
uint64_t len = MAX(*src1len, *src3len);
uint32_t cc = 0;
if (!len) {
return cc;
}
/* Lest we fail to service interrupts in a timely manner, limit the
amount of work we're willing to do. */
if (len > limit) {
len = limit;
cc = 3;
}
for (; len; len--) {
uint8_t v1 = pad;
uint8_t v3 = pad;
if (*src1len) {
v1 = cpu_ldub_data_ra(env, *src1, ra);
}
if (*src3len) {
v3 = cpu_ldub_data_ra(env, *src3, ra);
}
if (v1 != v3) {
cc = (v1 < v3) ? 1 : 2;
break;
}
if (*src1len) {
*src1 += 1;
*src1len -= 1;
}
if (*src3len) {
*src3 += 1;
*src3len -= 1;
}
}
return cc;
}
/* compare logical long */
uint32_t HELPER(clcl)(CPUS390XState *env, uint32_t r1, uint32_t r2)
{
uintptr_t ra = GETPC();
uint64_t src1len = extract64(env->regs[r1 + 1], 0, 24);
uint64_t src1 = get_address(env, r1);
uint64_t src3len = extract64(env->regs[r2 + 1], 0, 24);
uint64_t src3 = get_address(env, r2);
uint8_t pad = env->regs[r2 + 1] >> 24;
uint32_t cc;
cc = do_clcl(env, &src1, &src1len, &src3, &src3len, pad, -1, ra);
env->regs[r1 + 1] = deposit64(env->regs[r1 + 1], 0, 24, src1len);
env->regs[r2 + 1] = deposit64(env->regs[r2 + 1], 0, 24, src3len);
set_address(env, r1, src1);
set_address(env, r2, src3);
return cc;
}
/* compare logical long extended memcompare insn with padding */
uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2,
uint32_t r3)
@ -670,46 +742,10 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2,
uint64_t src1 = get_address(env, r1);
uint64_t src3len = get_length(env, r3 + 1);
uint64_t src3 = get_address(env, r3);
uint8_t pad = a2 & 0xff;
uint64_t len = MAX(src1len, src3len);
uint32_t cc = 0;
uint8_t pad = a2;
uint32_t cc;
if (!len) {
return cc;
}
/* Lest we fail to service interrupts in a timely manner, limit the
amount of work we're willing to do. For now, let's cap at 8k. */
if (len > 0x2000) {
len = 0x2000;
cc = 3;
}
for (; len; len--) {
uint8_t v1 = pad;
uint8_t v3 = pad;
if (src1len) {
v1 = cpu_ldub_data_ra(env, src1, ra);
}
if (src3len) {
v3 = cpu_ldub_data_ra(env, src3, ra);
}
if (v1 != v3) {
cc = (v1 < v3) ? 1 : 2;
break;
}
if (src1len) {
src1++;
src1len--;
}
if (src3len) {
src3++;
src3len--;
}
}
cc = do_clcl(env, &src1, &src1len, &src3, &src3len, pad, 0x2000, ra);
set_length(env, r1 + 1, src1len);
set_length(env, r3 + 1, src3len);

21
target/s390x/translate.c
View File

@ -1920,6 +1920,27 @@ static ExitStatus op_clc(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
static ExitStatus op_clcl(DisasContext *s, DisasOps *o)
{
int r1 = get_field(s->fields, r1);
int r2 = get_field(s->fields, r2);
TCGv_i32 t1, t2;
/* r1 and r2 must be even. */
if (r1 & 1 || r2 & 1) {
gen_program_exception(s, PGM_SPECIFICATION);
return EXIT_NORETURN;
}
t1 = tcg_const_i32(r1);
t2 = tcg_const_i32(r2);
gen_helper_clcl(cc_op, cpu_env, t1, t2);
tcg_temp_free_i32(t1);
tcg_temp_free_i32(t2);
set_cc_static(s);
return NO_EXIT;
}
static ExitStatus op_clcle(DisasContext *s, DisasOps *o)
{
int r1 = get_field(s->fields, r1);