[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 090/126] target-s390: Convert STCK
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 090/126] target-s390: Convert STCK |
Date: |
Sun, 9 Sep 2012 14:05:48 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/helper.h | 2 +-
target-s390x/insn-data.def | 3 +++
target-s390x/misc_helper.c | 6 ++----
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 33af097..00608c8 100644
--- a/target-s390x/helper.h
+++ b/target-s390x/helper.h
@@ -92,7 +92,7 @@ DEF_HELPER_4(diag, i64, env, i32, i64, i64)
DEF_HELPER_3(load_psw, void, env, i64, i64)
DEF_HELPER_1(program_interrupt, void, i32)
DEF_HELPER_FLAGS_2(spx, TCG_CALL_CONST, void, env, i64)
-DEF_HELPER_2(stck, i32, env, i64)
+DEF_HELPER_FLAGS_1(stck, TCG_CALL_CONST | TCG_CALL_PURE, i64, env)
DEF_HELPER_2(stcke, i32, env, i64)
DEF_HELPER_FLAGS_2(sckc, TCG_CALL_CONST, void, env, i64)
DEF_HELPER_FLAGS_2(stckc, TCG_CALL_CONST, void, env, i64)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index f5129bd..abff0cf 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 1a22f12..8bff132 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -753,11 +753,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 7221b22..dcb0c01 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1030,15 +1030,6 @@ static void disas_b2(DisasContext *s, int op, uint32_t
insn)
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);
@@ -2894,6 +2885,14 @@ static ExitStatus op_stidp(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_stnsm(DisasContext *s, DisasOps *o)
{
uint64_t i2 = get_field(s->fields, i2);
--
1.7.11.4
- Re: [Qemu-devel] [PATCH 086/126] target-s390: Convert CLST, MVST, (continued)
[Qemu-devel] [PATCH 087/126] target-s390: Convert SRST, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 089/126] target-s390: Convert SCK, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 096/126] target-s390: Convert STAP, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 098/126] target-s390: Convert ISKE, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 097/126] target-s390: Convert IPTE, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 100/126] target-s390: Convert RRBE, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 101/126] target-s390: Convert subchannel instructions, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 099/126] target-s390: Convert SSKE, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 090/126] target-s390: Convert STCK,
Richard Henderson <=
[Qemu-devel] [PATCH 067/126] target-s390: Convert STORE REVERSED, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 045/126] target-s390: Convert SHIFT, ROTATE SINGLE, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 066/126] target-s390: Convert LOAD REVERSED, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 048/126] target-s390: Convert MOVE, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 075/126] target-s390: Convert FP LOAD COMPLIMENT, NEGATIVE, POSITIVE, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 091/126] target-s390: Convert SCKC, STCKC, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 095/126] target-s390: Convert SPX, STPX, Richard Henderson, 2012/09/09
[Qemu-devel] [PATCH 047/126] target-s390: Convert LOAD, STORE MULTIPLE, Richard Henderson, 2012/09/09