From: Thomas Huth <thuth@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Ilya Leoshkevich" <iii@linux.ibm.com>
Subject: [PULL 19/33] target/s390x: Use tcg_constant_* for DisasCompare
Date: Mon, 27 Feb 2023 12:36:07 +0100 [thread overview]
Message-ID: <20230227113621.58468-20-thuth@redhat.com> (raw)
In-Reply-To: <20230227113621.58468-1-thuth@redhat.com>
From: Richard Henderson <richard.henderson@linaro.org>
The a and b fields are not modified by the consumer,
and while we need not free a constant, tcg will quietly
ignore such frees, so free_compare need not be changed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-Id: <20230220184052.163465-3-richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
target/s390x/tcg/translate.c | 44 ++++++++++++++++++------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 35e844ef3c..a534419073 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -845,7 +845,7 @@ static void disas_jcc(DisasContext *s, DisasCompare *c, uint32_t mask)
c->is_64 = false;
c->u.s32.a = tcg_temp_new_i32();
tcg_gen_extrl_i64_i32(c->u.s32.a, cc_dst);
- c->u.s32.b = tcg_const_i32(0);
+ c->u.s32.b = tcg_constant_i32(0);
break;
case CC_OP_LTGT_32:
case CC_OP_LTUGTU_32:
@@ -860,7 +860,7 @@ static void disas_jcc(DisasContext *s, DisasCompare *c, uint32_t mask)
case CC_OP_NZ:
case CC_OP_FLOGR:
c->u.s64.a = cc_dst;
- c->u.s64.b = tcg_const_i64(0);
+ c->u.s64.b = tcg_constant_i64(0);
c->g1 = true;
break;
case CC_OP_LTGT_64:
@@ -874,14 +874,14 @@ static void disas_jcc(DisasContext *s, DisasCompare *c, uint32_t mask)
case CC_OP_TM_64:
case CC_OP_ICM:
c->u.s64.a = tcg_temp_new_i64();
- c->u.s64.b = tcg_const_i64(0);
+ c->u.s64.b = tcg_constant_i64(0);
tcg_gen_and_i64(c->u.s64.a, cc_src, cc_dst);
break;
case CC_OP_ADDU:
case CC_OP_SUBU:
c->is_64 = true;
- c->u.s64.b = tcg_const_i64(0);
+ c->u.s64.b = tcg_constant_i64(0);
c->g1 = true;
switch (mask) {
case 8 | 2:
@@ -904,65 +904,65 @@ static void disas_jcc(DisasContext *s, DisasCompare *c, uint32_t mask)
switch (mask) {
case 0x8 | 0x4 | 0x2: /* cc != 3 */
cond = TCG_COND_NE;
- c->u.s32.b = tcg_const_i32(3);
+ c->u.s32.b = tcg_constant_i32(3);
break;
case 0x8 | 0x4 | 0x1: /* cc != 2 */
cond = TCG_COND_NE;
- c->u.s32.b = tcg_const_i32(2);
+ c->u.s32.b = tcg_constant_i32(2);
break;
case 0x8 | 0x2 | 0x1: /* cc != 1 */
cond = TCG_COND_NE;
- c->u.s32.b = tcg_const_i32(1);
+ c->u.s32.b = tcg_constant_i32(1);
break;
case 0x8 | 0x2: /* cc == 0 || cc == 2 => (cc & 1) == 0 */
cond = TCG_COND_EQ;
c->g1 = false;
c->u.s32.a = tcg_temp_new_i32();
- c->u.s32.b = tcg_const_i32(0);
+ c->u.s32.b = tcg_constant_i32(0);
tcg_gen_andi_i32(c->u.s32.a, cc_op, 1);
break;
case 0x8 | 0x4: /* cc < 2 */
cond = TCG_COND_LTU;
- c->u.s32.b = tcg_const_i32(2);
+ c->u.s32.b = tcg_constant_i32(2);
break;
case 0x8: /* cc == 0 */
cond = TCG_COND_EQ;
- c->u.s32.b = tcg_const_i32(0);
+ c->u.s32.b = tcg_constant_i32(0);
break;
case 0x4 | 0x2 | 0x1: /* cc != 0 */
cond = TCG_COND_NE;
- c->u.s32.b = tcg_const_i32(0);
+ c->u.s32.b = tcg_constant_i32(0);
break;
case 0x4 | 0x1: /* cc == 1 || cc == 3 => (cc & 1) != 0 */
cond = TCG_COND_NE;
c->g1 = false;
c->u.s32.a = tcg_temp_new_i32();
- c->u.s32.b = tcg_const_i32(0);
+ c->u.s32.b = tcg_constant_i32(0);
tcg_gen_andi_i32(c->u.s32.a, cc_op, 1);
break;
case 0x4: /* cc == 1 */
cond = TCG_COND_EQ;
- c->u.s32.b = tcg_const_i32(1);
+ c->u.s32.b = tcg_constant_i32(1);
break;
case 0x2 | 0x1: /* cc > 1 */
cond = TCG_COND_GTU;
- c->u.s32.b = tcg_const_i32(1);
+ c->u.s32.b = tcg_constant_i32(1);
break;
case 0x2: /* cc == 2 */
cond = TCG_COND_EQ;
- c->u.s32.b = tcg_const_i32(2);
+ c->u.s32.b = tcg_constant_i32(2);
break;
case 0x1: /* cc == 3 */
cond = TCG_COND_EQ;
- c->u.s32.b = tcg_const_i32(3);
+ c->u.s32.b = tcg_constant_i32(3);
break;
default:
/* CC is masked by something else: (8 >> cc) & mask. */
cond = TCG_COND_NE;
c->g1 = false;
- c->u.s32.a = tcg_const_i32(8);
- c->u.s32.b = tcg_const_i32(0);
- tcg_gen_shr_i32(c->u.s32.a, c->u.s32.a, cc_op);
+ c->u.s32.a = tcg_temp_new_i32();
+ c->u.s32.b = tcg_constant_i32(0);
+ tcg_gen_shr_i32(c->u.s32.a, tcg_constant_i32(8), cc_op);
tcg_gen_andi_i32(c->u.s32.a, c->u.s32.a, mask);
break;
}
@@ -1619,7 +1619,7 @@ static DisasJumpType op_bct32(DisasContext *s, DisasOps *o)
tcg_gen_subi_i64(t, regs[r1], 1);
store_reg32_i64(r1, t);
c.u.s32.a = tcg_temp_new_i32();
- c.u.s32.b = tcg_const_i32(0);
+ c.u.s32.b = tcg_constant_i32(0);
tcg_gen_extrl_i64_i32(c.u.s32.a, t);
tcg_temp_free_i64(t);
@@ -1643,7 +1643,7 @@ static DisasJumpType op_bcth(DisasContext *s, DisasOps *o)
tcg_gen_subi_i64(t, t, 1);
store_reg32h_i64(r1, t);
c.u.s32.a = tcg_temp_new_i32();
- c.u.s32.b = tcg_const_i32(0);
+ c.u.s32.b = tcg_constant_i32(0);
tcg_gen_extrl_i64_i32(c.u.s32.a, t);
tcg_temp_free_i64(t);
@@ -1664,7 +1664,7 @@ static DisasJumpType op_bct64(DisasContext *s, DisasOps *o)
tcg_gen_subi_i64(regs[r1], regs[r1], 1);
c.u.s64.a = regs[r1];
- c.u.s64.b = tcg_const_i64(0);
+ c.u.s64.b = tcg_constant_i64(0);
return help_branch(s, &c, is_imm, imm, o->in2);
}
--
2.31.1
next prev parent reply other threads:[~2023-02-27 11:38 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 11:35 [PULL 00/33] s390x and testing related patches Thomas Huth
2023-02-27 11:35 ` [PULL 01/33] tests/qtest/rtl8139-test: Make the test less verbose by default Thomas Huth
2023-02-27 11:35 ` [PULL 02/33] Do not include hw/hw.h if it is not necessary Thomas Huth
2023-02-27 11:35 ` [PULL 03/33] hw/vfio/ccw: Simplify using DEVICE() macro Thomas Huth
2023-02-27 11:35 ` [PULL 04/33] hw/vfio/ccw: Use intermediate S390CCWDevice variable Thomas Huth
2023-02-27 11:35 ` [PULL 05/33] hw/vfio/ccw: Replace DO_UPCAST(S390CCWDevice) by S390_CCW_DEVICE() Thomas Huth
2023-02-27 11:35 ` [PULL 06/33] hw/vfio/ccw: Remove pointless S390CCWDevice variable Thomas Huth
2023-02-27 11:35 ` [PULL 07/33] hw/vfio/ccw: Replace DO_UPCAST(VFIOCCWDevice) by VFIO_CCW() Thomas Huth
2023-02-27 11:35 ` [PULL 08/33] target/s390x/arch_dump: Fix memory corruption in s390x_write_elf64_notes() Thomas Huth
2023-02-27 11:35 ` [PULL 09/33] target/s390x/arch_dump: Simplify memory allocation " Thomas Huth
2023-02-27 11:35 ` [PULL 10/33] target/s390x: Fix s390_probe_access for user-only Thomas Huth
2023-02-27 11:35 ` [PULL 11/33] target/s390x: Pass S390Access pointer into access_prepare Thomas Huth
2023-02-27 11:36 ` [PULL 12/33] target/s390x: Use void* for haddr in S390Access Thomas Huth
2023-02-27 11:36 ` [PULL 13/33] target/s390x: Tidy access_prepare_nf Thomas Huth
2023-02-27 11:36 ` [PULL 14/33] target/s390x: Remove TLB_NOTDIRTY workarounds Thomas Huth
2023-02-27 11:36 ` [PULL 15/33] target/s390x: Inline do_access_{get,set}_byte Thomas Huth
2023-02-27 11:36 ` [PULL 16/33] target/s390x: Hoist some computation in access_memmove Thomas Huth
2023-02-27 11:36 ` [PULL 17/33] s390x/pv: Add support for asynchronous teardown for reboot Thomas Huth
2023-02-27 11:36 ` [PULL 18/33] target/s390x: Use tcg_constant_* in local contexts Thomas Huth
2023-02-27 11:36 ` Thomas Huth [this message]
2023-02-27 11:36 ` [PULL 20/33] target/s390x: Use tcg_constant_i32 for fpinst_extract_m34 Thomas Huth
2023-02-27 11:36 ` [PULL 21/33] target/s390x: Use tcg_constant_* in translate_vx.c.inc Thomas Huth
2023-02-27 11:36 ` [PULL 22/33] tests/tcg/s390x: Add bal.S Thomas Huth
2023-02-27 11:36 ` [PULL 23/33] tests/tcg/s390x: Add sam.S Thomas Huth
2023-02-27 11:36 ` [PULL 24/33] configure: Add 'mkdir build' check Thomas Huth
2023-02-27 11:36 ` [PULL 25/33] qemu-keymap: Silence memory leak warning from Clang's sanitizer Thomas Huth
2023-02-27 11:36 ` [PULL 26/33] meson: fix dependency on qemu-keymap Thomas Huth
2023-02-27 11:36 ` [PULL 27/33] Updated the FSF address to <https://www.gnu.org/licenses/> Thomas Huth
2023-02-27 11:36 ` [PULL 28/33] gitlab-ci.d/buildtest: Remove aarch64-softmmu from the build-system-ubuntu job Thomas Huth
2023-02-27 11:36 ` [PULL 29/33] gitlab-ci.d/buildtest: Disintegrate the build-coroutine-sigaltstack job Thomas Huth
2023-02-27 11:36 ` [PULL 30/33] gitlab-ci.d/buildtest-template: Simplify the configure step Thomas Huth
2023-02-27 11:36 ` [PULL 31/33] gitlab-ci.d: Build with --enable-fdt=system by default Thomas Huth
2023-02-27 11:36 ` [PULL 32/33] gitlab-ci.d/base: Mark jobs as interruptible " Thomas Huth
2023-02-27 11:36 ` [PULL 33/33] Deprecate the "-no-acpi" command line switch Thomas Huth
2023-02-27 14:45 ` [PULL 00/33] s390x and testing related patches Peter Maydell
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=20230227113621.58468-20-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=iii@linux.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).