From nobody Mon Feb 9 21:24:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1768774037; cv=none; d=zohomail.com; s=zohoarc; b=AocT8CV8V71uObDAPaoyrXJGDlTdeUmhqFifSIq1M3gfrezoCY3gKoKxm76QZzzgUUe1lfZULKtr8aMNSwm4+ICeX3gFVEdBmnsoSIGBCddsgcRbt0SUtvJL+jwKhdCZ6xUQCpTU8v8h0Pwsn0Ar37QPuaoWIuXB7qy6TnpQ4G0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768774037; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ecDzOzqQ/C38Xzf0BO7uae6DhF/wcxQYsp2ETvYgWSM=; b=EBiqT57CsBgvI0Ldef+5zlQ/lY+2lfqvr4lO2XbmyliLb8HEaI+w1NZ79MPbftCcf762ZjmBHl5uFjLGWwSD/yXwpLuGWAsgjNcG/JY6Irf/MdC/WUHt15FxgufX2wIoos6mM/2bqgyWbbaqHA9b1WYXUhC2sf8+ijk3jCzY0cw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768774037885185.82599110777926; Sun, 18 Jan 2026 14:07:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vhau3-0004QT-O3; Sun, 18 Jan 2026 17:05:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vhats-00036V-HE for qemu-devel@nongnu.org; Sun, 18 Jan 2026 17:05:36 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vhatq-0000tt-Be for qemu-devel@nongnu.org; Sun, 18 Jan 2026 17:05:36 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2a102494058so22840115ad.0 for ; Sun, 18 Jan 2026 14:05:33 -0800 (PST) Received: from stoup.. ([180.233.125.201]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a7193dbb74sm74402865ad.56.2026.01.18.14.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 14:05:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768773933; x=1769378733; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ecDzOzqQ/C38Xzf0BO7uae6DhF/wcxQYsp2ETvYgWSM=; b=jVVmlHz+k7FVt+cOSE4uRgxgJteRNc5D2Hi6y9dE84yswzBmEgTZtij3s2ADf0qg4S fS3H6Grb5HskpkQ6dum4K1hUO0IyrePrLpRSHzUl6IpSeUovb6PejnNm0DOTzlHJir1D QwAk7yLqxns7iz3ecYVC+KSS7dYaOlZ4HT3D/i6/VWFf6Vi19A8YckbgMK6QY3uAy/y5 tNUhicWqvr56Owh92MWVCK8h5aaybhmJb8bOU8oUcoohQPIae5Bf77OwOmoaDDjCWzIf qMnuheg0boTEj9KRXvh4JAzOyaERfx72Kww3+oUuLyLRsF/Sn2dtcEpTzGF5P+NmU6QV 9JEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768773933; x=1769378733; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ecDzOzqQ/C38Xzf0BO7uae6DhF/wcxQYsp2ETvYgWSM=; b=AQZTbqQ5Xy67/mSvGEhFCNEmdB0cx9vpqLJtjUMyefwrbz+Htj9Grzc/6Jf0Ni3NIx W6MTtJbzXCNGrqt9XZP23yDniJXKBhJHuMDDu/PSMrqWcbPCRZkn01ubYBNO+t3z5/B4 ZvtZhOwaH74bGKeo4sOPfm27NRyarXnriQGpM/hLidGZQW2Zrzxc5wnJSfdBGSUmCRkl fh8E8dWPAbKU+HimNCrF06tEntccFtAnXygHQSh5jV7FXTM66/NRFfrrp+dSVzBxp2p9 dT1tOUhFyRhT8tCKvSXpHR/4G6vZrCAo5U2YqHomBI7bdNJaG3zZcJC09SfsItCy6WP+ Uk4Q== X-Gm-Message-State: AOJu0Yz8MGeXpzNRJAzHrL/0gGD0bCcW5YYlH/M7PsCpY5UggTlk4ebu yrw6sUlQA9+1fSJNRsc8lwduClZOmi7/F9BfYguVBKEagB42esxVAGx5C0DBV4Xu9vn9XzHk042 DPGTJTWDWOw== X-Gm-Gg: AY/fxX7PH6YXMMLzqKpJLvfILUgjWe5R0Wb0SMFLHBMU98u4yqTefcyD24JzEfC0Mpe 8uIow8qGmGKC5vRG9RRCZjz6LbdEQVtGufE14mh5/xeVPqb3twn1voAz2L9SNZQ64f28Qne7dHU Xw5cIV0DJx7S/jmqTkvFbyKRB5TaDxdFU84ZBXP3ZFfAte20/uTxvmy3k1DytBzD7SK4Q9TQx+K cWhjMNZSbwKV4MK05xKySEC3bLIrY0IuA/UUryPy2EXgPpz8FfXhaE34Tg0dEBHnyTCzH0gwmfc R28RePkOH4nSebpoitQMk9GfnhJZE4f+OyzUy4TJh/qLjIIZNPvxnvr58mRjJeSYroKIrVChhmH /Kybc6MK0wFIG11FV00NnVLvpch5cHgv9SUBnFpDg6H96ZDivVeO5O6j2s6sFi2gxn9XmKg7j0C xqHmFVBO4Z/AOHmFkwHW/h1y2kfyE8 X-Received: by 2002:a17:903:1108:b0:294:f6e5:b91a with SMTP id d9443c01a7336-2a7009ba1a2mr111525605ad.13.1768773932549; Sun, 18 Jan 2026 14:05:32 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 30/54] tcg: Drop TCG_TARGET_REG_BITS tests in tcg-op-ldst.c Date: Mon, 19 Jan 2026 09:03:50 +1100 Message-ID: <20260118220414.8177-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260118220414.8177-1-richard.henderson@linaro.org> References: <20260118220414.8177-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1768774038295158500 Content-Type: text/plain; charset="utf-8" Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- tcg/tcg-op-ldst.c | 113 +++++++++++----------------------------------- 1 file changed, 27 insertions(+), 86 deletions(-) diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c index 7716c3ad7c..55bfbf3a20 100644 --- a/tcg/tcg-op-ldst.c +++ b/tcg/tcg-op-ldst.c @@ -106,24 +106,12 @@ static void gen_ldst2(TCGOpcode opc, TCGType type, TC= GTemp *vl, TCGTemp *vh, =20 static void gen_ld_i64(TCGv_i64 v, TCGTemp *addr, MemOpIdx oi) { - if (TCG_TARGET_REG_BITS =3D=3D 32) { - gen_ldst2(INDEX_op_qemu_ld2, TCG_TYPE_I64, - tcgv_i32_temp(TCGV_LOW(v)), tcgv_i32_temp(TCGV_HIGH(v)), - addr, oi); - } else { - gen_ldst1(INDEX_op_qemu_ld, TCG_TYPE_I64, tcgv_i64_temp(v), addr, = oi); - } + gen_ldst1(INDEX_op_qemu_ld, TCG_TYPE_I64, tcgv_i64_temp(v), addr, oi); } =20 static void gen_st_i64(TCGv_i64 v, TCGTemp *addr, MemOpIdx oi) { - if (TCG_TARGET_REG_BITS =3D=3D 32) { - gen_ldst2(INDEX_op_qemu_st2, TCG_TYPE_I64, - tcgv_i32_temp(TCGV_LOW(v)), tcgv_i32_temp(TCGV_HIGH(v)), - addr, oi); - } else { - gen_ldst1(INDEX_op_qemu_st, TCG_TYPE_I64, tcgv_i64_temp(v), addr, = oi); - } + gen_ldst1(INDEX_op_qemu_st, TCG_TYPE_I64, tcgv_i64_temp(v), addr, oi); } =20 static void tcg_gen_req_mo(TCGBar type) @@ -143,7 +131,7 @@ static TCGTemp *tci_extend_addr(TCGTemp *addr) * Compare to the extension performed by tcg_out_{ld,st}_helper_args * for native code generation. */ - if (TCG_TARGET_REG_BITS =3D=3D 64 && tcg_ctx->addr_type =3D=3D TCG_TYP= E_I32) { + if (tcg_ctx->addr_type =3D=3D TCG_TYPE_I32) { TCGv_i64 temp =3D tcg_temp_ebb_new_i64(); tcg_gen_extu_i32_i64(temp, temp_tcgv_i32(addr)); return tcgv_i64_temp(temp); @@ -356,16 +344,6 @@ static void tcg_gen_qemu_ld_i64_int(TCGv_i64 val, TCGT= emp *addr, TCGv_i64 copy_addr; TCGTemp *addr_new; =20 - if (TCG_TARGET_REG_BITS =3D=3D 32 && (memop & MO_SIZE) < MO_64) { - tcg_gen_qemu_ld_i32_int(TCGV_LOW(val), addr, idx, memop); - if (memop & MO_SIGN) { - tcg_gen_sari_i32(TCGV_HIGH(val), TCGV_LOW(val), 31); - } else { - tcg_gen_movi_i32(TCGV_HIGH(val), 0); - } - return; - } - tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); orig_memop =3D memop =3D tcg_canonicalize_memop(memop, 1, 0); orig_oi =3D oi =3D make_memop_idx(memop, idx); @@ -421,11 +399,6 @@ static void tcg_gen_qemu_st_i64_int(TCGv_i64 val, TCGT= emp *addr, MemOpIdx orig_oi, oi; TCGTemp *addr_new; =20 - if (TCG_TARGET_REG_BITS =3D=3D 32 && (memop & MO_SIZE) < MO_64) { - tcg_gen_qemu_st_i32_int(TCGV_LOW(val), addr, idx, memop); - return; - } - tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop =3D tcg_canonicalize_memop(memop, 1, 1); orig_oi =3D oi =3D make_memop_idx(memop, idx); @@ -577,7 +550,7 @@ static void tcg_gen_qemu_ld_i128_int(TCGv_i128 val, TCG= Temp *addr, orig_oi =3D make_memop_idx(memop, idx); =20 /* TODO: For now, force 32-bit hosts to use the helper. */ - if (TCG_TARGET_HAS_qemu_ldst_i128 && TCG_TARGET_REG_BITS =3D=3D 64) { + if (TCG_TARGET_HAS_qemu_ldst_i128) { TCGv_i64 lo, hi; bool need_bswap =3D false; MemOpIdx oi =3D orig_oi; @@ -691,7 +664,7 @@ static void tcg_gen_qemu_st_i128_int(TCGv_i128 val, TCG= Temp *addr, =20 /* TODO: For now, force 32-bit hosts to use the helper. */ =20 - if (TCG_TARGET_HAS_qemu_ldst_i128 && TCG_TARGET_REG_BITS =3D=3D 64) { + if (TCG_TARGET_HAS_qemu_ldst_i128) { TCGv_i64 lo, hi; MemOpIdx oi =3D orig_oi; bool need_bswap =3D false; @@ -950,17 +923,6 @@ static void tcg_gen_nonatomic_cmpxchg_i64_int(TCGv_i64= retv, TCGTemp *addr, { TCGv_i64 t1, t2; =20 - if (TCG_TARGET_REG_BITS =3D=3D 32 && (memop & MO_SIZE) < MO_64) { - tcg_gen_nonatomic_cmpxchg_i32_int(TCGV_LOW(retv), addr, TCGV_LOW(c= mpv), - TCGV_LOW(newv), idx, memop); - if (memop & MO_SIGN) { - tcg_gen_sari_i32(TCGV_HIGH(retv), TCGV_LOW(retv), 31); - } else { - tcg_gen_movi_i32(TCGV_HIGH(retv), 0); - } - return; - } - t1 =3D tcg_temp_ebb_new_i64(); t2 =3D tcg_temp_ebb_new_i64(); =20 @@ -1019,17 +981,6 @@ static void tcg_gen_atomic_cmpxchg_i64_int(TCGv_i64 r= etv, TCGTemp *addr, * is removed. */ tcg_gen_movi_i64(retv, 0); - return; - } - - if (TCG_TARGET_REG_BITS =3D=3D 32) { - tcg_gen_atomic_cmpxchg_i32_int(TCGV_LOW(retv), addr, TCGV_LOW(cmpv= ), - TCGV_LOW(newv), idx, memop); - if (memop & MO_SIGN) { - tcg_gen_sari_i32(TCGV_HIGH(retv), TCGV_LOW(retv), 31); - } else { - tcg_gen_movi_i32(TCGV_HIGH(retv), 0); - } } else { TCGv_i32 c32 =3D tcg_temp_ebb_new_i32(); TCGv_i32 n32 =3D tcg_temp_ebb_new_i32(); @@ -1064,43 +1015,33 @@ static void tcg_gen_nonatomic_cmpxchg_i128_int(TCGv= _i128 retv, TCGTemp *addr, TCGv_i128 cmpv, TCGv_i128 n= ewv, TCGArg idx, MemOp memop) { - if (TCG_TARGET_REG_BITS =3D=3D 32) { - /* Inline expansion below is simply too large for 32-bit hosts. */ - MemOpIdx oi =3D make_memop_idx(memop, idx); - TCGv_i64 a64 =3D maybe_extend_addr64(addr); + TCGv_i128 oldv =3D tcg_temp_ebb_new_i128(); + TCGv_i128 tmpv =3D tcg_temp_ebb_new_i128(); + TCGv_i64 t0 =3D tcg_temp_ebb_new_i64(); + TCGv_i64 t1 =3D tcg_temp_ebb_new_i64(); + TCGv_i64 z =3D tcg_constant_i64(0); =20 - gen_helper_nonatomic_cmpxchgo(retv, tcg_env, a64, cmpv, newv, - tcg_constant_i32(oi)); - maybe_free_addr64(a64); - } else { - TCGv_i128 oldv =3D tcg_temp_ebb_new_i128(); - TCGv_i128 tmpv =3D tcg_temp_ebb_new_i128(); - TCGv_i64 t0 =3D tcg_temp_ebb_new_i64(); - TCGv_i64 t1 =3D tcg_temp_ebb_new_i64(); - TCGv_i64 z =3D tcg_constant_i64(0); + tcg_gen_qemu_ld_i128_int(oldv, addr, idx, memop); =20 - tcg_gen_qemu_ld_i128_int(oldv, addr, idx, memop); + /* Compare i128 */ + tcg_gen_xor_i64(t0, TCGV128_LOW(oldv), TCGV128_LOW(cmpv)); + tcg_gen_xor_i64(t1, TCGV128_HIGH(oldv), TCGV128_HIGH(cmpv)); + tcg_gen_or_i64(t0, t0, t1); =20 - /* Compare i128 */ - tcg_gen_xor_i64(t0, TCGV128_LOW(oldv), TCGV128_LOW(cmpv)); - tcg_gen_xor_i64(t1, TCGV128_HIGH(oldv), TCGV128_HIGH(cmpv)); - tcg_gen_or_i64(t0, t0, t1); + /* tmpv =3D equal ? newv : oldv */ + tcg_gen_movcond_i64(TCG_COND_EQ, TCGV128_LOW(tmpv), t0, z, + TCGV128_LOW(newv), TCGV128_LOW(oldv)); + tcg_gen_movcond_i64(TCG_COND_EQ, TCGV128_HIGH(tmpv), t0, z, + TCGV128_HIGH(newv), TCGV128_HIGH(oldv)); =20 - /* tmpv =3D equal ? newv : oldv */ - tcg_gen_movcond_i64(TCG_COND_EQ, TCGV128_LOW(tmpv), t0, z, - TCGV128_LOW(newv), TCGV128_LOW(oldv)); - tcg_gen_movcond_i64(TCG_COND_EQ, TCGV128_HIGH(tmpv), t0, z, - TCGV128_HIGH(newv), TCGV128_HIGH(oldv)); + /* Unconditional writeback. */ + tcg_gen_qemu_st_i128_int(tmpv, addr, idx, memop); + tcg_gen_mov_i128(retv, oldv); =20 - /* Unconditional writeback. */ - tcg_gen_qemu_st_i128_int(tmpv, addr, idx, memop); - tcg_gen_mov_i128(retv, oldv); - - tcg_temp_free_i64(t0); - tcg_temp_free_i64(t1); - tcg_temp_free_i128(tmpv); - tcg_temp_free_i128(oldv); - } + tcg_temp_free_i64(t0); + tcg_temp_free_i64(t1); + tcg_temp_free_i128(tmpv); + tcg_temp_free_i128(oldv); } =20 void tcg_gen_nonatomic_cmpxchg_i128_chk(TCGv_i128 retv, TCGTemp *addr, --=20 2.43.0