diff options
| author | Richard Henderson <rth@twiddle.net> | 2012-08-27 09:18:01 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2013-01-05 12:18:43 -0800 |
| commit | 2bbde27f2548cb48f362eada1080e590f5453404 (patch) | |
| tree | 9dd226192a66a50cee66a0dacaa217a98f3c0a5f | |
| parent | 8026417c7169e7efd1696f3ed15e51306729176a (diff) | |
target-s390: Convert SSKE
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | target-s390x/helper.h | 2 | ||||
| -rw-r--r-- | target-s390x/insn-data.def | 2 | ||||
| -rw-r--r-- | target-s390x/mem_helper.c | 2 | ||||
| -rw-r--r-- | target-s390x/translate.c | 18 |
4 files changed, 11 insertions, 13 deletions
diff --git a/target-s390x/helper.h b/target-s390x/helper.h index d7736e3aa1..9ff0c36aa5 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -97,7 +97,7 @@ DEF_HELPER_4(stctl, void, env, i32, i64, i32) DEF_HELPER_4(stctg, void, env, i32, i64, i32) DEF_HELPER_FLAGS_2(tprot, TCG_CALL_NO_RWG, i32, i64, i64) DEF_HELPER_FLAGS_2(iske, TCG_CALL_NO_RWG_SE, i64, env, i64) -DEF_HELPER_FLAGS_3(sske, TCG_CALL_NO_RWG, void, env, i32, i64) +DEF_HELPER_FLAGS_3(sske, TCG_CALL_NO_RWG, void, env, i64, i64) DEF_HELPER_FLAGS_3(rrbe, TCG_CALL_NO_RWG, i32, env, i32, i64) DEF_HELPER_3(csp, i32, env, i32, i32) DEF_HELPER_4(mvcs, i32, env, i64, i64, i64) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 87daec1a79..f554c1b567 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -650,6 +650,8 @@ C(0xb210, SPX, S, Z, 0, m2_32u, 0, 0, spx, 0) /* SET PSW KEY FROM ADDRESS */ C(0xb20a, SPKA, S, Z, 0, a2, 0, 0, spka, 0) +/* SET STORAGE KEY EXTENDED */ + C(0xb22b, SSKE, RRF_c, Z, r1_o, r2_o, 0, 0, sske, 0) /* SET SYSTEM MASK */ C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0) /* SIGNAL PROCESSOR */ diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index 59877eef96..099724174a 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -946,7 +946,7 @@ uint64_t HELPER(iske)(CPUS390XState *env, uint64_t r2) } /* set storage key extended */ -void HELPER(sske)(CPUS390XState *env, uint32_t r1, uint64_t r2) +void HELPER(sske)(CPUS390XState *env, uint64_t r1, uint64_t r2) { uint64_t addr = get_address(env, 0, 0, r2); diff --git a/target-s390x/translate.c b/target-s390x/translate.c index b9647d8833..2b07a8ecf6 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1045,17 +1045,6 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op, tcg_temp_free_i32(tmp32_1); tcg_temp_free_i64(tmp); break; - case 0x2b: /* SSKE R1,R2 [RRE] */ - /* Set Storage Key Extended */ - check_privileged(s); - r1 = (insn >> 4) & 0xf; - r2 = insn & 0xf; - tmp32_1 = load_reg32(r1); - tmp = load_reg(r2); - gen_helper_sske(cpu_env, tmp32_1, tmp); - tcg_temp_free_i32(tmp32_1); - tcg_temp_free_i64(tmp); - break; case 0x34: /* STCH ? */ /* Store Subchannel */ check_privileged(s); @@ -2831,6 +2820,13 @@ static ExitStatus op_spka(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_sske(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_sske(cpu_env, o->in1, o->in2); + return NO_EXIT; +} + static ExitStatus op_ssm(DisasContext *s, DisasOps *o) { check_privileged(s); |