[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 115/147] target-s390: Convert LPSWE
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 115/147] target-s390: Convert LPSWE |
Date: |
Thu, 27 Sep 2012 17:50:49 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 2 ++
target-s390x/translate.c | 37 ++++++++++++++++++-------------------
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index ba070f1..b0cf908 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -627,6 +627,8 @@
C(0xeb2f, LCTLG, RSY_a, Z, 0, a2, 0, 0, lctlg, 0)
/* LOAD PSW */
C(0x8200, LPSW, S, Z, 0, a2, 0, 0, lpsw, 0)
+/* LOAD PSW EXTENDED */
+ C(0xb2b2, LPSWE, S, Z, 0, a2, 0, 0, lpswe, 0)
/* LOAD REAL ADDRESS */
C(0xb100, LRA, RX_a, Z, 0, a2, r1, 0, lra, 0)
C(0xe313, LRAY, RXY_a, LD, 0, a2, r1, 0, lra, 0)
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 63d4be6..61bac81 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1022,10 +1022,9 @@ static void disas_b2(CPUS390XState *env, DisasContext
*s, int op,
uint32_t insn)
{
#ifndef CONFIG_USER_ONLY
- TCGv_i64 tmp, tmp2, tmp3;
+ TCGv_i64 tmp;
TCGv_i32 tmp32_1;
int r1, r2;
- int r3, d2, b2;
r1 = (insn >> 4) & 0xf;
r2 = insn & 0xf;
@@ -1033,23 +1032,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 0xb2: /* LPSWE D2(B2) [S] */
- /* Load PSW Extended */
- check_privileged(s);
- decode_rs(s, insn, &r1, &r3, &b2, &d2);
- tmp = get_address(s, 0, b2, d2);
- tmp2 = tcg_temp_new_i64();
- tmp3 = tcg_temp_new_i64();
- tcg_gen_qemu_ld64(tmp2, tmp, get_mem_index(s));
- tcg_gen_addi_i64(tmp, tmp, 8);
- tcg_gen_qemu_ld64(tmp3, tmp, get_mem_index(s));
- gen_helper_load_psw(cpu_env, tmp2, tmp3);
- /* we need to keep cc_op intact */
- s->is_jmp = DISAS_JUMP;
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- tcg_temp_free_i64(tmp3);
- break;
case 0x20: /* SERVC R1,R2 [RRE] */
/* SCLP Service call (PV hypercall) */
check_privileged(s);
@@ -2254,6 +2236,23 @@ static ExitStatus op_lpsw(DisasContext *s, DisasOps *o)
tcg_temp_free_i64(t2);
return EXIT_NORETURN;
}
+
+static ExitStatus op_lpswe(DisasContext *s, DisasOps *o)
+{
+ TCGv_i64 t1, t2;
+
+ check_privileged(s);
+
+ t1 = tcg_temp_new_i64();
+ t2 = tcg_temp_new_i64();
+ tcg_gen_qemu_ld64(t1, o->in2, get_mem_index(s));
+ tcg_gen_addi_i64(o->in2, o->in2, 8);
+ tcg_gen_qemu_ld64(t2, o->in2, get_mem_index(s));
+ gen_helper_load_psw(cpu_env, t1, t2);
+ tcg_temp_free_i64(t1);
+ tcg_temp_free_i64(t2);
+ return EXIT_NORETURN;
+}
#endif
static ExitStatus op_lam(DisasContext *s, DisasOps *o)
--
1.7.11.4
- [Qemu-devel] [PATCH 105/147] target-s390: Convert ISKE, (continued)
- [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, 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 <=
- [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
- [Qemu-devel] [PATCH 118/147] target-s390: Implement BRANCH ON INDEX, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 119/147] target-s390: Tidy s->op_cc handling, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 120/147] target-s390: Implement COMPARE AND BRANCH, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 121/147] target-s390: Implement RISBG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 122/147] target-s390: Implement LDGR, LGDR, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 123/147] target-s390: Implement R[NOX]SBG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 124/147] target-s390: Implement PREFETCH, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 125/147] target-s390: Implement COMPARE RELATIVE LONG, Richard Henderson, 2012/09/27