[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 049/126] target-s390: Convert NI, XI, OI
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 049/126] target-s390: Convert NI, XI, OI |
Date: |
Sun, 9 Sep 2012 14:05:07 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 6 ++++++
target-s390x/translate.c | 25 -------------------------
2 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 81f2917..84ca631 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -61,6 +61,8 @@
D(0xa505, NIHL, RI_a, Z, r1_o, i2_16u, r1, 0, andi, 0, 0x1020)
D(0xa506, NILH, RI_a, Z, r1_o, i2_16u, r1, 0, andi, 0, 0x1010)
D(0xa507, NILL, RI_a, Z, r1_o, i2_16u, r1, 0, andi, 0, 0x1000)
+ C(0x9400, NI, SI, Z, m1_8u, i2_8u, new, m1_8, and, nz64)
+ C(0xeb54, NIY, SIY, LD, m1_8u, i2_8u, new, m1_8, and, nz64)
/* BRANCH AND SAVE */
C(0x0d00, BASR, RR_a, Z, 0, r2_nz, r1, 0, bas, 0)
@@ -160,6 +162,8 @@
/* EXCLUSIVE OR IMMEDIATE */
D(0xc006, XIHF, RIL_a, EI, r1_o, i2_32u, r1, 0, xori, 0, 0x2020)
D(0xc007, XILF, RIL_a, EI, r1_o, i2_32u, r1, 0, xori, 0, 0x2000)
+ C(0x9700, XI, SI, Z, m1_8u, i2_8u, new, m1_8, xor, nz64)
+ C(0xeb57, XIY, SIY, LD, m1_8u, i2_8u, new, m1_8, xor, nz64)
/* EXECUTE */
C(0x4400, EX, RX_a, Z, r1_o, a2, 0, 0, ex, 0)
@@ -327,6 +331,8 @@
D(0xa509, OIHL, RI_a, Z, r1_o, i2_16u, r1, 0, ori, 0, 0x1020)
D(0xa50a, OILH, RI_a, Z, r1_o, i2_16u, r1, 0, ori, 0, 0x1010)
D(0xa50b, OILL, RI_a, Z, r1_o, i2_16u, r1, 0, ori, 0, 0x1000)
+ C(0x9600, OI, SI, Z, m1_8u, i2_8u, new, m1_8, or, nz64)
+ C(0xeb56, OIY, SIY, LD, m1_8u, i2_8u, new, m1_8, or, nz64)
/* ROTATE LEFT SINGLE LOGICAL */
C(0xeb1d, RLL, RSY_a, Z, r3_o, sh32, new, r1_32, rll32, 0)
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index ec7ccd3..4ddd77f 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -2226,31 +2226,6 @@ static void disas_s390_insn(DisasContext *s)
LOG_DISAS("opc 0x%x\n", opc);
switch (opc) {
- case 0x94: /* NI D1(B1),I2 [SI] */
- case 0x96: /* OI D1(B1),I2 [SI] */
- case 0x97: /* XI D1(B1),I2 [SI] */
- insn = ld_code4(s->pc);
- tmp = decode_si(s, insn, &i2, &b1, &d1);
- tmp2 = tcg_temp_new_i64();
- tcg_gen_qemu_ld8u(tmp2, tmp, get_mem_index(s));
- switch (opc) {
- case 0x94:
- tcg_gen_andi_i64(tmp2, tmp2, i2);
- break;
- case 0x96:
- tcg_gen_ori_i64(tmp2, tmp2, i2);
- break;
- case 0x97:
- tcg_gen_xori_i64(tmp2, tmp2, i2);
- break;
- default:
- tcg_abort();
- }
- tcg_gen_qemu_st8(tmp2, tmp, get_mem_index(s));
- set_cc_nz_u64(s, tmp2);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- break;
case 0x9a: /* LAM R1,R3,D2(B2) [RS] */
insn = ld_code4(s->pc);
decode_rs(s, insn, &r1, &r3, &b2, &d2);
--
1.7.11.4
- [Qemu-devel] [PATCH 030/126] target-s390: Send signals for divide, (continued)
- [Qemu-devel] [PATCH 030/126] target-s390: Send signals for divide, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 029/126] target-s390: Convert DIVIDE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 028/126] target-s390: Convert BRANCH ON COUNT, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 031/126] target-s390: Convert TEST UNDER MASK, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 034/126] target-s390: Convert MOVE LONG, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 036/126] target-s390: Convert INSERT CHARACTER, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 035/126] target-s390: Convert FP LOAD, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 033/126] target-s390: Convert SUPERVISOR CALL, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 038/126] target-s390: Convert INSERT CHARACTERS UNDER MASK, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 042/126] target-s390: Convert SET SYSTEM MASK, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 049/126] target-s390: Convert NI, XI, OI,
Richard Henderson <=
- [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