[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 085/126] target-s390: Convert MVPG
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 085/126] target-s390: Convert MVPG |
Date: |
Sun, 9 Sep 2012 14:05:43 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 2 ++
target-s390x/mem_helper.c | 7 ++-----
target-s390x/translate.c | 20 ++++++++------------
3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index f282e99..4b30dd5 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -394,6 +394,8 @@
C(0x0e00, MVCL, RR_a, Z, 0, 0, 0, 0, mvcl, 0)
/* MOVE LONG EXTENDED */
C(0xa800, MVCLE, RS_a, Z, 0, a2, 0, 0, mvcle, 0)
+/* MOVE PAGE */
+ C(0xb254, MVPG, RRE, Z, r1_o, r2_o, 0, 0, mvpg, 0)
/* MULTIPLY */
C(0x1c00, MR, RR_a, Z, r1p1_32s, r2_32s, new, r1_D32, mul, 0)
diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c
index 5f70aad..e9cacf9 100644
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_helper.c
@@ -404,12 +404,9 @@ uint32_t HELPER(clst)(CPUS390XState *env, uint32_t c,
uint32_t r1, uint32_t r2)
void HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2)
{
/* XXX missing r0 handling */
+ env->cc_op = 0;
#ifdef CONFIG_USER_ONLY
- int i;
-
- for (i = 0; i < TARGET_PAGE_SIZE; i++) {
- cpu_stb_data(env, r1 + i, cpu_ldub_data(env, r2 + i));
- }
+ memmove(g2h(r1), g2h(r2), TARGET_PAGE_SIZE);
#else
mvc_fast_memmove(env, TARGET_PAGE_SIZE, r1, r2);
#endif
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 08a3e77..a49475b 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1031,18 +1031,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 0x54: /* MVPG R1,R2 [RRE] */
- tmp = load_reg(0);
- tmp2 = load_reg(r1);
- tmp3 = load_reg(r2);
- potential_page_fault(s);
- gen_helper_mvpg(cpu_env, tmp, tmp2, tmp3);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- tcg_temp_free_i64(tmp3);
- /* XXX check CCO bit and set CC accordingly */
- gen_op_movi_cc(s, 0);
- break;
case 0x55: /* MVST R1,R2 [RRE] */
tmp32_1 = load_reg32(0);
tmp32_2 = tcg_const_i32(r1);
@@ -2593,6 +2581,14 @@ static ExitStatus op_mvcs(DisasContext *s, DisasOps *o)
}
#endif
+static ExitStatus op_mvpg(DisasContext *s, DisasOps *o)
+{
+ potential_page_fault(s);
+ gen_helper_mvpg(cpu_env, regs[0], o->in1, o->in2);
+ set_cc_static(s);
+ return NO_EXIT;
+}
+
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 048/126] target-s390: Convert MOVE, (continued)
- [Qemu-devel] [PATCH 048/126] target-s390: Convert MOVE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 075/126] target-s390: Convert FP LOAD COMPLIMENT, NEGATIVE, POSITIVE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 091/126] target-s390: Convert SCKC, STCKC, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 095/126] target-s390: Convert SPX, STPX, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 047/126] target-s390: Convert LOAD, STORE MULTIPLE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 065/126] target-s390: Convert LOAD CONTROL, part 2, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 074/126] target-s390: Convert TEST DATA CLASS, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 062/126] target-s390: Convert CLM, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 044/126] target-s390: Convert DIAGNOSE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 076/126] target-s390: Convert FP SQUARE ROOT, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 085/126] target-s390: Convert MVPG,
Richard Henderson <=
- [Qemu-devel] [PATCH 078/126] target-s390: Convert CONVERT TO FIXED, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 063/126] target-s390: Convert STCM, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 079/126] target-s390: Convert CONVERT FROM FIXED, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 093/126] target-s390: Convert SPKA, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 077/126] target-s390: Convert LOAD ZERO, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 064/126] target-s390: Convert TPROT, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 092/126] target-s390: Convert SPT, STPT, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 084/126] target-s390: Convert EAR, SAR, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 083/126] target-s390: Convert CKSM, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 094/126] target-s390: Convert PTLB, Richard Henderson, 2012/09/09