diff options
| author | Richard Henderson <rth@twiddle.net> | 2012-08-27 10:17:16 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2013-01-05 12:18:43 -0800 |
| commit | 14244b21a041161185bb53c3eb29e3d8dc7bfe6e (patch) | |
| tree | 3ad539f046f5a37d775b512fb5ba3f5ec72841a5 | |
| parent | 39a5003c89191a46ec6af722ade3dfdf457e9f58 (diff) | |
target-s390: Convert SACF
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | target-s390x/insn-data.def | 2 | ||||
| -rw-r--r-- | target-s390x/translate.c | 21 |
2 files changed, 10 insertions, 13 deletions
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 75729fee64..a389f1503e 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -643,6 +643,8 @@ /* 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 ADDRESS SPACE CONTROL FAST */ + C(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0) /* SET CLOCK */ /* ??? Not implemented - is it necessary? */ C(0xb204, SCK, S, Z, 0, 0, 0, 0, 0, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index e5c3ee6dd7..491f8fd6b6 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,19 +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 0x79: /* SACF D2(B2) [S] */ - /* Set Address Space Control Fast */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - potential_page_fault(s); - gen_helper_sacf(cpu_env, tmp); - tcg_temp_free_i64(tmp); - /* addressing mode has changed, so end the block */ - s->pc = s->next_pc; - update_psw_addr(s); - s->is_jmp = DISAS_JUMP; - break; case 0x7d: /* STSI D2,(B2) [S] */ check_privileged(s); decode_rs(s, insn, &r1, &r3, &b2, &d2); @@ -2681,6 +2668,14 @@ static ExitStatus op_rrbe(DisasContext *s, DisasOps *o) set_cc_static(s); return NO_EXIT; } + +static ExitStatus op_sacf(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_sacf(cpu_env, o->in2); + /* Addressing mode has changed, so end the block. */ + return EXIT_PC_STALE; +} #endif static ExitStatus op_sar(DisasContext *s, DisasOps *o) |