[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 050/147] target-s390: Convert LOAD PSW
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 050/147] target-s390: Convert LOAD PSW |
Date: |
Thu, 27 Sep 2012 16:41:40 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 2 ++
target-s390x/translate.c | 41 +++++++++++++++++++++--------------------
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 45c36c1..b0bee9b 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -379,6 +379,8 @@
D(0xa701, TMLL, RI_a, Z, r1_o, i2_16u_shl, 0, 0, 0, tm64, 0)
#ifndef CONFIG_USER_ONLY
+/* LOAD PSW */
+ C(0x8200, LPSW, S, Z, 0, a2, 0, 0, lpsw, 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 bbdecab..ea876a0 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -2356,26 +2356,6 @@ static void disas_s390_insn(CPUS390XState *env,
DisasContext *s)
switch (opc) {
#ifndef CONFIG_USER_ONLY
- case 0x82: /* LPSW D2(B2) [S] */
- /* Load PSW */
- check_privileged(s);
- insn = ld_code4(env, s->pc);
- 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_ld32u(tmp2, tmp, get_mem_index(s));
- tcg_gen_addi_i64(tmp, tmp, 4);
- tcg_gen_qemu_ld32u(tmp3, tmp, get_mem_index(s));
- /* Convert the 32-bit PSW_MASK into the 64-bit PSW_MASK. */
- tcg_gen_shli_i64(tmp2, tmp2, 32);
- gen_helper_load_psw(cpu_env, tmp2, tmp3);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- tcg_temp_free_i64(tmp3);
- /* we need to keep cc_op intact */
- s->is_jmp = DISAS_JUMP;
- break;
case 0x83: /* DIAG R1,R3,D2 [RS] */
/* Diagnose call (KVM hypercall) */
check_privileged(s);
@@ -3511,6 +3491,27 @@ static ExitStatus op_ld64(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
+#ifndef CONFIG_USER_ONLY
+static ExitStatus op_lpsw(DisasContext *s, DisasOps *o)
+{
+ TCGv_i64 t1, t2;
+
+ check_privileged(s);
+
+ t1 = tcg_temp_new_i64();
+ t2 = tcg_temp_new_i64();
+ tcg_gen_qemu_ld32u(t1, o->in2, get_mem_index(s));
+ tcg_gen_addi_i64(o->in2, o->in2, 4);
+ tcg_gen_qemu_ld32u(t2, o->in2, get_mem_index(s));
+ /* Convert the 32-bit PSW_MASK into the 64-bit PSW_MASK. */
+ tcg_gen_shli_i64(t1, t1, 32);
+ 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_mov2(DisasContext *s, DisasOps *o)
{
o->out = o->in2;
--
1.7.11.4
- [Qemu-devel] [PATCH 040/147] target-s390: Convert SUPERVISOR CALL, (continued)
- [Qemu-devel] [PATCH 040/147] target-s390: Convert SUPERVISOR CALL, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 041/147] target-s390: Convert MOVE LONG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 042/147] target-s390: Convert FP LOAD, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 043/147] target-s390: Convert INSERT CHARACTER, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 044/147] target-s390: Cleanup cc computation helpers, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 045/147] target-s390: Convert INSERT CHARACTERS UNDER MASK, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 046/147] target-s390: Convert EXECUTE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 047/147] target-s390: Convert FP STORE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 048/147] target-s390: Convert CONVERT TO DECIMAL, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 049/147] target-s390: Convert SET SYSTEM MASK, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 050/147] target-s390: Convert LOAD PSW,
Richard Henderson <=
- [Qemu-devel] [PATCH 051/147] target-s390: Convert DIAGNOSE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 024/147] target-s390: Convert LOAD, LOAD LOGICAL, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 052/147] target-s390: Convert SHIFT, ROTATE SINGLE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 053/147] target-s390: Convert SHIFT DOUBLE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 054/147] target-s390: Convert LOAD, STORE MULTIPLE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 055/147] target-s390: Convert MOVE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 056/147] target-s390: Convert NI, XI, OI, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 057/147] target-s390: Convert STNSM, STOSM, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 058/147] target-s390: Convert LAM, STAM, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 059/147] target-s390: Convert CLCLE, MVCLE, Richard Henderson, 2012/09/27