qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org,
	qemu-riscv@nongnu.org, pbonzini@redhat.com, eduardo@habkost.net,
	Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PATCH v4 29/36] target/s390x: Copy wout_x1 to wout_x1_P
Date: Sat,  7 Jan 2023 18:37:12 -0800	[thread overview]
Message-ID: <20230108023719.2466341-30-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230108023719.2466341-1-richard.henderson@linaro.org>

Make a copy of wout_x1 before modifying it, as wout_x1_P
emphasizing that it operates on the out/out2 pair.  The insns
that use x1_P are data movement that will not change to Int128.

Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/s390x/tcg/insn-data.h.inc | 12 ++++++------
 target/s390x/tcg/translate.c     |  8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/target/s390x/tcg/insn-data.h.inc b/target/s390x/tcg/insn-data.h.inc
index 79c6ab509a..d0814cb218 100644
--- a/target/s390x/tcg/insn-data.h.inc
+++ b/target/s390x/tcg/insn-data.h.inc
@@ -422,7 +422,7 @@
     F(0x3800, LER,     RR_a,  Z,   0, e2, 0, cond_e1e2, mov2, 0, IF_AFP1 | IF_AFP2)
     F(0x7800, LE,      RX_a,  Z,   0, m2_32u, 0, e1, mov2, 0, IF_AFP1)
     F(0xed64, LEY,     RXY_a, LD,  0, m2_32u, 0, e1, mov2, 0, IF_AFP1)
-    F(0xb365, LXR,     RRE,   Z,   x2h, x2l, 0, x1, movx, 0, IF_AFP1)
+    F(0xb365, LXR,     RRE,   Z,   x2h, x2l, 0, x1_P, movx, 0, IF_AFP1)
 /* LOAD IMMEDIATE */
     C(0xc001, LGFI,    RIL_a, EI,  0, i2, 0, r1, mov2, 0)
 /* LOAD RELATIVE LONG */
@@ -461,7 +461,7 @@
     C(0xe332, LTGF,    RXY_a, GIE, 0, a2, r1, 0, ld32s, s64)
     F(0xb302, LTEBR,   RRE,   Z,   0, e2, 0, cond_e1e2, mov2, f32, IF_BFP)
     F(0xb312, LTDBR,   RRE,   Z,   0, f2, 0, f1, mov2, f64, IF_BFP)
-    F(0xb342, LTXBR,   RRE,   Z,   x2h, x2l, 0, x1, movx, f128, IF_BFP)
+    F(0xb342, LTXBR,   RRE,   Z,   x2h, x2l, 0, x1_P, movx, f128, IF_BFP)
 /* LOAD AND TRAP */
     C(0xe39f, LAT,     RXY_a, LAT, 0, m2_32u, r1, 0, lat, 0)
     C(0xe385, LGAT,    RXY_a, LAT, 0, a2, r1, 0, lgat, 0)
@@ -483,7 +483,7 @@
     C(0xb913, LCGFR,   RRE,   Z,   0, r2_32s, r1, 0, neg, neg64)
     F(0xb303, LCEBR,   RRE,   Z,   0, e2, new, e1, negf32, f32, IF_BFP)
     F(0xb313, LCDBR,   RRE,   Z,   0, f2, new, f1, negf64, f64, IF_BFP)
-    F(0xb343, LCXBR,   RRE,   Z,   x2h, x2l, new_P, x1, negf128, f128, IF_BFP)
+    F(0xb343, LCXBR,   RRE,   Z,   x2h, x2l, new_P, x1_P, negf128, f128, IF_BFP)
     F(0xb373, LCDFR,   RRE,   FPSSH, 0, f2, new, f1, negf64, 0, IF_AFP1 | IF_AFP2)
 /* LOAD COUNT TO BLOCK BOUNDARY */
     C(0xe727, LCBB,    RXE,   V,   la2, 0, r1, 0, lcbb, 0)
@@ -552,7 +552,7 @@
     C(0xb911, LNGFR,   RRE,   Z,   0, r2_32s, r1, 0, nabs, nabs64)
     F(0xb301, LNEBR,   RRE,   Z,   0, e2, new, e1, nabsf32, f32, IF_BFP)
     F(0xb311, LNDBR,   RRE,   Z,   0, f2, new, f1, nabsf64, f64, IF_BFP)
-    F(0xb341, LNXBR,   RRE,   Z,   x2h, x2l, new_P, x1, nabsf128, f128, IF_BFP)
+    F(0xb341, LNXBR,   RRE,   Z,   x2h, x2l, new_P, x1_P, nabsf128, f128, IF_BFP)
     F(0xb371, LNDFR,   RRE,   FPSSH, 0, f2, new, f1, nabsf64, 0, IF_AFP1 | IF_AFP2)
 /* LOAD ON CONDITION */
     C(0xb9f2, LOCR,    RRF_c, LOC, r1, r2, new, r1_32, loc, 0)
@@ -577,7 +577,7 @@
     C(0xb910, LPGFR,   RRE,   Z,   0, r2_32s, r1, 0, abs, abs64)
     F(0xb300, LPEBR,   RRE,   Z,   0, e2, new, e1, absf32, f32, IF_BFP)
     F(0xb310, LPDBR,   RRE,   Z,   0, f2, new, f1, absf64, f64, IF_BFP)
-    F(0xb340, LPXBR,   RRE,   Z,   x2h, x2l, new_P, x1, absf128, f128, IF_BFP)
+    F(0xb340, LPXBR,   RRE,   Z,   x2h, x2l, new_P, x1_P, absf128, f128, IF_BFP)
     F(0xb370, LPDFR,   RRE,   FPSSH, 0, f2, new, f1, absf64, 0, IF_AFP1 | IF_AFP2)
 /* LOAD REVERSED */
     C(0xb91f, LRVR,    RRE,   Z,   0, r2_32u, new, r1_32, rev32, 0)
@@ -588,7 +588,7 @@
 /* LOAD ZERO */
     F(0xb374, LZER,    RRE,   Z,   0, 0, 0, e1, zero, 0, IF_AFP1)
     F(0xb375, LZDR,    RRE,   Z,   0, 0, 0, f1, zero, 0, IF_AFP1)
-    F(0xb376, LZXR,    RRE,   Z,   0, 0, 0, x1, zero2, 0, IF_AFP1)
+    F(0xb376, LZXR,    RRE,   Z,   0, 0, 0, x1_P, zero2, 0, IF_AFP1)
 
 /* LOAD FPC */
     F(0xb29d, LFPC,    S,     Z,   0, m2_32u, 0, 0, sfpc, 0, IF_BFP)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index f3e4b70ed9..d25b6f3c03 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -5518,6 +5518,14 @@ static void wout_x1(DisasContext *s, DisasOps *o)
 }
 #define SPEC_wout_x1 SPEC_r1_f128
 
+static void wout_x1_P(DisasContext *s, DisasOps *o)
+{
+    int f1 = get_field(s, r1);
+    store_freg(f1, o->out);
+    store_freg(f1 + 2, o->out2);
+}
+#define SPEC_wout_x1_P SPEC_r1_f128
+
 static void wout_cond_r1r2_32(DisasContext *s, DisasOps *o)
 {
     if (get_field(s, r1) != get_field(s, r2)) {
-- 
2.34.1



  parent reply	other threads:[~2023-01-08  2:42 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-08  2:36 [PATCH v4 00/36] tcg: Support for Int128 with helpers Richard Henderson
2023-01-08  2:36 ` [PATCH v4 01/36] tcg: Define TCG_TYPE_I128 and related helper macros Richard Henderson
2023-01-10 23:27   ` Alex Bennée
2023-01-24 23:44   ` Philippe Mathieu-Daudé
2023-01-08  2:36 ` [PATCH v4 02/36] tcg: Handle dh_typecode_i128 with TCG_CALL_{RET, ARG}_NORMAL Richard Henderson
2023-01-11  7:59   ` Alex Bennée
2023-01-08  2:36 ` [PATCH v4 03/36] tcg: Allocate objects contiguously in temp_allocate_frame Richard Henderson
2023-01-11  9:59   ` Alex Bennée
2023-01-11 15:06     ` Richard Henderson
2023-01-08  2:36 ` [PATCH v4 04/36] tcg: Introduce tcg_out_addi_ptr Richard Henderson
2023-01-25  8:31   ` Alex Bennée
2023-01-08  2:36 ` [PATCH v4 05/36] tcg: Add TCG_CALL_{RET,ARG}_BY_REF Richard Henderson
2023-01-08  2:36 ` [PATCH v4 06/36] tcg: Introduce tcg_target_call_oarg_reg Richard Henderson
2023-01-25 21:09   ` Alex Bennée
2023-01-26  4:11     ` Richard Henderson
2023-01-08  2:36 ` [PATCH v4 07/36] tcg: Add TCG_CALL_RET_BY_VEC Richard Henderson
2023-01-25 21:13   ` Alex Bennée
2023-01-08  2:36 ` [PATCH v4 08/36] include/qemu/int128: Use Int128 structure for TCI Richard Henderson
2023-01-24 23:59   ` Philippe Mathieu-Daudé
2023-01-08  2:36 ` [PATCH v4 09/36] tcg/i386: Add TCG_TARGET_CALL_{RET,ARG}_I128 Richard Henderson
2023-01-08  2:36 ` [PATCH v4 10/36] tcg/tci: Fix big-endian return register ordering Richard Henderson
2023-01-11 11:37   ` Philippe Mathieu-Daudé
2023-01-08  2:36 ` [PATCH v4 11/36] tcg/tci: Add TCG_TARGET_CALL_{RET,ARG}_I128 Richard Henderson
2023-01-08  2:36 ` [PATCH v4 12/36] tcg: " Richard Henderson
2023-01-08  2:36 ` [PATCH v4 13/36] tcg: Add temp allocation for TCGv_i128 Richard Henderson
2023-01-25  0:13   ` Philippe Mathieu-Daudé
2023-01-08  2:36 ` [PATCH v4 14/36] tcg: Add basic data movement " Richard Henderson
2023-01-11 11:41   ` Philippe Mathieu-Daudé
2023-01-08  2:36 ` [PATCH v4 15/36] tcg: Add guest load/store primitives " Richard Henderson
2023-01-08  2:36 ` [PATCH v4 16/36] tcg: Add tcg_gen_{non}atomic_cmpxchg_i128 Richard Henderson
2023-01-08  2:37 ` [PATCH v4 17/36] tcg: Split out tcg_gen_nonatomic_cmpxchg_i{32,64} Richard Henderson
2023-01-08  2:37 ` [PATCH v4 18/36] target/arm: Use tcg_gen_atomic_cmpxchg_i128 for STXP Richard Henderson
2023-01-08  2:37 ` [PATCH v4 19/36] target/arm: Use tcg_gen_atomic_cmpxchg_i128 for CASP Richard Henderson
2023-01-08  2:37 ` [PATCH v4 20/36] target/ppc: Use tcg_gen_atomic_cmpxchg_i128 for STQCX Richard Henderson
2023-01-08  2:37 ` [PATCH v4 21/36] tests/tcg/s390x: Add div.c Richard Henderson
2023-01-08  2:37 ` [PATCH v4 22/36] tests/tcg/s390x: Add clst.c Richard Henderson
2023-01-08  2:37 ` [PATCH v4 23/36] tests/tcg/s390x: Add long-double.c Richard Henderson
2023-01-08  2:37 ` [PATCH v4 24/36] target/s390x: Use a single return for helper_divs32/u32 Richard Henderson
2023-01-08  2:37 ` [PATCH v4 25/36] target/s390x: Use a single return for helper_divs64/u64 Richard Henderson
2023-01-08  2:37 ` [PATCH v4 26/36] target/s390x: Use Int128 for return from CLST Richard Henderson
2023-01-08  2:37 ` [PATCH v4 27/36] target/s390x: Use Int128 for return from CKSM Richard Henderson
2023-01-08  2:37 ` [PATCH v4 28/36] target/s390x: Use Int128 for return from TRE Richard Henderson
2023-01-08  2:37 ` Richard Henderson [this message]
2023-01-08  2:37 ` [PATCH v4 30/36] target/s390x: Use Int128 for returning float128 Richard Henderson
2023-01-08  2:37 ` [PATCH v4 31/36] target/s390x: Use Int128 for passing float128 Richard Henderson
2023-01-08  2:37 ` [PATCH v4 32/36] target/s390x: Use tcg_gen_atomic_cmpxchg_i128 for CDSG Richard Henderson
2023-01-08  2:37 ` [PATCH v4 33/36] target/s390x: Implement CC_OP_NZ in gen_op_calc_cc Richard Henderson
2023-01-08  2:37 ` [PATCH v4 34/36] target/i386: Split out gen_cmpxchg8b, gen_cmpxchg16b Richard Henderson
2023-01-25 22:53   ` Philippe Mathieu-Daudé
2023-01-08  2:37 ` [PATCH v4 35/36] target/i386: Inline cmpxchg8b Richard Henderson
2023-01-08  2:37 ` [PATCH v4 36/36] target/i386: Inline cmpxchg16b Richard Henderson
2023-01-10 23:12 ` [PATCH v4 00/36] tcg: Support for Int128 with helpers Mark Cave-Ayland
2023-01-24 21:46   ` Richard Henderson
2023-01-24 21:54 ` Richard Henderson
2023-01-25 21:50 ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230108023719.2466341-30-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=eduardo@habkost.net \
    --cc=iii@linux.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).