[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 055/126] target-s390: Convert CLC
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 055/126] target-s390: Convert CLC |
Date: |
Sun, 9 Sep 2012 14:05:13 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 1 +
target-s390x/translate.c | 107 ++++++++++++++-------------------------------
2 files changed, 35 insertions(+), 73 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index f7941d8..fa0711f 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -119,6 +119,7 @@
C(0xb931, CLGFR, RRE, Z, r1, r2_32u, 0, 0, 0, cmpu64)
C(0xe321, CLG, RXY_a, Z, r1, m2_64, 0, 0, 0, cmpu64)
C(0xe331, CLGF, RXY_a, Z, r1, m2_32u, 0, 0, 0, cmpu64)
+ C(0xd500, CLC, SS_a, Z, la1, a2, 0, 0, clc, 0)
/* COMPARE LOGICAL IMMEDIATE */
C(0xc20f, CLFI, RIL_a, EI, r1, i2, 0, 0, 0, cmpu32)
C(0xc20e, CLGFI, RIL_a, EI, r1, i2_32u, 0, 0, 0, cmpu64)
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 45b8c3a..b3f79bd 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1010,67 +1010,6 @@ static void free_compare(DisasCompare *c)
}
}
-static void gen_op_clc(DisasContext *s, int l, TCGv_i64 s1, TCGv_i64 s2)
-{
- TCGv_i64 tmp;
- TCGv_i64 tmp2;
- TCGv_i32 vl;
-
- /* check for simple 32bit or 64bit match */
- switch (l) {
- case 0:
- tmp = tcg_temp_new_i64();
- tmp2 = tcg_temp_new_i64();
-
- tcg_gen_qemu_ld8u(tmp, s1, get_mem_index(s));
- tcg_gen_qemu_ld8u(tmp2, s2, get_mem_index(s));
- cmp_u64(s, tmp, tmp2);
-
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- return;
- case 1:
- tmp = tcg_temp_new_i64();
- tmp2 = tcg_temp_new_i64();
-
- tcg_gen_qemu_ld16u(tmp, s1, get_mem_index(s));
- tcg_gen_qemu_ld16u(tmp2, s2, get_mem_index(s));
- cmp_u64(s, tmp, tmp2);
-
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- return;
- case 3:
- tmp = tcg_temp_new_i64();
- tmp2 = tcg_temp_new_i64();
-
- tcg_gen_qemu_ld32u(tmp, s1, get_mem_index(s));
- tcg_gen_qemu_ld32u(tmp2, s2, get_mem_index(s));
- cmp_u64(s, tmp, tmp2);
-
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- return;
- case 7:
- tmp = tcg_temp_new_i64();
- tmp2 = tcg_temp_new_i64();
-
- tcg_gen_qemu_ld64(tmp, s1, get_mem_index(s));
- tcg_gen_qemu_ld64(tmp2, s2, get_mem_index(s));
- cmp_u64(s, tmp, tmp2);
-
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- return;
- }
-
- potential_page_fault(s);
- vl = tcg_const_i32(l);
- gen_helper_clc(cc_op, cpu_env, vl, s1, s2);
- tcg_temp_free_i32(vl);
- set_cc_static(s);
-}
-
static void disas_e3(DisasContext* s, int op, int r1, int x2, int b2, int d2)
{
TCGv_i64 addr, tmp2;
@@ -2193,18 +2132,6 @@ static void disas_s390_insn(DisasContext *s)
tcg_temp_free_i32(tmp32_1);
tcg_temp_free_i32(tmp32_2);
break;
- case 0xd5: /* CLC D1(L,B1),D2(B2) [SS] */
- insn = ld_code6(s->pc);
- b1 = (insn >> 28) & 0xf;
- b2 = (insn >> 12) & 0xf;
- d1 = (insn >> 16) & 0xfff;
- d2 = insn & 0xfff;
- tmp = get_address(s, 0, b1, d1);
- tmp2 = get_address(s, 0, b2, d2);
- gen_op_clc(s, (insn >> 32) & 0xff, tmp, tmp2);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- break;
#ifndef CONFIG_USER_ONLY
case 0xda: /* MVCP D1(R1,B1),D2(B2),R3 [SS] */
case 0xdb: /* MVCS D1(R1,B1),D2(B2),R3 [SS] */
@@ -2746,6 +2673,40 @@ static ExitStatus op_bct64(DisasContext *s, DisasOps *o)
return help_branch(s, &c, is_imm, imm, o->in2);
}
+static ExitStatus op_clc(DisasContext *s, DisasOps *o)
+{
+ int l = get_field(s->fields, l1);
+ TCGv_i32 vl;
+
+ switch (l + 1) {
+ case 1:
+ tcg_gen_qemu_ld8u(cc_src, o->addr1, get_mem_index(s));
+ tcg_gen_qemu_ld8u(cc_dst, o->in2, get_mem_index(s));
+ break;
+ case 2:
+ tcg_gen_qemu_ld16u(cc_src, o->addr1, get_mem_index(s));
+ tcg_gen_qemu_ld16u(cc_dst, o->in2, get_mem_index(s));
+ break;
+ case 4:
+ tcg_gen_qemu_ld32u(cc_src, o->addr1, get_mem_index(s));
+ tcg_gen_qemu_ld32u(cc_dst, o->in2, get_mem_index(s));
+ break;
+ case 8:
+ tcg_gen_qemu_ld64(cc_src, o->addr1, get_mem_index(s));
+ tcg_gen_qemu_ld64(cc_dst, o->in2, get_mem_index(s));
+ break;
+ default:
+ potential_page_fault(s);
+ vl = tcg_const_i32(l);
+ gen_helper_clc(cc_op, cpu_env, vl, o->addr1, o->in2);
+ tcg_temp_free_i32(vl);
+ set_cc_static(s);
+ return NO_EXIT;
+ }
+ gen_op_update2_cc_i64(s, CC_OP_LTUGTU_64, cc_src, cc_dst);
+ return NO_EXIT;
+}
+
static ExitStatus op_clcle(DisasContext *s, DisasOps *o)
{
TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
--
1.7.11.4
- [Qemu-devel] [PATCH 037/126] target-s390: Cleanup cc computation helpers, (continued)
- [Qemu-devel] [PATCH 037/126] target-s390: Cleanup cc computation helpers, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 051/126] target-s390: Convert LAM, STAM, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 040/126] target-s390: Convert FP STORE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 052/126] target-s390: Convert CLCLE, MVCLE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 039/126] target-s390: Convert EXECUTE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 041/126] target-s390: Convert CONVERT TO DECIMAL, Richard Henderson, 2012/09/09
- [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 <=
- [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, 2012/09/09
- [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