[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 036/126] target-s390: Convert INSERT CHARACTER
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 036/126] target-s390: Convert INSERT CHARACTER |
Date: |
Sun, 9 Sep 2012 14:04:54 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 3 +++
target-s390x/translate.c | 35 +++++++++++++----------------------
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 02e9cc0..7fff688 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -157,6 +157,9 @@
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)
+/* INSERT CHARACTER */
+ C(0x4300, IC, RX_a, Z, 0, m2_8u, 0, r1_8, mov2, 0)
+ C(0xe373, ICY, RXY_a, LD, 0, m2_8u, 0, r1_8, mov2, 0)
/* INSERT IMMEDIATE */
D(0xc008, IIHF, RIL_a, EI, r1_o, i2_32u, r1, 0, insi, 0, 0x2020)
D(0xc009, IILF, RIL_a, EI, r1_o, i2_32u, r1, 0, insi, 0, 0x2000)
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index c36ad44..4f7731a 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -281,12 +281,6 @@ static inline void store_reg16(int reg, TCGv_i32 v)
#endif
}
-static inline void store_reg8(int reg, TCGv_i64 v)
-{
- /* 8 bit register writes keep the upper bytes */
- tcg_gen_deposit_i64(regs[reg], regs[reg], v, 0, 8);
-}
-
static inline void store_freg32(int reg, TCGv_i32 v)
{
/* 32 bit register writes keep the lower half */
@@ -1241,7 +1235,7 @@ static void gen_op_clc(DisasContext *s, int l, TCGv_i64
s1, TCGv_i64 s2)
static void disas_e3(DisasContext* s, int op, int r1, int x2, int b2, int d2)
{
- TCGv_i64 addr, tmp2, tmp3;
+ TCGv_i64 addr, tmp2;
TCGv_i32 tmp32_1;
LOG_DISAS("disas_e3: op 0x%x r1 %d x2 %d b2 %d d2 %d\n",
@@ -1291,12 +1285,6 @@ static void disas_e3(DisasContext* s, int op, int r1,
int x2, int b2, int d2)
tcg_gen_qemu_st32(tmp2, addr, get_mem_index(s));
tcg_temp_free_i64(tmp2);
break;
- case 0x73: /* ICY R1,D2(X2,B2) [RXY] */
- tmp3 = tcg_temp_new_i64();
- tcg_gen_qemu_ld8u(tmp3, addr, get_mem_index(s));
- store_reg8(r1, tmp3);
- tcg_temp_free_i64(tmp3);
- break;
default:
LOG_DISAS("illegal e3 operation 0x%x\n", op);
gen_illegal_opcode(s);
@@ -2376,15 +2364,6 @@ static void disas_s390_insn(DisasContext *s)
LOG_DISAS("opc 0x%x\n", opc);
switch (opc) {
- case 0x43: /* IC R1,D2(X2,B2) [RX] */
- insn = ld_code4(s->pc);
- tmp = decode_rx(s, insn, &r1, &x2, &b2, &d2);
- tmp2 = tcg_temp_new_i64();
- tcg_gen_qemu_ld8u(tmp2, tmp, get_mem_index(s));
- store_reg8(r1, tmp2);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- break;
case 0x44: /* EX R1,D2(X2,B2) [RX] */
insn = ld_code4(s->pc);
tmp = decode_rx(s, insn, &r1, &x2, &b2, &d2);
@@ -3869,6 +3848,12 @@ static void wout_r1(DisasContext *s, DisasFields *f,
DisasOps *o)
store_reg(get_field(f, r1), o->out);
}
+static void wout_r1_8(DisasContext *s, DisasFields *f, DisasOps *o)
+{
+ int r1 = get_field(f, r1);
+ tcg_gen_deposit_i64(regs[r1], regs[r1], o->out, 0, 8);
+}
+
static void wout_r1_32(DisasContext *s, DisasFields *f, DisasOps *o)
{
store_reg32_i64(get_field(f, r1), o->out);
@@ -4127,6 +4112,12 @@ static void in2_ri2(DisasContext *s, DisasFields *f,
DisasOps *o)
o->in2 = tcg_const_i64(s->pc + (int64_t)get_field(f, i2) * 2);
}
+static void in2_m2_8u(DisasContext *s, DisasFields *f, DisasOps *o)
+{
+ in2_a2(s, f, o);
+ tcg_gen_qemu_ld8u(o->in2, o->in2, get_mem_index(s));
+}
+
static void in2_m2_16s(DisasContext *s, DisasFields *f, DisasOps *o)
{
in2_a2(s, f, o);
--
1.7.11.4
- [Qemu-devel] [PATCH 026/126] target-s390: Convert BRANCH AND SAVE, (continued)
- [Qemu-devel] [PATCH 026/126] target-s390: Convert BRANCH AND SAVE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 021/126] target-s390: Convert LOAD LOGICAL IMMEDIATE, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 025/126] target-s390: Convert ADD LOGICAL CARRY and SUBTRACT LOGICAL BORROW, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 027/126] target-s390: Convert BRANCH ON CONDITION, Richard Henderson, 2012/09/09
- [Qemu-devel] [PATCH 032/126] target-s390: Convert SET ADDRESSING MODE, Richard Henderson, 2012/09/09
- [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 <=
- [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, 2012/09/09
- [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