[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 046/147] target-s390: Convert EXECUTE
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 046/147] target-s390: Convert EXECUTE |
Date: |
Thu, 27 Sep 2012 16:37:25 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 5 +++++
target-s390x/translate.c | 39 ++++++++++++++++++++++++++-------------
2 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 38a93e3..0768849 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -157,6 +157,11 @@
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)
+/* EXECUTE */
+ C(0x4400, EX, RX_a, Z, r1_o, a2, 0, 0, ex, 0)
+/* EXECUTE RELATIVE LONG */
+ C(0xc600, EXRL, RIL_b, EE, r1_o, ri2, 0, 0, ex, 0)
+
/* 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)
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index ebd619e..2582792 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -2355,19 +2355,6 @@ static void disas_s390_insn(CPUS390XState *env,
DisasContext *s)
LOG_DISAS("opc 0x%x\n", opc);
switch (opc) {
- case 0x44: /* EX R1,D2(X2,B2) [RX] */
- insn = ld_code4(env, s->pc);
- tmp = decode_rx(s, insn, &r1, &x2, &b2, &d2);
- tmp2 = load_reg(r1);
- tmp3 = tcg_const_i64(s->pc + 4);
- update_psw_addr(s);
- gen_op_calc_cc(s);
- gen_helper_ex(cc_op, cpu_env, cc_op, tmp2, tmp, tmp3);
- set_cc_static(s);
- tcg_temp_free_i64(tmp);
- tcg_temp_free_i64(tmp2);
- tcg_temp_free_i64(tmp3);
- break;
case 0x4e: /* CVD R1,D2(X2,B2) [RX] */
insn = ld_code4(env, s->pc);
tmp = decode_rx(s, insn, &r1, &x2, &b2, &d2);
@@ -3423,6 +3410,32 @@ static ExitStatus op_divu64(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
+static ExitStatus op_ex(DisasContext *s, DisasOps *o)
+{
+ /* ??? Perhaps a better way to implement EXECUTE is to set a bit in
+ tb->flags, (ab)use the tb->cs_base field as the address of
+ the template in memory, and grab 8 bits of tb->flags/cflags for
+ the contents of the register. We would then recognize all this
+ in gen_intermediate_code_internal, generating code for exactly
+ one instruction. This new TB then gets executed normally.
+
+ On the other hand, this seems to be mostly used for modifying
+ MVC inside of memcpy, which needs a helper call anyway. So
+ perhaps this doesn't bear thinking about any further. */
+
+ TCGv_i64 tmp;
+
+ update_psw_addr(s);
+ gen_op_calc_cc(s);
+
+ tmp = tcg_const_i64(s->next_pc);
+ gen_helper_ex(cc_op, cpu_env, cc_op, o->in1, o->in2, tmp);
+ tcg_temp_free_i64(tmp);
+
+ set_cc_static(s);
+ return NO_EXIT;
+}
+
static ExitStatus op_icm(DisasContext *s, DisasOps *o)
{
int m3 = get_field(s->fields, m3);
--
1.7.11.4
- [Qemu-devel] [PATCH 036/147] target-s390: Convert DIVIDE, (continued)
- [Qemu-devel] [PATCH 036/147] target-s390: Convert DIVIDE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 037/147] target-s390: Send signals for divide, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 038/147] target-s390: Convert TEST UNDER MASK, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 039/147] target-s390: Convert SET ADDRESSING MODE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 040/147] target-s390: Convert SUPERVISOR CALL, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 041/147] target-s390: Convert MOVE LONG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 042/147] target-s390: Convert FP LOAD, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 043/147] target-s390: Convert INSERT CHARACTER, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 044/147] target-s390: Cleanup cc computation helpers, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 045/147] target-s390: Convert INSERT CHARACTERS UNDER MASK, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 046/147] target-s390: Convert EXECUTE,
Richard Henderson <=
- [Qemu-devel] [PATCH 047/147] target-s390: Convert FP STORE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 048/147] target-s390: Convert CONVERT TO DECIMAL, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 049/147] target-s390: Convert SET SYSTEM MASK, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 050/147] target-s390: Convert LOAD PSW, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 051/147] target-s390: Convert DIAGNOSE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 024/147] target-s390: Convert LOAD, LOAD LOGICAL, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 052/147] target-s390: Convert SHIFT, ROTATE SINGLE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 053/147] target-s390: Convert SHIFT DOUBLE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 054/147] target-s390: Convert LOAD, STORE MULTIPLE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 055/147] target-s390: Convert MOVE, Richard Henderson, 2012/09/27