diff options
| author | Richard Henderson <rth@twiddle.net> | 2012-08-24 15:20:49 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2013-01-05 12:18:42 -0800 |
| commit | 352897995147c4a054679654048f5c128ca32743 (patch) | |
| tree | 93bc6e1c18767563bccf5039bd1ac4ecbbc0a6fd /target-s390x | |
| parent | 71bd666963ad9fb004d7aa919b7222165e602173 (diff) | |
target-s390: Convert SCK
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/helper.h | 1 | ||||
| -rw-r--r-- | target-s390x/insn-data.def | 3 | ||||
| -rw-r--r-- | target-s390x/misc_helper.c | 8 | ||||
| -rw-r--r-- | target-s390x/translate.c | 10 |
4 files changed, 3 insertions, 19 deletions
diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 8e90741d3f..3591a92ada 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -84,7 +84,6 @@ 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_FLAGS_1(sck, TCG_CALL_NO_RWG, i32, i64) DEF_HELPER_2(stck, i32, env, i64) DEF_HELPER_2(stcke, i32, env, i64) DEF_HELPER_FLAGS_2(sckc, TCG_CALL_NO_RWG, void, env, i64) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 4d9ecf4b13..824e9dc526 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -633,6 +633,9 @@ /* We only do 64-bit, so accept this as a no-op. Let SAM24 and SAM31 signal illegal instruction. */ C(0x010e, SAM64, E, Z, 0, 0, 0, 0, 0, 0) +/* SET CLOCK */ + /* ??? Not implemented - is it necessary? */ + C(0xb204, SCK, S, Z, 0, 0, 0, 0, 0, 0) /* SET SYSTEM MASK */ C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0) /* SIGNAL PROCESSOR */ diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 009cc92660..c16359134a 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -143,14 +143,6 @@ void HELPER(spx)(CPUS390XState *env, uint64_t a1) tlb_flush_page(env, TARGET_PAGE_SIZE); } -/* Set Clock */ -uint32_t HELPER(sck)(uint64_t a1) -{ - /* XXX not implemented - is it necessary? */ - - return 0; -} - static inline uint64_t clock_value(CPUS390XState *env) { uint64_t time; diff --git a/target-s390x/translate.c b/target-s390x/translate.c index d57c737fc8..e835df0ce9 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,16 +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 0x04: /* SCK D2(B2) [S] */ - /* Set Clock */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - potential_page_fault(s); - gen_helper_sck(cc_op, tmp); - set_cc_static(s); - tcg_temp_free_i64(tmp); - break; case 0x05: /* STCK D2(B2) [S] */ /* Store Clock */ decode_rs(s, insn, &r1, &r3, &b2, &d2); |