mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
target-s390: Convert SCKC, STCKC
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
parent
434c91a5f4
commit
dd3eb7b54f
|
@ -87,7 +87,7 @@ DEF_HELPER_FLAGS_2(spx, TCG_CALL_NO_RWG, void, env, i64)
|
|||
DEF_HELPER_FLAGS_1(stck, TCG_CALL_NO_RWG_SE, i64, env)
|
||||
DEF_HELPER_2(stcke, i32, env, i64)
|
||||
DEF_HELPER_FLAGS_2(sckc, TCG_CALL_NO_RWG, void, env, i64)
|
||||
DEF_HELPER_FLAGS_2(stckc, TCG_CALL_NO_RWG, void, env, i64)
|
||||
DEF_HELPER_FLAGS_1(stckc, TCG_CALL_NO_RWG, i64, env)
|
||||
DEF_HELPER_FLAGS_2(spt, TCG_CALL_NO_RWG, void, env, i64)
|
||||
DEF_HELPER_FLAGS_2(stpt, TCG_CALL_NO_RWG, void, env, i64)
|
||||
DEF_HELPER_4(stsi, i32, env, i64, i32, i32)
|
||||
|
|
|
@ -636,6 +636,8 @@
|
|||
/* SET CLOCK */
|
||||
/* ??? Not implemented - is it necessary? */
|
||||
C(0xb204, SCK, S, Z, 0, 0, 0, 0, 0, 0)
|
||||
/* SET CLOCK COMPARATOR */
|
||||
C(0xb206, SCKC, S, Z, 0, m2_64, 0, 0, sckc, 0)
|
||||
/* SET SYSTEM MASK */
|
||||
C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0)
|
||||
/* SIGNAL PROCESSOR */
|
||||
|
@ -643,6 +645,8 @@
|
|||
/* STORE CLOCK */
|
||||
C(0xb205, STCK, S, Z, la2, 0, new, m1_64, stck, 0)
|
||||
C(0xb27c, STCKF, S, Z, la2, 0, new, m1_64, stck, 0)
|
||||
/* STORE CLOCK COMPARATOR */
|
||||
C(0xb207, STCKC, S, Z, la2, 0, new, m1_64, stckc, 0)
|
||||
/* STORE CONTROL */
|
||||
C(0xb600, STCTL, RS_a, Z, 0, a2, 0, 0, stctl, 0)
|
||||
C(0xeb25, STCTG, RSY_a, Z, 0, a2, 0, 0, stctg, 0)
|
||||
|
|
|
@ -174,10 +174,8 @@ uint32_t HELPER(stcke)(CPUS390XState *env, uint64_t a1)
|
|||
}
|
||||
|
||||
/* Set Clock Comparator */
|
||||
void HELPER(sckc)(CPUS390XState *env, uint64_t a1)
|
||||
void HELPER(sckc)(CPUS390XState *env, uint64_t time)
|
||||
{
|
||||
uint64_t time = cpu_ldq_data(env, a1);
|
||||
|
||||
if (time == -1ULL) {
|
||||
return;
|
||||
}
|
||||
|
@ -191,10 +189,10 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t a1)
|
|||
}
|
||||
|
||||
/* Store Clock Comparator */
|
||||
void HELPER(stckc)(CPUS390XState *env, uint64_t a1)
|
||||
uint64_t HELPER(stckc)(CPUS390XState *env)
|
||||
{
|
||||
/* XXX implement */
|
||||
cpu_stq_data(env, a1, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Set CPU Timer */
|
||||
|
|
|
@ -1033,24 +1033,6 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op,
|
|||
LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2);
|
||||
|
||||
switch (op) {
|
||||
case 0x06: /* SCKC D2(B2) [S] */
|
||||
/* Set Clock Comparator */
|
||||
check_privileged(s);
|
||||
decode_rs(s, insn, &r1, &r3, &b2, &d2);
|
||||
tmp = get_address(s, 0, b2, d2);
|
||||
potential_page_fault(s);
|
||||
gen_helper_sckc(cpu_env, tmp);
|
||||
tcg_temp_free_i64(tmp);
|
||||
break;
|
||||
case 0x07: /* STCKC D2(B2) [S] */
|
||||
/* Store Clock Comparator */
|
||||
check_privileged(s);
|
||||
decode_rs(s, insn, &r1, &r3, &b2, &d2);
|
||||
tmp = get_address(s, 0, b2, d2);
|
||||
potential_page_fault(s);
|
||||
gen_helper_stckc(cpu_env, tmp);
|
||||
tcg_temp_free_i64(tmp);
|
||||
break;
|
||||
case 0x08: /* SPT D2(B2) [S] */
|
||||
/* Set CPU Timer */
|
||||
check_privileged(s);
|
||||
|
@ -2923,6 +2905,20 @@ static ExitStatus op_stck(DisasContext *s, DisasOps *o)
|
|||
return NO_EXIT;
|
||||
}
|
||||
|
||||
static ExitStatus op_sckc(DisasContext *s, DisasOps *o)
|
||||
{
|
||||
check_privileged(s);
|
||||
gen_helper_sckc(cpu_env, o->in2);
|
||||
return NO_EXIT;
|
||||
}
|
||||
|
||||
static ExitStatus op_stckc(DisasContext *s, DisasOps *o)
|
||||
{
|
||||
check_privileged(s);
|
||||
gen_helper_stckc(o->out, cpu_env);
|
||||
return NO_EXIT;
|
||||
}
|
||||
|
||||
static ExitStatus op_stctg(DisasContext *s, DisasOps *o)
|
||||
{
|
||||
TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
|
||||
|
|
Loading…
Reference in a new issue