[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 110/147] target-s390: Convert CSP
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 110/147] target-s390: Convert CSP |
Date: |
Thu, 27 Sep 2012 17:45:31 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/helper.h | 2 +-
target-s390x/insn-data.def | 2 ++
target-s390x/mem_helper.c | 6 +++---
target-s390x/translate.c | 24 ++++++++++++------------
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/target-s390x/helper.h b/target-s390x/helper.h
index 0a2cd7c..84a46f5 100644
--- a/target-s390x/helper.h
+++ b/target-s390x/helper.h
@@ -101,7 +101,7 @@ DEF_HELPER_FLAGS_2(tprot, TCG_CALL_CONST, i32, i64, i64)
DEF_HELPER_FLAGS_2(iske, TCG_CALL_PURE|TCG_CALL_CONST, i64, env, i64)
DEF_HELPER_FLAGS_3(sske, TCG_CALL_CONST, void, env, i64, i64)
DEF_HELPER_FLAGS_2(rrbe, TCG_CALL_CONST, i32, env, i64)
-DEF_HELPER_3(csp, i32, env, i32, i32)
+DEF_HELPER_3(csp, i32, env, i32, i64)
DEF_HELPER_4(mvcs, i32, env, i64, i64, i64)
DEF_HELPER_4(mvcp, i32, env, i64, i64, i64)
DEF_HELPER_4(sigp, i32, env, i64, i32, i64)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 8e457cb..12468a3 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -614,6 +614,8 @@
C(0xf300, UNPK, SS_a, Z, la1, a2, 0, 0, unpk, 0)
#ifndef CONFIG_USER_ONLY
+/* COMPARE AND SWAP AND PURGE */
+ C(0xb250, CSP, RRE, Z, 0, ra2, 0, 0, csp, 0)
/* DIAGNOSE (KVM hypercall) */
C(0x8300, DIAG, RX_a, Z, 0, 0, 0, 0, diag, 0)
/* INSERT STORAGE KEY EXTENDED */
diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c
index b8e4681..2d4da45 100644
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_helper.c
@@ -990,16 +990,16 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2)
}
/* compare and swap and purge */
-uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1, uint32_t r2)
+uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1, uint64_t r2)
{
uint32_t cc;
uint32_t o1 = env->regs[r1];
- uint64_t a2 = get_address_31fix(env, r2) & ~3ULL;
+ uint64_t a2 = r2 & ~3ULL;
uint32_t o2 = cpu_ldl_data(env, a2);
if (o1 == o2) {
cpu_stl_data(env, a2, env->regs[(r1 + 1) & 15]);
- if (env->regs[r2] & 0x3) {
+ if (r2 & 0x3) {
/* flush TLB / ALB */
tlb_flush(env, 1);
}
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index f1546a7..585e739 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1033,18 +1033,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 0x50: /* CSP R1,R2 [RRE] */
- /* Compare And Swap And Purge */
- check_privileged(s);
- r1 = (insn >> 4) & 0xf;
- r2 = insn & 0xf;
- tmp32_1 = tcg_const_i32(r1);
- tmp32_2 = tcg_const_i32(r2);
- gen_helper_csp(cc_op, cpu_env, tmp32_1, tmp32_2);
- set_cc_static(s);
- tcg_temp_free_i32(tmp32_1);
- tcg_temp_free_i32(tmp32_2);
- break;
case 0x78: /* STCKE D2(B2) [S] */
/* Store Clock Extended */
decode_rs(s, insn, &r1, &r3, &b2, &d2);
@@ -1901,6 +1889,18 @@ static ExitStatus op_csg(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
+#ifndef CONFIG_USER_ONLY
+static ExitStatus op_csp(DisasContext *s, DisasOps *o)
+{
+ TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
+ check_privileged(s);
+ gen_helper_csp(cc_op, cpu_env, r1, o->in2);
+ tcg_temp_free_i32(r1);
+ set_cc_static(s);
+ return NO_EXIT;
+}
+#endif
+
static ExitStatus op_cds(DisasContext *s, DisasOps *o)
{
int r3 = get_field(s->fields, r3);
--
1.7.11.4
- [Qemu-devel] [PATCH 100/147] target-s390: Convert SPKA, (continued)
- [Qemu-devel] [PATCH 100/147] target-s390: Convert SPKA, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 101/147] target-s390: Convert PTLB, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 102/147] target-s390: Convert SPX, STPX, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 103/147] target-s390: Convert STAP, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 104/147] target-s390: Convert IPTE, Richard Henderson, 2012/09/27
- [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 <=
- [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, 2012/09/27
- [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