[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 056/126] target-s390: Convert MVCP, MVCS
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 056/126] target-s390: Convert MVCP, MVCS |
Date: |
Sun, 9 Sep 2012 14:05:14 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 4 ++++
target-s390x/translate.c | 49 ++++++++++++++++++++++------------------------
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index fa0711f..301e509 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -461,6 +461,10 @@
C(0x8300, DIAG, RX_a, Z, 0, 0, 0, 0, diag, 0)
/* LOAD PSW */
C(0x8200, LPSW, S, Z, 0, a2, 0, 0, lpsw, 0)
+/* MOVE TO PRIMARY */
+ C(0xda00, MVCP, SS_d, Z, la1, a2, 0, 0, mvcp, 0)
+/* MOVE TO SECONDARY */
+ C(0xdb00, MVCS, SS_d, Z, la1, a2, 0, 0, mvcs, 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/translate.c b/target-s390x/translate.c
index b3f79bd..c8ab897 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1994,7 +1994,7 @@ static void disas_s390_insn(DisasContext *s)
TCGv_i32 tmp32_1, tmp32_2;
unsigned char opc;
uint64_t insn;
- int op, r1, r2, r3, d1, d2, x2, b1, b2, r1b;
+ int op, r1, r2, r3, d2, x2, b2, r1b;
opc = cpu_ldub_code(cpu_single_env, s->pc);
LOG_DISAS("opc 0x%x\n", opc);
@@ -2132,31 +2132,6 @@ static void disas_s390_insn(DisasContext *s)
tcg_temp_free_i32(tmp32_1);
tcg_temp_free_i32(tmp32_2);
break;
-#ifndef CONFIG_USER_ONLY
- case 0xda: /* MVCP D1(R1,B1),D2(B2),R3 [SS] */
- case 0xdb: /* MVCS D1(R1,B1),D2(B2),R3 [SS] */
- check_privileged(s);
- potential_page_fault(s);
- insn = ld_code6(s->pc);
- r1 = (insn >> 36) & 0xf;
- r3 = (insn >> 32) & 0xf;
- b1 = (insn >> 28) & 0xf;
- d1 = (insn >> 16) & 0xfff;
- b2 = (insn >> 12) & 0xf;
- d2 = insn & 0xfff;
- /* XXX key in r3 */
- tmp = get_address(s, 0, b1, d1);
- tmp2 = get_address(s, 0, b2, d2);
- if (opc == 0xda) {
- gen_helper_mvcp(cc_op, cpu_env, regs[r1], tmp, tmp2);
- } else {
- gen_helper_mvcs(cc_op, cpu_env, regs[r1], tmp, tmp2);
- }
- set_cc_static(s);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- break;
-#endif
case 0xe3:
insn = ld_code6(s->pc);
debug_insn(insn);
@@ -3046,6 +3021,28 @@ static ExitStatus op_mvcle(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
+#ifndef CONFIG_USER_ONLY
+static ExitStatus op_mvcp(DisasContext *s, DisasOps *o)
+{
+ int r1 = get_field(s->fields, l1);
+ check_privileged(s);
+ potential_page_fault(s);
+ gen_helper_mvcp(cc_op, cpu_env, regs[r1], o->addr1, o->in2);
+ set_cc_static(s);
+ return NO_EXIT;
+}
+
+static ExitStatus op_mvcs(DisasContext *s, DisasOps *o)
+{
+ int r1 = get_field(s->fields, l1);
+ check_privileged(s);
+ potential_page_fault(s);
+ gen_helper_mvcs(cc_op, cpu_env, regs[r1], o->addr1, o->in2);
+ set_cc_static(s);
+ return NO_EXIT;
+}
+#endif
+
static ExitStatus op_mul(DisasContext *s, DisasOps *o)
{
tcg_gen_mul_i64(o->out, o->in1, o->in2);
--
1.7.11.4
- [Qemu-devel] [PATCH 051/126] target-s390: Convert LAM, STAM, (continued)
- [Qemu-devel] [PATCH 051/126] target-s390: Convert LAM, STAM, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 040/126] target-s390: Convert FP STORE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 052/126] target-s390: Convert CLCLE, MVCLE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 039/126] target-s390: Convert EXECUTE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 041/126] target-s390: Convert CONVERT TO DECIMAL, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 043/126] target-s390: Convert LOAD PSW, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 053/126] target-s390: Convert MVC, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 057/126] target-s390: Convert LRA, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 055/126] target-s390: Convert CLC, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 056/126] target-s390: Convert MVCP, MVCS,
Richard Henderson <=
- [Qemu-devel] [PATCH 054/126] target-s390: Convert NC, XC, OC, TR, UNPK, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 068/126] target-s390: Convert LLGT, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 070/126] target-s390: Convert FP SUBTRACT, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 058/126] target-s390: Convert SIGP, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 060/126] target-s390: Convert LCTL, STCTL, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 059/126] target-s390: Convert EFPC, STFPC, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 071/126] target-s390: Convert FP DIVIDE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 088/126] target-s390: Convert STIDP, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 086/126] target-s390: Convert CLST, MVST, Richard Henderson, 2012/09/09