[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 060/126] target-s390: Convert LCTL, STCTL
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 060/126] target-s390: Convert LCTL, STCTL |
Date: |
Sun, 9 Sep 2012 14:05:18 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 4 ++++
target-s390x/translate.c | 54 +++++++++++++++++++++-------------------------
2 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 745d1e6..522fe12 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -465,6 +465,8 @@
#ifndef CONFIG_USER_ONLY
/* DIAGNOSE (KVM hypercall) */
C(0x8300, DIAG, RX_a, Z, 0, 0, 0, 0, diag, 0)
+/* LOAD CONTROL */
+ C(0xb700, LCTL, RS_a, Z, 0, a2, 0, 0, lctl, 0)
/* LOAD PSW */
C(0x8200, LPSW, S, Z, 0, a2, 0, 0, lpsw, 0)
/* LOAD REAL ADDRESS */
@@ -483,6 +485,8 @@
C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0)
/* SIGNAL PROCESSOR */
C(0xae00, SIGP, RS_a, Z, r3_o, a2, 0, 0, sigp, 0)
+/* STORE CONTROL */
+ C(0xb600, STCTL, RS_a, Z, 0, a2, 0, 0, stctl, 0)
/* STORE THEN AND SYSTEM MASK */
C(0xac00, STNSM, SI, Z, la1, 0, new, m1_8, stnsm, 0)
/* STORE THEN OR SYSTEM MASK */
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 439a90d..d08b42f 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -2007,36 +2007,6 @@ static void disas_s390_insn(DisasContext *s)
r2 = insn & 0xf;
disas_b3(s, op, r3, r1, r2);
break;
-#ifndef CONFIG_USER_ONLY
- case 0xb6: /* STCTL R1,R3,D2(B2) [RS] */
- /* Store Control */
- check_privileged(s);
- insn = ld_code4(s->pc);
- decode_rs(s, insn, &r1, &r3, &b2, &d2);
- tmp = get_address(s, 0, b2, d2);
- tmp32_1 = tcg_const_i32(r1);
- tmp32_2 = tcg_const_i32(r3);
- potential_page_fault(s);
- gen_helper_stctl(cpu_env, tmp32_1, tmp, tmp32_2);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i32(tmp32_1);
- tcg_temp_free_i32(tmp32_2);
- break;
- case 0xb7: /* LCTL R1,R3,D2(B2) [RS] */
- /* Load Control */
- check_privileged(s);
- insn = ld_code4(s->pc);
- decode_rs(s, insn, &r1, &r3, &b2, &d2);
- tmp = get_address(s, 0, b2, d2);
- tmp32_1 = tcg_const_i32(r1);
- tmp32_2 = tcg_const_i32(r3);
- potential_page_fault(s);
- gen_helper_lctl(cpu_env, tmp32_1, tmp, tmp32_2);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i32(tmp32_1);
- tcg_temp_free_i32(tmp32_2);
- break;
-#endif
case 0xb9:
insn = ld_code4(s->pc);
r1 = (insn >> 4) & 0xf;
@@ -2843,6 +2813,18 @@ static ExitStatus op_ld64(DisasContext *s, DisasOps *o)
}
#ifndef CONFIG_USER_ONLY
+static ExitStatus op_lctl(DisasContext *s, DisasOps *o)
+{
+ TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+ TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));
+ check_privileged(s);
+ potential_page_fault(s);
+ gen_helper_lctl(cpu_env, r1, o->in2, r3);
+ tcg_temp_free_i32(r1);
+ tcg_temp_free_i32(r3);
+ return NO_EXIT;
+}
+
static ExitStatus op_lra(DisasContext *s, DisasOps *o)
{
check_privileged(s);
@@ -3148,6 +3130,18 @@ static ExitStatus op_ssm(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
+static ExitStatus op_stctl(DisasContext *s, DisasOps *o)
+{
+ TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+ TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));
+ check_privileged(s);
+ potential_page_fault(s);
+ gen_helper_stctl(cpu_env, r1, o->in2, r3);
+ tcg_temp_free_i32(r1);
+ tcg_temp_free_i32(r3);
+ return NO_EXIT;
+}
+
static ExitStatus op_stnsm(DisasContext *s, DisasOps *o)
{
uint64_t i2 = get_field(s->fields, i2);
--
1.7.11.4
- [Qemu-devel] [PATCH 043/126] target-s390: Convert LOAD PSW, (continued)
- [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, 2012/09/09
- [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 <=
- [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
- [Qemu-devel] [PATCH 087/126] target-s390: Convert SRST, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 089/126] target-s390: Convert SCK, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 096/126] target-s390: Convert STAP, Richard Henderson, 2012/09/09