[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/69] target/s390x: Fix EXECUTE with R1==0
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 32/69] target/s390x: Fix EXECUTE with R1==0 |
Date: |
Sun, 4 Jun 2017 10:34:32 -0700 |
The PoO specifies that when R1==0, no ORing into the insn
loaded from storage takes place. Load a zero for this case.
Reviewed-by: Aurelien Jarno <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/insn-data.def | 4 ++--
target/s390x/translate.c | 14 +++++++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def
index cac0f51..3c3541c 100644
--- a/target/s390x/insn-data.def
+++ b/target/s390x/insn-data.def
@@ -327,9 +327,9 @@
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)
+ C(0x4400, EX, RX_a, Z, 0, a2, 0, 0, ex, 0)
/* EXECUTE RELATIVE LONG */
- C(0xc600, EXRL, RIL_b, EE, r1_o, ri2, 0, 0, ex, 0)
+ C(0xc600, EXRL, RIL_b, EE, 0, ri2, 0, 0, ex, 0)
/* EXTRACT ACCESS */
C(0xb24f, EAR, RRE, Z, 0, 0, new, r1_32, ear, 0)
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 921a842..b7b4843 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -2159,15 +2159,27 @@ static ExitStatus op_ex(DisasContext *s, DisasOps *o)
MVC inside of memcpy, which needs a helper call anyway. So
perhaps this doesn't bear thinking about any further. */
+ int r1 = get_field(s->fields, r1);
TCGv_i32 ilen;
+ TCGv_i64 v1;
update_psw_addr(s);
gen_op_calc_cc(s);
+ if (r1 == 0) {
+ v1 = tcg_const_i64(0);
+ } else {
+ v1 = regs[r1];
+ }
+
ilen = tcg_const_i32(s->next_pc - s->pc);
- gen_helper_ex(cpu_env, ilen, o->in1, o->in2);
+ gen_helper_ex(cpu_env, ilen, v1, o->in2);
tcg_temp_free_i32(ilen);
+ if (r1 == 0) {
+ tcg_temp_free_i64(v1);
+ }
+
return NO_EXIT;
}
--
2.9.4
- [Qemu-devel] [PULL 19/69] target/s390x: Use unwind data for helper_cksm, (continued)
- [Qemu-devel] [PULL 19/69] target/s390x: Use unwind data for helper_cksm, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 21/69] target/s390x: Use unwind data for helper_tr, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 23/69] target/s390x: Use unwind data for helper_trt, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 25/69] target/s390x: Use unwind data for helper_lctl, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 22/69] target/s390x: Use unwind data for helper_tre, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 24/69] target/s390x: Use unwind data for helper_lctlg, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 26/69] target/s390x: Use unwind data for helper_stctl, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 28/69] target/s390x: Use unwind data for helper_tprot, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 27/69] target/s390x: Use unwind data for helper_testblock, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 29/69] target/s390x: Use unwind data for helper_lra, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 32/69] target/s390x: Fix EXECUTE with R1==0,
Richard Henderson <=
- [Qemu-devel] [PULL 31/69] target/s390x: Fix some helper_ex problems, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 34/69] target/s390x: Implement CSPG, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 30/69] target/s390x: Use unwind data for helper_mvcs/mvcp, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 33/69] target/s390x: Use atomic operations for COMPARE SWAP PURGE, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 36/69] target/s390x: End the TB after EXECUTE, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 38/69] target/s390x: Re-implement a few EXECUTE target insns directly, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 39/69] target/s390x/cpu_models: Allow some additional feature bits for the "qemu" CPU, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 35/69] target/s390x: Save current ilen during translation, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 41/69] target/s390x: remove some Linux assumptions from IPTE, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 40/69] target/s390x: remove dead code in translate.c, Richard Henderson, 2017/06/04