[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 107/147] target-s390: Convert RRBE
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 107/147] target-s390: Convert RRBE |
Date: |
Thu, 27 Sep 2012 17:42:20 -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 | 22 ++++++++++------------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/target-s390x/helper.h b/target-s390x/helper.h
index 3b437c0..0b8e7a9 100644
--- a/target-s390x/helper.h
+++ b/target-s390x/helper.h
@@ -100,7 +100,7 @@ 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, i64, i64)
-DEF_HELPER_FLAGS_3(rrbe, TCG_CALL_CONST, i32, env, i32, i64)
+DEF_HELPER_FLAGS_2(rrbe, TCG_CALL_CONST, i32, env, i64)
DEF_HELPER_3(csp, i32, env, i32, i32)
DEF_HELPER_4(mvcs, i32, env, i64, i64, i64)
DEF_HELPER_4(mvcp, i32, env, i64, i64, i64)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index f554c1b..2a04572 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -635,6 +635,8 @@
C(0xdb00, MVCS, SS_d, Z, la1, a2, 0, 0, mvcs, 0)
/* PURGE TLB */
C(0xb20d, PTLB, S, Z, 0, 0, 0, 0, ptlb, 0)
+/* RESET REFERENCE BIT EXTENDED */
+ C(0xb22a, RRBE, RRE, Z, 0, r2_o, 0, 0, rrbe, 0)
/* SET ADDRESSING MODE */
/* We only do 64-bit, so accept this as a no-op.
Let SAM24 and SAM31 signal illegal instruction. */
diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c
index c6f7741..1a32436 100644
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_helper.c
@@ -964,7 +964,7 @@ void HELPER(sske)(CPUS390XState *env, uint64_t r1, uint64_t
r2)
}
/* reset reference bit extended */
-uint32_t HELPER(rrbe)(CPUS390XState *env, uint32_t r1, uint64_t r2)
+uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2)
{
uint8_t re;
uint8_t key;
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 68f5b3c..e211a60 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1033,18 +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 0x2a: /* RRBE 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_rrbe(cc_op, cpu_env, tmp32_1, tmp);
- set_cc_static(s);
- tcg_temp_free_i32(tmp32_1);
- tcg_temp_free_i64(tmp);
- break;
case 0x34: /* STCH ? */
/* Store Subchannel */
check_privileged(s);
@@ -2716,6 +2704,16 @@ static ExitStatus op_rll64(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
+#ifndef CONFIG_USER_ONLY
+static ExitStatus op_rrbe(DisasContext *s, DisasOps *o)
+{
+ check_privileged(s);
+ gen_helper_rrbe(cc_op, cpu_env, o->in2);
+ set_cc_static(s);
+ return NO_EXIT;
+}
+#endif
+
static ExitStatus op_sar(DisasContext *s, DisasOps *o)
{
int r1 = get_field(s->fields, r1);
--
1.7.11.4
- [Qemu-devel] [PATCH 097/147] target-s390: Convert STCK, (continued)
- [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, 2012/09/27
- [Qemu-devel] [PATCH 107/147] target-s390: Convert RRBE,
Richard Henderson <=
- [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
- [Qemu-devel] [PATCH 117/147] target-s390: Delete dead code from old translator, Richard Henderson, 2012/09/27