[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 106/147] target-s390: Convert SSKE
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 106/147] target-s390: Convert SSKE |
Date: |
Thu, 27 Sep 2012 17:41:15 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/helper.h | 2 +-
target-s390x/insn-data.def | 2 ++
target-s390x/mem_helper.c | 2 +-
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 28aabe7..3b437c0 100644
--- a/target-s390x/helper.h
+++ b/target-s390x/helper.h
@@ -99,7 +99,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_CONST, i32, i64, i64)
DEF_HELPER_FLAGS_2(iske, TCG_CALL_PURE|TCG_CALL_CONST, i64, env, i64)
-DEF_HELPER_FLAGS_3(sske, TCG_CALL_CONST, void, env, i32, i64)
+DEF_HELPER_FLAGS_3(sske, TCG_CALL_CONST, void, env, i64, i64)
DEF_HELPER_FLAGS_3(rrbe, TCG_CALL_CONST, 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 87daec1..f554c1b 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 8522140..c6f7741 100644
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_helper.c
@@ -952,7 +952,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 bf746c7..68f5b3c 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);
--
1.7.11.4
- [Qemu-devel] [PATCH 096/147] target-s390: Convert SCK, (continued)
- [Qemu-devel] [PATCH 096/147] target-s390: Convert SCK, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 097/147] target-s390: Convert STCK, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 098/147] target-s390: Convert SCKC, STCKC, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 099/147] target-s390: Convert SPT, STPT, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 100/147] target-s390: Convert SPKA, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 101/147] target-s390: Convert PTLB, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 102/147] target-s390: Convert SPX, STPX, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 103/147] target-s390: Convert STAP, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 104/147] target-s390: Convert IPTE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 105/147] target-s390: Convert ISKE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 106/147] target-s390: Convert SSKE,
Richard Henderson <=
- [Qemu-devel] [PATCH 107/147] target-s390: Convert RRBE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 108/147] target-s390: Convert subchannel instructions, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 109/147] target-s390: Convert STURA, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 110/147] target-s390: Convert CSP, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 111/147] target-s390: Convert STCKE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 112/147] target-s390: Convert SACF, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 113/147] target-s390: Convert STSI, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 114/147] target-s390: Convert STFL, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 115/147] target-s390: Convert LPSWE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 116/147] target-s390: Convert SERVC, Richard Henderson, 2012/09/27