Signed-off-by: Richard Henderson <[email protected]>
---
target-s390x/insn-data.def | 2 ++
target-s390x/translate.c | 19 +++++++------------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index ba7b876..3af659a 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -616,6 +616,8 @@
#ifndef CONFIG_USER_ONLY
/* DIAGNOSE (KVM hypercall) */
C(0x8300, DIAG, RX_a, Z, 0, 0, 0, 0, diag, 0)
+/* INSERT STORAGE KEY EXTENDED */
+ C(0xb229, ISKE, RRE, Z, 0, r2_o, new, r1_8, iske, 0)
/* INVALIDATE PAGE TABLE ENTRY */
C(0xb221, IPTE, RRF_a, Z, r1_o, r2_o, 0, 0, ipte, 0)
/* LOAD CONTROL */
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index a677ded..b39ecc8 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1030,18 +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 0x29: /* ISKE R1,R2 [RRE] */
- /* Insert Storage Key Extended */
- check_privileged(s);
- r1 = (insn >> 4) & 0xf;
- r2 = insn & 0xf;
- tmp = load_reg(r2);
- tmp2 = tcg_temp_new_i64();
- gen_helper_iske(tmp2, cpu_env, tmp);
- store_reg(r1, tmp2);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- break;
case 0x2a: /* RRBE R1,R2 [RRE] */
/* Set Storage Key Extended */
check_privileged(s);
@@ -2162,6 +2150,13 @@ static ExitStatus op_ipte(DisasContext *s, DisasOps *o)
gen_helper_ipte(cpu_env, o->in1, o->in2);
return NO_EXIT;
}
+
+static ExitStatus op_iske(DisasContext *s, DisasOps *o)
+{
+ check_privileged(s);
+ gen_helper_iske(o->out, cpu_env, o->in2);
+ return NO_EXIT;
+}
#endif
static ExitStatus op_ldeb(DisasContext *s, DisasOps *o)
--
1.7.11.4
