diff options
| -rw-r--r-- | target-s390x/helper.h | 2 | ||||
| -rw-r--r-- | target-s390x/insn-data.def | 3 | ||||
| -rw-r--r-- | target-s390x/misc_helper.c | 6 | ||||
| -rw-r--r-- | target-s390x/translate.c | 17 |
4 files changed, 14 insertions, 14 deletions
diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 3591a92ada..d3a30cb4a0 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -84,7 +84,7 @@ DEF_HELPER_3(servc, i32, env, i32, i64) DEF_HELPER_4(diag, i64, env, i32, i64, i64) DEF_HELPER_3(load_psw, void, env, i64, i64) DEF_HELPER_FLAGS_2(spx, TCG_CALL_NO_RWG, void, env, i64) -DEF_HELPER_2(stck, i32, 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) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 824e9dc526..4404791661 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -640,6 +640,9 @@ C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0) /* SIGNAL PROCESSOR */ C(0xae00, SIGP, RS_a, Z, r3_o, a2, 0, 0, sigp, 0) +/* 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 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) diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index c16359134a..f1edf6c67b 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -154,11 +154,9 @@ static inline uint64_t clock_value(CPUS390XState *env) } /* Store Clock */ -uint32_t HELPER(stck)(CPUS390XState *env, uint64_t a1) +uint64_t HELPER(stck)(CPUS390XState *env) { - cpu_stq_data(env, a1, clock_value(env)); - - return 0; + return clock_value(env); } /* Store Clock Extended */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index e835df0ce9..624ee8d99a 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,15 +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 0x05: /* STCK D2(B2) [S] */ - /* Store Clock */ - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - potential_page_fault(s); - gen_helper_stck(cc_op, cpu_env, tmp); - set_cc_static(s); - tcg_temp_free_i64(tmp); - break; case 0x06: /* SCKC D2(B2) [S] */ /* Set Clock Comparator */ check_privileged(s); @@ -2924,6 +2915,14 @@ static ExitStatus op_ssm(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_stck(DisasContext *s, DisasOps *o) +{ + gen_helper_stck(o->out, cpu_env); + /* ??? We don't implement clock states. */ + gen_op_movi_cc(s, 0); + return NO_EXIT; +} + static ExitStatus op_stctg(DisasContext *s, DisasOps *o) { TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); |