From nobody Sun Dec 14 06:42:53 2025 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=1764778560; cv=none; d=zohomail.com; s=zohoarc; b=cU9ydNpax/PVeppHMjXXK8o9RsjdQP/flMiHXGIX+jLXnU7JMQ0czBgEKHBV9IPTUMBg83fQTPB4cIbFGR+e6rRUtnhCw8RTXPP51WzS/BrAd6k07U3N/MOYHbsDVFeszngkGQJV9xZ4SbHVPYOIuyXpMMZdIB9kMZaFNmQfym8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764778560; 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=vDaHa3OjhmYLeTh/hRa4mPVA7rpjuvIfRbEKdqaUiNo=; b=bNNS6wIZZrCQkdcxSxSj2DXaAfLd+EL7gdfV6fMPHcLuiDa35djYdto10qLOF0FxPC9z4vYRpPoYtB/XhYtvnGxMw2M28wSfM4namDA5m1fEz9KCRsohYKHNmRfDraUZq3Lh6qNd++apNenl/o51VRiqfkj1ZQSi6+WukRNzdRo= 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 1764778560954790.3968155680147; Wed, 3 Dec 2025 08:16:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQpVV-0004As-Li; Wed, 03 Dec 2025 11:15:09 -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 1vQpVT-00049V-SC for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:08 -0500 Received: from mail-oa1-x36.google.com ([2001:4860:4864:20::36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQpVR-0006Wz-4j for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:07 -0500 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-3ec4d494383so4723235fac.3 for ; Wed, 03 Dec 2025 08:15:04 -0800 (PST) Received: from stoup.. ([187.210.107.189]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3f0dca40d4dsm10141625fac.9.2025.12.03.08.15.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Dec 2025 08:15:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764778503; x=1765383303; 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=vDaHa3OjhmYLeTh/hRa4mPVA7rpjuvIfRbEKdqaUiNo=; b=Mqf9Z7mgYo7EFOXmYyhYel95YyS6RZMvu86U2UDpMUtvNpT9bN3YH6zLOoxHdrtRXx QNalSE6S6h+kP9vMTNQVt0pTUXHfHCtRxBZxXug9gXQ/80ZtWqgiGwydADTpm2ioSX4+ q6atvADzcHZg86N2odIt3VBmB/efjwjp4PupnQTZ/Od1sro3azpUyodSZKC/zxj4ejfg XoYZviKT7gREyiB08MBIiwwjSfEsH0cVu3mQZfgDbHKknY7gZygk0KBihz2PV8TV61Nw VOurlinuGF7A7ZJgoqR3CGMq3djp4z8UMSTSlGfleFbHkYopOvduWUSP2RODrn2QtBOX 23uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764778503; x=1765383303; 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=vDaHa3OjhmYLeTh/hRa4mPVA7rpjuvIfRbEKdqaUiNo=; b=QvQ8G7DzN+5X41SktK+BsSik436AePJjnsY+zG0b7GYiE3eb9pNJeFDt54a6WaiJw3 7MVGtxCgggzZ1qWf5UHeK2OrnfMM3vH1EfIk0AHqN/mFiJcbU0vB/aM8sc1e5/cHSwOU IS89EegvU0CdQBAa0H/5M6iIJq4is1xIno8txhn5i1uFpfpOKtQ6hBUiP0XcZsykf0GD hXmEXGKcseNAmfNQXUaJ457m6/VMDhIiX90fBaJs0IWJ7G7H7LuJnfUQ96j32FZ4W/OY 4JCiQxIRTZqRqJqffqXFv4VFpM5xK1XigECUXoicdngKJCDFX1BAyfequFWOSwwLsFzt 2UNg== X-Gm-Message-State: AOJu0Yw2O5Picq1CFjwW1cHYVh03eu/r6UbzFSnfrTwx0axwkfc906Jo I2asmvQAsJVqOqhDx2ThBsWY0RhhcfbQBN2VVhKShV8+xbjXTyn9JuzkhDf7W59GuWxii2kEsGD As+ogiLI= X-Gm-Gg: ASbGncvjXGXJiHgwSohWDASvpbeekeWRcF+KKnv4w0QBValSOwbaHDrlin0WcmcvU44 Th45kUMmCnJYOi9JWQDAL5LILWfQQKmtQ1n/Hfh9DqErIe2/GllQxLens7frKwwFoHXfUycfNfi wb4/xNQsUJ4A4DBlHWcDGbr7dInjOHn47HcVRJyBjBc5lzTsUP+zP4aaZxchZRUZIBBUHOSlPiF gDq5tvgaB1UHqpiEOdvlSdlHNLWw5gInYvSvSKy/hIIPKUXUlgTVbPfhRQOYaB38dCVHWoegk86 pfFv2ekzrxT1o4ofLmyTTFxVAUgWkPKLnNP3EHEgntxOTd3PBicds+itFXJmlArbLH0BvATVSsq j4P96o6/kXtgx6eE/GHdvdxc1U3o7mgnJgXHI7NXxdlLAQrAEEsBc7K1yk6IspCNbKQ9flWlU5a ZWwdV1hKMmPgqgYdT22g== X-Google-Smtp-Source: AGHT+IHtTxrzzQMKGtRHsbYNIoVYSUWSI9H5NR0WsdNnyHrp5J+1LWug8X2UT6aAqeebXNmIL3D2qw== X-Received: by 2002:a05:6871:450b:b0:3d2:c44b:4d13 with SMTP id 586e51a60fabf-3f169349771mr1734306fac.32.1764778502849; Wed, 03 Dec 2025 08:15:02 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, qemu-stable@nongnu.org Subject: [PATCH v3 1/6] tcg: Zero extend 32-bit addresses for TCI Date: Wed, 3 Dec 2025 08:14:54 -0800 Message-ID: <20251203161500.501084-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251203161500.501084-1-richard.henderson@linaro.org> References: <20251203161500.501084-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 client-ip=2001:4860:4864:20::36; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x36.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1764778562391019200 Content-Type: text/plain; charset="utf-8" For native code generation, zero-extending 32-bit addresses for the slow path helpers happens in tcg_out_{ld,st}_helper_args, but there isn't really a slow path for TCI, so that didn't happen. Make the extension for TCI explicit in the opcode stream, much like we already do for plugins and atomic helpers. Cc: qemu-stable@nongnu.org Fixes: 24e46e6c9d9 ("accel/tcg: Widen tcg-ldst.h addresses to uint64_t") Signed-off-by: Richard Henderson Signed-off-by: Richard Henderson --- tcg/tcg-op-ldst.c | 72 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 11 deletions(-) diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c index 67c15fd4d0..1c0b06dbc7 100644 --- a/tcg/tcg-op-ldst.c +++ b/tcg/tcg-op-ldst.c @@ -135,6 +135,30 @@ static void tcg_gen_req_mo(TCGBar type) } } =20 +static TCGTemp *tci_extend_addr(TCGTemp *addr) +{ +#ifdef CONFIG_TCG_INTERPRETER + /* + * 64-bit interpreter requires 64-bit addresses. + * 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) { + TCGv_i64 temp =3D tcg_temp_ebb_new_i64(); + tcg_gen_extu_i32_i64(temp, temp_tcgv_i32(addr)); + return tcgv_i64_temp(temp); + } +#endif + return addr; +} + +static void maybe_free_addr(TCGTemp *addr, TCGTemp *copy) +{ + if (addr !=3D copy) { + tcg_temp_free_internal(copy); + } +} + /* Only required for loads, where value might overlap addr. */ static TCGv_i64 plugin_maybe_preserve_addr(TCGTemp *addr) { @@ -234,6 +258,7 @@ static void tcg_gen_qemu_ld_i32_int(TCGv_i32 val, TCGTe= mp *addr, MemOp orig_memop; MemOpIdx orig_oi, oi; TCGv_i64 copy_addr; + TCGTemp *addr_new; =20 tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); orig_memop =3D memop =3D tcg_canonicalize_memop(memop, 0, 0); @@ -248,10 +273,12 @@ static void tcg_gen_qemu_ld_i32_int(TCGv_i32 val, TCG= Temp *addr, oi =3D make_memop_idx(memop, idx); } =20 + addr_new =3D tci_extend_addr(addr); copy_addr =3D plugin_maybe_preserve_addr(addr); - gen_ldst1(INDEX_op_qemu_ld, TCG_TYPE_I32, tcgv_i32_temp(val), addr, oi= ); + gen_ldst1(INDEX_op_qemu_ld, TCG_TYPE_I32, tcgv_i32_temp(val), addr_new= , oi); plugin_gen_mem_callbacks_i32(val, copy_addr, addr, orig_oi, QEMU_PLUGIN_MEM_R); + maybe_free_addr(addr, addr_new); =20 if ((orig_memop ^ memop) & MO_BSWAP) { switch (orig_memop & MO_SIZE) { @@ -282,6 +309,7 @@ static void tcg_gen_qemu_st_i32_int(TCGv_i32 val, TCGTe= mp *addr, { TCGv_i32 swap =3D NULL; MemOpIdx orig_oi, oi; + TCGTemp *addr_new; =20 tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop =3D tcg_canonicalize_memop(memop, 0, 1); @@ -304,8 +332,10 @@ static void tcg_gen_qemu_st_i32_int(TCGv_i32 val, TCGT= emp *addr, oi =3D make_memop_idx(memop, idx); } =20 - gen_ldst1(INDEX_op_qemu_st, TCG_TYPE_I32, tcgv_i32_temp(val), addr, oi= ); + addr_new =3D tci_extend_addr(addr); + gen_ldst1(INDEX_op_qemu_st, TCG_TYPE_I32, tcgv_i32_temp(val), addr_new= , oi); plugin_gen_mem_callbacks_i32(val, NULL, addr, orig_oi, QEMU_PLUGIN_MEM= _W); + maybe_free_addr(addr, addr_new); =20 if (swap) { tcg_temp_free_i32(swap); @@ -326,6 +356,7 @@ static void tcg_gen_qemu_ld_i64_int(TCGv_i64 val, TCGTe= mp *addr, MemOp orig_memop; MemOpIdx orig_oi, oi; 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); @@ -350,10 +381,12 @@ static void tcg_gen_qemu_ld_i64_int(TCGv_i64 val, TCG= Temp *addr, oi =3D make_memop_idx(memop, idx); } =20 + addr_new =3D tci_extend_addr(addr); copy_addr =3D plugin_maybe_preserve_addr(addr); - gen_ld_i64(val, addr, oi); + gen_ld_i64(val, addr_new, oi); plugin_gen_mem_callbacks_i64(val, copy_addr, addr, orig_oi, QEMU_PLUGIN_MEM_R); + maybe_free_addr(addr, addr_new); =20 if ((orig_memop ^ memop) & MO_BSWAP) { int flags =3D (orig_memop & MO_SIGN @@ -388,6 +421,7 @@ static void tcg_gen_qemu_st_i64_int(TCGv_i64 val, TCGTe= mp *addr, { TCGv_i64 swap =3D NULL; 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); @@ -418,8 +452,10 @@ static void tcg_gen_qemu_st_i64_int(TCGv_i64 val, TCGT= emp *addr, oi =3D make_memop_idx(memop, idx); } =20 - gen_st_i64(val, addr, oi); + addr_new =3D tci_extend_addr(addr); + gen_st_i64(val, addr_new, oi); plugin_gen_mem_callbacks_i64(val, NULL, addr, orig_oi, QEMU_PLUGIN_MEM= _W); + maybe_free_addr(addr, addr_new); =20 if (swap) { tcg_temp_free_i64(swap); @@ -530,6 +566,7 @@ static void tcg_gen_qemu_ld_i128_int(TCGv_i128 val, TCG= Temp *addr, { MemOpIdx orig_oi; TCGv_i64 ext_addr =3D NULL; + TCGTemp *addr_new; =20 check_max_alignment(memop_alignment_bits(memop)); tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); @@ -557,8 +594,10 @@ static void tcg_gen_qemu_ld_i128_int(TCGv_i128 val, TC= GTemp *addr, hi =3D TCGV128_HIGH(val); } =20 + addr_new =3D tci_extend_addr(addr); gen_ldst2(INDEX_op_qemu_ld2, TCG_TYPE_I128, tcgv_i64_temp(lo), - tcgv_i64_temp(hi), addr, oi); + tcgv_i64_temp(hi), addr_new, oi); + maybe_free_addr(addr, addr_new); =20 if (need_bswap) { tcg_gen_bswap64_i64(lo, lo); @@ -586,7 +625,9 @@ static void tcg_gen_qemu_ld_i128_int(TCGv_i128 val, TCG= Temp *addr, y =3D TCGV128_LOW(val); } =20 - gen_ld_i64(x, addr, make_memop_idx(mop[0], idx)); + addr_new =3D tci_extend_addr(addr); + gen_ld_i64(x, addr_new, make_memop_idx(mop[0], idx)); + maybe_free_addr(addr, addr_new); =20 if (need_bswap) { tcg_gen_bswap64_i64(x, x); @@ -602,7 +643,9 @@ static void tcg_gen_qemu_ld_i128_int(TCGv_i128 val, TCG= Temp *addr, addr_p8 =3D tcgv_i64_temp(t); } =20 - gen_ld_i64(y, addr_p8, make_memop_idx(mop[1], idx)); + addr_new =3D tci_extend_addr(addr_p8); + gen_ld_i64(y, addr_new, make_memop_idx(mop[1], idx)); + maybe_free_addr(addr_p8, addr_new); tcg_temp_free_internal(addr_p8); =20 if (need_bswap) { @@ -636,6 +679,7 @@ static void tcg_gen_qemu_st_i128_int(TCGv_i128 val, TCG= Temp *addr, { MemOpIdx orig_oi; TCGv_i64 ext_addr =3D NULL; + TCGTemp *addr_new; =20 check_max_alignment(memop_alignment_bits(memop)); tcg_gen_req_mo(TCG_MO_ST_LD | TCG_MO_ST_ST); @@ -666,8 +710,10 @@ static void tcg_gen_qemu_st_i128_int(TCGv_i128 val, TC= GTemp *addr, hi =3D TCGV128_HIGH(val); } =20 + addr_new =3D tci_extend_addr(addr); gen_ldst2(INDEX_op_qemu_st2, TCG_TYPE_I128, - tcgv_i64_temp(lo), tcgv_i64_temp(hi), addr, oi); + tcgv_i64_temp(lo), tcgv_i64_temp(hi), addr_new, oi); + maybe_free_addr(addr, addr_new); =20 if (need_bswap) { tcg_temp_free_i64(lo); @@ -694,7 +740,9 @@ static void tcg_gen_qemu_st_i128_int(TCGv_i128 val, TCG= Temp *addr, x =3D b; } =20 - gen_st_i64(x, addr, make_memop_idx(mop[0], idx)); + addr_new =3D tci_extend_addr(addr); + gen_st_i64(x, addr_new, make_memop_idx(mop[0], idx)); + maybe_free_addr(addr, addr_new); =20 if (tcg_ctx->addr_type =3D=3D TCG_TYPE_I32) { TCGv_i32 t =3D tcg_temp_ebb_new_i32(); @@ -706,13 +754,15 @@ static void tcg_gen_qemu_st_i128_int(TCGv_i128 val, T= CGTemp *addr, addr_p8 =3D tcgv_i64_temp(t); } =20 + addr_new =3D tci_extend_addr(addr_p8); if (b) { tcg_gen_bswap64_i64(b, y); - gen_st_i64(b, addr_p8, make_memop_idx(mop[1], idx)); + gen_st_i64(b, addr_new, make_memop_idx(mop[1], idx)); tcg_temp_free_i64(b); } else { - gen_st_i64(y, addr_p8, make_memop_idx(mop[1], idx)); + gen_st_i64(y, addr_new, make_memop_idx(mop[1], idx)); } + maybe_free_addr(addr_p8, addr_new); tcg_temp_free_internal(addr_p8); } else { if (tcg_ctx->addr_type =3D=3D TCG_TYPE_I32) { --=20 2.43.0 From nobody Sun Dec 14 06:42:53 2025 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=1764778600; cv=none; d=zohomail.com; s=zohoarc; b=TxefYYSFrpqAyzcqS2c9b3Pd5yxjbRPw/UYCw3uwpLblBTNEpIKoYmZ09fTAQ/kbD7hEVbV1ti/VudaRY0RwNZsvdYWYe6Ldm3fIJ0GeCmditGamKhBanTT/7fayPcL07D9BCnZEt/mwd7n0jttRffVsUxbFJOrxTw4gIkYz5gA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764778600; h=Content-Type: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=9j2crjoCrA/yBIViXmRa5qDZhpH7ZS6YU+XGm2gA7ZM=; b=PzYfniB6tWnfzDHOXMehPXdLAttSvG+gv1+71VgH7zDMDWCrzhF5ThN7R3E+at1hOBuyaRNNghFRcOXK2l97PPcv7mtycp1UarBcWTAtROe8+nL8t3xnFbCYB4QUjpVtmx4wCIeBL6dZE4SIPoayUWDuIYLzJ9URMB6U6S10nTY= 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 1764778600350522.3858818219481; Wed, 3 Dec 2025 08:16:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQpVV-0004Aw-Nn; Wed, 03 Dec 2025 11:15:09 -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 1vQpVT-00049N-LM for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:07 -0500 Received: from mail-oa1-x30.google.com ([2001:4860:4864:20::30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQpVR-0006Xw-2g for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:07 -0500 Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-3f0d1a39cabso3952462fac.3 for ; Wed, 03 Dec 2025 08:15:04 -0800 (PST) Received: from stoup.. ([187.210.107.189]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3f0dca40d4dsm10141625fac.9.2025.12.03.08.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Dec 2025 08:15:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764778504; x=1765383304; 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=9j2crjoCrA/yBIViXmRa5qDZhpH7ZS6YU+XGm2gA7ZM=; b=ASGKaOJv6LK2caauWyvaH7e/PhwEw20Mq7HUUmyXYcZoK9oGdxi9bD+C3ApdGh/sIZ n4rfNqew1PJh3SDYuF6oC06o3uVoj1PHHI65hFotm0oY69QFjcLknvRIX35qdbmLTLCl NeBHosJyaA3NLUVur2icHuYhy9k0F9rUax6VdxoRaMId/x7TUptMaYQNKBoS+vytgoFI Hzo8s/iH47fBf1wCH5nYpQhWUF2chT1xHE2kMTqnBcEfKZ4AMdcVBRakQ/TawuPMuduV oz+27izWmTaLTUVs6mgqSmCL/4RDpU4FT8tw+TuU1WMs61+F2VU5Ugvacd4QGgZtih8M exRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764778504; x=1765383304; 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=9j2crjoCrA/yBIViXmRa5qDZhpH7ZS6YU+XGm2gA7ZM=; b=m9FwcneIG63SUhq5CwBNynkJatrElg8JESW0N3jeT68EHoaWp8C3UZY4C1S3+iZMDp 89kJTwSpw2I26c/JZUOlKbM4kmYhX0FeXACW6pV1R1QCgRqtlmlLwsO61Im+2tJiXB/b 6OMaV1DkanaDZCqhCsbXXEQ+eXGgPnC15IW+DK4Lt9d83BILKgeoXRdT7UWRiHx3zaaN oxYdjIsy/LVbAa1PmSsA6SZFMDevom50QB4TfzDpcAMhF73cUZbUZj43BNsr7/LbcHO0 bXL63/g4AKMdU4/CWs0s0Rfq9oZQAs2jj6Qib1JuiivxxmLQEoWKdYvEgx8RhcwZmatw l6vA== X-Gm-Message-State: AOJu0YxM2NrPktVBK71CGghO2sk8xu1sdRuN9xZAZr/KYEwkrZlifU0d AC6xRqU/sagdIGbKkNBscrV4MCru33duizW3sGa1dSO1QH4O/AC/MJn/x5SgbTH3fuGX83PUIEt hKUXB1ZI= X-Gm-Gg: ASbGncv87X27xnfPL63em5pi7WtWVJ+lZkAXROI/wuYJ7MCr/fnt/5CvIQ1YH45MrCd HnP2d1SWW0W3gCBuU4iPEZxAuXj0OteIn/2y9XKtPMYyQjMXa6ggCfcDkALIO1fTj1UNrZoV1a4 CkxfgPDqDrbd4Q3SLH4kL61PC10/g8SDDdRcswSeG8y1dSIT5KVpOs+pIw0UBrw5dEMP9aGAAwA wXBJmajrFlo/s2Ygo6tL9detteo2JB4UKV/clUUqBF6Jo+sOR1xySD7hRDHpenp2Khq14G+8qUh pscSmPuzK48TWuLmITTySMmm13NEbOTj5RPSXKOHftC2W0wArTejcv/OcvFOqWyU8Y1r3SpzKWm m0X4Kj62BX7r+hcyzNNau9dIECfZVRIZ/MzRrhkBdiRdEQqMu9Iw4Pf0UPLQ4KPfJdQFYPKhoUk lHi8hS2KGT6zt1QnxKsg== X-Google-Smtp-Source: AGHT+IFGmd1k1BNZTKfVL4qiCp1IrUNDlISdhhU4WvzL6Lw1x2IiUMBGaEYo6zm3rIa7wLsc4nWGhA== X-Received: by 2002:a05:6870:9f13:b0:3e8:172f:da82 with SMTP id 586e51a60fabf-3f16922c30dmr1433033fac.19.1764778503753; Wed, 03 Dec 2025 08:15:03 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 2/6] tcg/tci: Introduce INDEX_op_tci_qemu_{ld,st}_rrr Date: Wed, 3 Dec 2025 08:14:55 -0800 Message-ID: <20251203161500.501084-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251203161500.501084-1-richard.henderson@linaro.org> References: <20251203161500.501084-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2001:4860:4864:20::30; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x30.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1764778600632019200 Since d182123974c4, the number of bits in a MemOpIdx tops out at 17. which won't fit in the TCI rrm format, thus an assertion failure. Introduce new opcodes that take the MemOpIdx from a register, as we already do for qemu_ld2 and qemu_st2. Fixes: d182123974c4 ("include/exec/memopidx: Adjust for 32 mmu indexes") Tested-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tci.c | 19 +++++++++++++++++++ tcg/tci/tcg-target-opc.h.inc | 2 ++ tcg/tci/tcg-target.c.inc | 14 ++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tcg/tci.c b/tcg/tci.c index 700e672616..e15d4e8e08 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -794,12 +794,24 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchSt= ate *env, taddr =3D regs[r1]; regs[r0] =3D tci_qemu_ld(env, taddr, oi, tb_ptr); break; + case INDEX_op_tci_qemu_ld_rrr: + tci_args_rrr(insn, &r0, &r1, &r2); + taddr =3D regs[r1]; + oi =3D regs[r2]; + regs[r0] =3D tci_qemu_ld(env, taddr, oi, tb_ptr); + break; =20 case INDEX_op_qemu_st: tci_args_rrm(insn, &r0, &r1, &oi); taddr =3D regs[r1]; tci_qemu_st(env, taddr, regs[r0], oi, tb_ptr); break; + case INDEX_op_tci_qemu_st_rrr: + tci_args_rrr(insn, &r0, &r1, &r2); + taddr =3D regs[r1]; + oi =3D regs[r2]; + tci_qemu_st(env, taddr, regs[r0], oi, tb_ptr); + break; =20 case INDEX_op_qemu_ld2: tcg_debug_assert(TCG_TARGET_REG_BITS =3D=3D 32); @@ -1050,6 +1062,13 @@ int print_insn_tci(bfd_vma addr, disassemble_info *i= nfo) op_name, str_r(r0), str_r(r1), oi); break; =20 + case INDEX_op_tci_qemu_ld_rrr: + case INDEX_op_tci_qemu_st_rrr: + tci_args_rrr(insn, &r0, &r1, &r2); + info->fprintf_func(info->stream, "%-12s %s, %s, %s", + op_name, str_r(r0), str_r(r1), str_r(r2)); + break; + case INDEX_op_qemu_ld2: case INDEX_op_qemu_st2: tci_args_rrrr(insn, &r0, &r1, &r2, &r3); diff --git a/tcg/tci/tcg-target-opc.h.inc b/tcg/tci/tcg-target-opc.h.inc index 4eb32ed736..f8bfffc125 100644 --- a/tcg/tci/tcg-target-opc.h.inc +++ b/tcg/tci/tcg-target-opc.h.inc @@ -13,3 +13,5 @@ DEF(tci_rotl32, 1, 2, 0, TCG_OPF_NOT_PRESENT) DEF(tci_rotr32, 1, 2, 0, TCG_OPF_NOT_PRESENT) DEF(tci_setcond32, 1, 2, 1, TCG_OPF_NOT_PRESENT) DEF(tci_movcond32, 1, 2, 1, TCG_OPF_NOT_PRESENT) +DEF(tci_qemu_ld_rrr, 1, 2, 0, TCG_OPF_NOT_PRESENT) +DEF(tci_qemu_st_rrr, 0, 3, 0, TCG_OPF_NOT_PRESENT) diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 35c66a4836..532f87262c 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -1188,7 +1188,12 @@ static const TCGOutOpStore outop_st =3D { static void tgen_qemu_ld(TCGContext *s, TCGType type, TCGReg data, TCGReg addr, MemOpIdx oi) { - tcg_out_op_rrm(s, INDEX_op_qemu_ld, data, addr, oi); + if (oi & ~0xffff) { + tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_TMP, oi); + tcg_out_op_rrr(s, INDEX_op_tci_qemu_ld_rrr, data, addr, TCG_REG_TM= P); + } else { + tcg_out_op_rrm(s, INDEX_op_qemu_ld, data, addr, oi); + } } =20 static const TCGOutOpQemuLdSt outop_qemu_ld =3D { @@ -1213,7 +1218,12 @@ static const TCGOutOpQemuLdSt2 outop_qemu_ld2 =3D { static void tgen_qemu_st(TCGContext *s, TCGType type, TCGReg data, TCGReg addr, MemOpIdx oi) { - tcg_out_op_rrm(s, INDEX_op_qemu_st, data, addr, oi); + if (oi & ~0xffff) { + tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_TMP, oi); + tcg_out_op_rrr(s, INDEX_op_tci_qemu_st_rrr, data, addr, TCG_REG_TM= P); + } else { + tcg_out_op_rrm(s, INDEX_op_qemu_st, data, addr, oi); + } } =20 static const TCGOutOpQemuLdSt outop_qemu_st =3D { --=20 2.43.0 From nobody Sun Dec 14 06:42:53 2025 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=1764778540; cv=none; d=zohomail.com; s=zohoarc; b=iuE9KjefANsWm7py1vdjOa8fSdovNBN3eHTVDXrlag6V2R+2uNJCzETMzi+KCSQlzsxWskvmMkzepEZkUoxmDVh3nUwLV495FR1+f2dIRPjalF2+f3U+gg/JrofpO9qbtATbgsqrH+dBl+qD22JlIdGTEcDfKnaW3AlJ5CzwNGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764778540; 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=PfNK2eyZFoaZUEw1YRhOUodNTu0hMWFGEWvpWiPmsR8=; b=R6hZ1tYs0c8MukNwkJYo6vQoL1k8AnRVdyfMix9qjN1ROcM6iyyeAbZW02EEyLPcpvZ71nOTCASIQqKo6h0tAIo/TGqcBa4Amo0+sG4vl+7lVzYWaPw2FKOMJSL1U998lXe1HEjO7cYKoVpAdfEKghO2nMD7ah9Sew5Fbgwhn+A= 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 1764778539493174.3676569112106; Wed, 3 Dec 2025 08:15:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQpVU-0004AG-UN; Wed, 03 Dec 2025 11:15:08 -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 1vQpVT-00049L-FS for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:07 -0500 Received: from mail-oa1-x2a.google.com ([2001:4860:4864:20::2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQpVR-0006YP-QI for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:07 -0500 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-3f0ec55ce57so4606623fac.2 for ; Wed, 03 Dec 2025 08:15:05 -0800 (PST) Received: from stoup.. ([187.210.107.189]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3f0dca40d4dsm10141625fac.9.2025.12.03.08.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Dec 2025 08:15:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764778504; x=1765383304; 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=PfNK2eyZFoaZUEw1YRhOUodNTu0hMWFGEWvpWiPmsR8=; b=jivJFTelWLewrFvykqwftprQ8f7LW+ie/5V8Z1h10ob33kER0Tl8mG7b2vj1rb5pJr roDJnPPFdUCzqbbQqEjWgD0ynnSfxG7ynI8skIKu4t9fEWPcS67T8TPaOmH9Nh7uA25P t6iugahe1SjcHPlxkewtTrWZ7rU2aUj2iSMoLtbnNoLoOA7lsHhcyJu+7jcj1JdxfV13 vwASQS6rWtZQ3ACFPlrg1pSLmPbzNh1lTEORtHblSVeevmUy3gcI4OHhFsxKopFQIMYv YQISgwPjDC6qWnhLvJskYEYB0Ixea1FrUQuDVYm5TJLRs01QHO8DCJWzp3bcoCpLxnUM o4gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764778504; x=1765383304; 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=PfNK2eyZFoaZUEw1YRhOUodNTu0hMWFGEWvpWiPmsR8=; b=EukB75N07pq2fZzQan6f7P9YlijwTZeG+OZtDZ8jpcXMrPYm1M9FuFXnyjnZiz+z9p yxDqbIhWxRgqXqXqruyma9Xj6Hm89Pwhx0zv+k9s24ejyMq/IZuroD9vCr0hrQrmmusa CBRT/xJYpUprYEclonX82t59xKSBefB7DmId0CVs93Agfk0HcQcm1zhDdT2scWlsdyVa DD9OG5rrpQBAEkXm+O7Bb8o/g9edmKgLtJIYrYCENfeTimN3LOhCM2RSP+JeAYFg8V4m Nb7LEOiMRDnHTycIvi8FwNa6W6qOjgVVjxnkgsCO6Zz1zCdc4PyU0JdOj70LiKUpgFMa ynaQ== X-Gm-Message-State: AOJu0YyHy6UtOvV+nKufmETWcDetK6Hz1FyHmX/V6XnWHS/o1KZg/AX5 Z+Ba0OLMLV72jxoA4zou4rMJJ1xAjPus9JCy03Iiy3KvQ/s0eCItDPDW1pk4+mjqoUV7D7fxGa0 /N694w9Y= X-Gm-Gg: ASbGnctAu5QOTSypcwoe3qWnCt7an1sbQN+PcF+FlbZSvTMg2DC/r8DG3xfVqILt8HF s6dskyn9SH/veS1WB/EvXjv/NYVfirMdb2/6C9Pg+F4ezaVIhxm6uji5VcnQj7I72KoW5xCd1xC fWg/WVDsM9T8daqK24Hn2WVE2OGEmfjTbNCjxhi2W8uI+g48cTU+J/ANeJJgVU3VeQpXMW+T9QR kXGgtZGKuhbRMO7OeWJ2lBpB7yptrbR8BaNHz+BhcHaHzARozGlK1U+MhjcH31kkT2ddPjU5v9t wtojxmVWo3N4cWVv+tzytDZJQPhb4gd8AlK9emsl4FfXUNHNvgbD3PzYiKBNXJvsUsUtnAu47Q9 pu1VSgJFtR5Bm0OtQjLGnfUwarbwg6D1OsLzvVNSgsfx1SR2IJZpLeBiwqqPcwZmx9nvW1kW3Hd De5Fto3XrojxU+b9AU2Q== X-Google-Smtp-Source: AGHT+IHgAHHQtlndJJEmtbCRpVNgN42g+E08B55uiYOJ1M7GWHO93hRtGunv+/udL07c8DTokxSzPg== X-Received: by 2002:a05:6871:ea10:b0:3e0:ffcb:2f84 with SMTP id 586e51a60fabf-3f16935c3e3mr1494602fac.28.1764778504467; Wed, 03 Dec 2025 08:15:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v3 3/6] tcg: Remove duplicate test from plugin_gen_mem_callbacks Date: Wed, 3 Dec 2025 08:14:56 -0800 Message-ID: <20251203161500.501084-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251203161500.501084-1-richard.henderson@linaro.org> References: <20251203161500.501084-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 client-ip=2001:4860:4864:20::2a; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1764778546402019200 Content-Type: text/plain; charset="utf-8" All callers have already tested tcg_ctx->plugin_insn. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tcg-op-ldst.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c index 1c0b06dbc7..7716c3ad7c 100644 --- a/tcg/tcg-op-ldst.c +++ b/tcg/tcg-op-ldst.c @@ -182,23 +182,21 @@ static void plugin_gen_mem_callbacks(TCGv_i64 copy_addr, TCGTemp *orig_addr, MemOpIdx = oi, enum qemu_plugin_mem_rw rw) { - if (tcg_ctx->plugin_insn !=3D NULL) { - qemu_plugin_meminfo_t info =3D make_plugin_meminfo(oi, rw); + qemu_plugin_meminfo_t info =3D make_plugin_meminfo(oi, rw); =20 - if (tcg_ctx->addr_type =3D=3D TCG_TYPE_I32) { - if (!copy_addr) { - copy_addr =3D tcg_temp_ebb_new_i64(); - tcg_gen_extu_i32_i64(copy_addr, temp_tcgv_i32(orig_addr)); - } + if (tcg_ctx->addr_type =3D=3D TCG_TYPE_I32) { + if (!copy_addr) { + copy_addr =3D tcg_temp_ebb_new_i64(); + tcg_gen_extu_i32_i64(copy_addr, temp_tcgv_i32(orig_addr)); + } + tcg_gen_plugin_mem_cb(copy_addr, info); + tcg_temp_free_i64(copy_addr); + } else { + if (copy_addr) { tcg_gen_plugin_mem_cb(copy_addr, info); tcg_temp_free_i64(copy_addr); } else { - if (copy_addr) { - tcg_gen_plugin_mem_cb(copy_addr, info); - tcg_temp_free_i64(copy_addr); - } else { - tcg_gen_plugin_mem_cb(temp_tcgv_i64(orig_addr), info); - } + tcg_gen_plugin_mem_cb(temp_tcgv_i64(orig_addr), info); } } } --=20 2.43.0 From nobody Sun Dec 14 06:42:53 2025 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=1764778562; cv=none; d=zohomail.com; s=zohoarc; b=j21dxI/Ecc3BNTdeuAv6edrg9xYNuNoGqFobj7q/A5kufcFvD2cKsJtC5a61lQuBwErB2j27IpKZIen+D+LPadexoIx+7ij2VfM7/1LfEbmO/IEPsBvqT6XO6ArbXaqCsS9+O7TXJl6wp322ARQu3sBvvKs3egtzuAYQYovtwtI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764778562; h=Content-Type: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=ByvILIj3hIVKvB3nld8A94yUCZSu7vP7Hj6QwoTLuOM=; b=DeaOKkGTV0j7VZ/ItpCyQeHl0NrBCiatgCpvOQoC2txnTK7+tJtBdAf/N1CX3b+fUP1QVoa46w6K194I7d9/AACIAod1x5HLy9vetcEFnIe4RvjAUdCJw7T8EXb28JK4UtbbQoicoji78cg1YzRLL2uoF6+NZf/TF9AnZfmEbsk= 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 1764778562274622.8275791704312; Wed, 3 Dec 2025 08:16:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQpVW-0004BP-E5; Wed, 03 Dec 2025 11:15:10 -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 1vQpVU-0004A5-EO for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:08 -0500 Received: from mail-oa1-x2f.google.com ([2001:4860:4864:20::2f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQpVS-0006Yd-QC for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:08 -0500 Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-3e3dac349easo5217884fac.2 for ; Wed, 03 Dec 2025 08:15:06 -0800 (PST) Received: from stoup.. ([187.210.107.189]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3f0dca40d4dsm10141625fac.9.2025.12.03.08.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Dec 2025 08:15:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764778505; x=1765383305; 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=ByvILIj3hIVKvB3nld8A94yUCZSu7vP7Hj6QwoTLuOM=; b=Ot2Y8h/lMZ3dwffRPF9DUo/8WrfJ2ruFuyWHGMLHz60M4HK7Crb4Hh4C5svcupvrTn tWz89h6fcTnt319KPXm3i3DjkzBIp0mZB+e7YTh7Dl3gS7EfEUJNw4yq+TNiVVYrXPcR cnhib9XFmL1EkCs3zSCx2desd+JpPVzIhIT1cvEzJpC+tOq8EYRxK6zgnW+Qpt8dLhwU HI1O01tw9kiYovemiAZzBv3dtAr3qmY5ww/XNIS2AQ3u6vaFemP5h+pL4wFwah/rmyVK ZuHWBtKGVnyaVVDK1djSomrOiYxkSGyY/r+6QqELyj9jRwJZDBVH3WTcceVXd9TncTxp mKyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764778505; x=1765383305; 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=ByvILIj3hIVKvB3nld8A94yUCZSu7vP7Hj6QwoTLuOM=; b=bxAHEYuPGGspdFgU+INi/PZctUWmcW9s3IDpVB7JVqcT/a6uYSleZhD3kM+661zNzx Mpi3OaSyqAhDhg3jIfY97j5AxUnBnobs+8AZ5samt/MfQZZaLD6pKA38KgAOKvy/qUtA ALA93omma3q7myt7HaxBTI8vLytSuff5c7PxqaeV8Wmau5Pqt9F+VuijTaL8bt+71nwF ocROC+b9/0rPbB17L+TJF0lMw6cSkU4Kbscs7tCIxMW/tJKRzOQocpmt8W0wfLmIueKT HraoQve3dEfNapFSRv9ed6ia0S+XrLvQ4wArAp2lf9aidJ1MGpFgxgIxMZZ1yCtNUAX9 go6w== X-Gm-Message-State: AOJu0YxtOeMgWN4ZXdgTIEtDOn3HlogGLEpvg1PyEV/+2C/FSgRozZ5r urmzc+LfRx1uHWcRpvY7vzTHFyegX7+nuVqitMcI0A46vEXw1ieFJmfVhyyfAwKZvRWr/rPmCUS +3/yKhzE= X-Gm-Gg: ASbGncsYBv1gYGtdb2v0VgZWVj6cJTkWAJlR8JBPzCot3NayWQHebbib2SfOUV8SRCo HMRc0enmDw84wfNQvHizxvZ/rgY3n6UTMQTAG4+Blgq+JfW324ONU8Zkt52asnzhFjOXqNobeJh 6DAg3q7OYrEGcQ6CP25pDOuyT4QXGk/B6X/n5NB1pAU76J4VpEOK7Dhu0zQfUl2IzPwOybPn4t6 S1EU66rg67I8006OfjycRAzphpDxjeyL1D9VFIQKLdlAT611IbWhjUGjSkCBzNNNoVhqq4nlI5S UK5IcN8/ss0XKzgh4QU6PVcgTPFJwa/BDOTfLmVJPS90p2eSNOqDA5pQy1meMo1zPPxUdnZEYtI aoTD/7OvFpPeKmqIZZ7XWvgIHnQqxUpcA2iKN4stygKKaaCLljB8OhI+7mL+4fud/rc47Ndo6zH hwU83VRkH/32NO/T2qCQBTAV0uMFCH X-Google-Smtp-Source: AGHT+IG0pl+gxlwdgno9rQgnnNl6tDykdBTtV+SsdxuTRECY3i9JFG+XmLE6cA9MDwiDWeefkndUUg== X-Received: by 2002:a05:6871:a913:b0:3dc:b701:c9b3 with SMTP id 586e51a60fabf-3f169473cfdmr1683937fac.45.1764778505480; Wed, 03 Dec 2025 08:15:05 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v3 4/6] tcg/tci: Disable -Wundef FFI_GO_CLOSURES warning Date: Wed, 3 Dec 2025 08:14:57 -0800 Message-ID: <20251203161500.501084-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251203161500.501084-1-richard.henderson@linaro.org> References: <20251203161500.501084-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2001:4860:4864:20::2f; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1764778568367019200 Since we build TCI with FFI (commit 22f15579fa1 "tcg: Build ffi data structures for helpers") we get on Darwin: In file included from ../../tcg/tci.c:22: In file included from include/tcg/helper-info.h:13: /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk/usr/include/ffi/ffi= .h:483:5: warning: 'FFI_GO_CLOSURES' is not defined, evaluates to 0 [-Wunde= f] 483 | #if FFI_GO_CLOSURES | ^ 1 warning generated. This was fixed in upstream libffi in 2023, but not backported to MacOSX. Simply disable the warning locally. Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- include/tcg/helper-info.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/tcg/helper-info.h b/include/tcg/helper-info.h index 909fe73afa..49a27e4eae 100644 --- a/include/tcg/helper-info.h +++ b/include/tcg/helper-info.h @@ -10,7 +10,19 @@ #define TCG_HELPER_INFO_H =20 #ifdef CONFIG_TCG_INTERPRETER +/* + * MacOSX 15 uses an old version of libffi which contains + * #if FFI_GO_CLOSURES + * but does not define that in , included from . + * This was fixed upstream with + * https://github.com/libffi/libffi/commit/c23e9a1c + * We don't care about go closures one way or the other; + * just suppress the warning. + */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wundef" #include +#pragma GCC diagnostic pop #endif #include "tcg-target-reg-bits.h" =20 --=20 2.43.0 From nobody Sun Dec 14 06:42:53 2025 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=1764778536; cv=none; d=zohomail.com; s=zohoarc; b=Z/GwIHV1UwwQhoUiFzgq+HFMTl4xxW2W7q20q7164vSWYcWnJhVcNtnnuV6qHeFM3tF5oVk66L1AXIE75jAW9S0+01tUbPOUojuQqEv3rz2huVdJ+Nk7oL+2nflOnl8XeD6j6qsbm00r4oX09eXezELgAOV6Jc2K8GQHEJI9xsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764778536; h=Content-Type: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=umT5Z14AhC/R+eDB/nFLqwC+LDiOvYbjL0xjqvp99eo=; b=E22bUxnxPaAa2uY8rg9GKhyxPmeG6pvWVLcxMJw8NnoOrYsaLx+wekaxwofmXbgXHoHqP6J5ZmQMB3TMqPnTRCoarlAKjy2HQAO4S29H12K5npjZSB0xVqv+5iWMURN3RobEpTbC4aA+t3k6yU2xCQfzFD5yLtD5rpldxde2/F8= 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 1764778536518296.4237232913058; Wed, 3 Dec 2025 08:15:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQpVY-0004ES-10; Wed, 03 Dec 2025 11:15:12 -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 1vQpVV-0004Az-Mc for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:09 -0500 Received: from mail-oo1-xc35.google.com ([2607:f8b0:4864:20::c35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQpVU-0006Z4-3K for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:09 -0500 Received: by mail-oo1-xc35.google.com with SMTP id 006d021491bc7-6592f1f55a8so1549445eaf.2 for ; Wed, 03 Dec 2025 08:15:07 -0800 (PST) Received: from stoup.. ([187.210.107.189]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3f0dca40d4dsm10141625fac.9.2025.12.03.08.15.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Dec 2025 08:15:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764778507; x=1765383307; 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=umT5Z14AhC/R+eDB/nFLqwC+LDiOvYbjL0xjqvp99eo=; b=eJW5/pw/Lc0pCbK5PL7T9sivS+l99TfMdAWconEOT+xXNvR9Hm5haLYrKB1R+GYeaX BdyZYpxFKDNh/7EP3W9HDq6FR0s7C8S3LmqQASBrITNiGTjOz6JI5tGuijHcjoTiGPxd qBWNkR4z7jkPAlHix7yRsHmE/IyINNc8DvIHr7s+lKDobjoJ+q//lfz/rM4GhvkLKrDy k7U2OWY3Cu/xOEY8tQMJPZ25IY/L8zlWQ3pb3DYXWesjc+oVjS/oF63oQXVVkBgxFhXL w+2uy3gS5mjw8AeOfkXxfbwidBCWgQKeabRxJAKoraAt4bsK3zzfRTEkoUuyhRa8GBke sTJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764778507; x=1765383307; 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=umT5Z14AhC/R+eDB/nFLqwC+LDiOvYbjL0xjqvp99eo=; b=lxGDJFYX/L2ARnaHlHqivChtV0oasLAcfc8xdSpb1/fOKi6LZujOJoAPL2lFOI11WR 4gZ7X+QgiETocQ+edS8xzxnHtHustGXhmnp15heEuQxdYYNlCHk7jzDqVGXXtFq6BMIe 8M+K9642sg4+z+4jkAtc4Yr3wIUThwT8mob7yrmM/9IgctbdDY3n51HbIjcuzat3XLHl UE/7x1mz/lVq46rYQrzEYvNoDzlvCh2Fm4VPtX/cr4QTRXrmwMsRwnMyyxw+7SZl/gbl VLUgRFLrV7xy5JNTMh5k+u43CFDGTW3R0kfC2IFAqBJGDkT7nL+/7L/j4TM9rFa49gnV /5QQ== X-Gm-Message-State: AOJu0YzvL16VnkUKA5bPC2SIw3cVskbb1LVuAL9w9/4oJcGSlrzNwdMi RKHJSoKD0nD2nJRkxlJ9i9b4kswKQlUepV4QbdNgKhW58ZVrV0FR+xoArSSvcs+TPlGGZlSprXF zaOgq9sM= X-Gm-Gg: ASbGncsuMUFq3IyPizt5qe45Y/e3i9UoI2W1V6+cyPOYV9GYTF3BENdWQA+gL4jkG4w m4hvgQZSq8ZPkfm5Gbz6Lwm33rgRvlcoua9RUppGncgFTW9fXYoN8hZ1hgAanrwuQgkURMOxCZH R6+fFavqfhRLIVAVDBrsjUI1VIiKUJl6e31lT0svGu0uyfgt45jYraf7L+dFMcWwLWU9olBJOFI Hs6rXFgKDUXLPX59qOxiuPlbMixZ76sZTL6zCQ0QUkl0GVn8aMb30/mTeFaRomWLl6KMFl/s+Aw NK+fX+WMbsRX5qM68izNxru2X6f5EposBYJbjpV4ciLbGQTst/tp54190bIDIVgd3CHSZxnievC Ew391OlUK48DNoDeDxTxX4Ht2WGUomN53iug8eaNAekdsyq6lV0ucIxMb589+DShcHNxHrc1m/A zmq5FvFIkMwDHAGy6Cmg== X-Google-Smtp-Source: AGHT+IH3a4q63OEu0NQL+DmhoqYlJ6AdSKiTKm5+J38YvoEwFDinabdhoRmw0eA1VUlfEJVGrMjj1g== X-Received: by 2002:a05:6808:3099:b0:442:e596:1189 with SMTP id 5614622812f47-4536e56ead8mr1342129b6e.45.1764778506732; Wed, 03 Dec 2025 08:15:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v3 5/6] include/generic/host: Fix atomic128-cas.h.inc for Int128 structure Date: Wed, 3 Dec 2025 08:14:58 -0800 Message-ID: <20251203161500.501084-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251203161500.501084-1-richard.henderson@linaro.org> References: <20251203161500.501084-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2607:f8b0:4864:20::c35; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc35.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1764778538606019201 Use the Int128Alias structure more when we need to convert between Int128 and __int128_t, when Int128 is a struct. Fixes the build on aarch64 host with TCI, which forces the use of the struct. Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- host/include/generic/host/atomic128-cas.h.inc | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/host/include/generic/host/atomic128-cas.h.inc b/host/include/g= eneric/host/atomic128-cas.h.inc index 990162c56f..8bf5f47768 100644 --- a/host/include/generic/host/atomic128-cas.h.inc +++ b/host/include/generic/host/atomic128-cas.h.inc @@ -34,39 +34,45 @@ static inline Int128 ATTRIBUTE_ATOMIC128_OPT atomic16_xchg(Int128 *ptr, Int128 new) { __int128_t *ptr_align =3D __builtin_assume_aligned(ptr, 16); - Int128 old =3D *ptr_align; + Int128Alias o, n; =20 - while (!__atomic_compare_exchange_n(ptr_align, &old, new, true, + n.s =3D new; + o.i =3D *ptr_align; + while (!__atomic_compare_exchange_n(ptr_align, &o.i, n.i, true, __ATOMIC_SEQ_CST, 0)) { continue; } - return old; + return o.s; } =20 static inline Int128 ATTRIBUTE_ATOMIC128_OPT atomic16_fetch_and(Int128 *ptr, Int128 val) { __int128_t *ptr_align =3D __builtin_assume_aligned(ptr, 16); - Int128 old =3D *ptr_align; + Int128Alias o, v; =20 - while (!__atomic_compare_exchange_n(ptr_align, &old, old & val, true, + v.s =3D val; + o.i =3D *ptr_align; + while (!__atomic_compare_exchange_n(ptr_align, &o.i, o.i & v.i, true, __ATOMIC_SEQ_CST, 0)) { continue; } - return old; + return o.s; } =20 static inline Int128 ATTRIBUTE_ATOMIC128_OPT atomic16_fetch_or(Int128 *ptr, Int128 val) { __int128_t *ptr_align =3D __builtin_assume_aligned(ptr, 16); - Int128 old =3D *ptr_align; + Int128Alias o, v; =20 - while (!__atomic_compare_exchange_n(ptr_align, &old, old | val, true, + v.s =3D val; + o.i =3D *ptr_align; + while (!__atomic_compare_exchange_n(ptr_align, &o.i, o.i | v.i, true, __ATOMIC_SEQ_CST, 0)) { continue; } - return old; + return o.s; } # define HAVE_CMPXCHG128 1 #elif defined(CONFIG_CMPXCHG128) --=20 2.43.0 From nobody Sun Dec 14 06:42:53 2025 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=1764778591; cv=none; d=zohomail.com; s=zohoarc; b=W8+amvwMI4sKe7ENr1AF/cQMtar7viWg/6GCWcgzFqeRY2Xgt/5+zyeT+GqHbirLSqVU/UwFGOJHUc1VuiN8Y9X7ZWu6yLLKOVH7beLlsaoSkzLLgEgsluFV1q/G9DksbKHb8G2jEmpF4ZzkUm/NRQUa3RWxd3BmHrlpEMI1ZrA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764778591; h=Content-Type: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=YvyaXobpOlD4VPPpsmzEzKqRWugPD95os5lX5hk+NkE=; b=N4MTAHnGxbS7oHj/XFVIzdlN7NXq6RHkyCPn0EkY0XB8czMGU1OMFBz/srN4RnIODRIlAnxpxll+8Jz7w/Y3FLahYUxsIQ4hBzHAZrLXUtPr2N1ufNI3U+6SCm0u9lqfdzxJGMy/21CtJTS7pRaV1CU6OmkIfG760TR56/1Hmvw= 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 1764778585957726.256080794143; Wed, 3 Dec 2025 08:16:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQpVr-0004I2-Jp; Wed, 03 Dec 2025 11:15:31 -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 1vQpVp-0004Ha-HZ for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:29 -0500 Received: from mail-oa1-x35.google.com ([2001:4860:4864:20::35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQpVo-0006b1-2N for qemu-devel@nongnu.org; Wed, 03 Dec 2025 11:15:29 -0500 Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-3ec41466a30so961648fac.0 for ; Wed, 03 Dec 2025 08:15:27 -0800 (PST) Received: from stoup.. ([187.210.107.189]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3f0dca40d4dsm10141625fac.9.2025.12.03.08.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Dec 2025 08:15:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764778527; x=1765383327; 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=YvyaXobpOlD4VPPpsmzEzKqRWugPD95os5lX5hk+NkE=; b=JRqychwrFCyXXkQGqBvOe9MrxuCnZX5Rnd1l5KDcLXXzs+3eem78D3zxm9luJra96T rlYaSB4+BEcm3dULkfIAjUJO1r36EDCeOhI1TeBypcgF9nZqrjzW7K1R/K020Txnohdg FD2Tp1qSgtkdRoOqjhoqeRkZ8wkAFtoo6B+QLYFYoGZX3mXPUBN3fkRVQEJzQZ4Bp6l2 BM8GMLqYDsQtkShGdx5/y6l+WnI74sp7MmzE2uJtegYX+5haGR3jYU/rnuhZVaCOT8Mu zSmaUhEQ0TfApZWCYPlJUvEgfSz8CJgeHwIS8vaosi76nK4/YFMOHhkBLspwnj2y2RyG g4Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764778527; x=1765383327; 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=YvyaXobpOlD4VPPpsmzEzKqRWugPD95os5lX5hk+NkE=; b=a/MuBXT9w/qf7K/6b4NfHfO9i44r6qqaOAC6opLmmq5ptU0KiO+PT9MQ3zkV9WIXzt X0ZWeYaLYKIE2DIHuYZeKgRNQMvBG1NdEXRUnoRbFDfgXJLJd/wohsZvvleWRxFNaGBA B3iOm3MJdi/MocHl+qJr4uT5PXmHjDm2+2w4CtEoY0TSkLrItkWsOizUU0nfMEc3r/5A +p4gA30Ykmzm04wyWxIYhV7q28NI0HEEG378JO1UdUhyK7AfX38AbWjf+IbVbzYPk7i9 PPMasiAYlBtGbB7PeqlLPHEjp/HFOGEO29FMGY1E+5J3hA7vBrqTtrIeLsIlqS4G4FPc OE3A== X-Gm-Message-State: AOJu0YwZ8tq7AOvhkePsPdRmxSRyFo7GzSV1HXpuX3Q3p5UiU3gIVO92 AFkzPn+t00FwLOAIbrXlksOAQOpH0rnsQXbYlKlQ/OcubU+Qq/0Bu0plHua83GYNMAn9Odxl8BT OOZisLDc= X-Gm-Gg: ASbGncsN4nYcUnEOd1XbF4rU7huyNegazD3cTi0RvUhEWtyt1WsvMfjexs8b7C+OsUD 480TyKk2ZaYvOIgnZT6KNynWqZocQS786CHNcEpU55ESrWQGNqu1fLKEmkaUOr6H8GHaRO7WJSM uY8et9Ft79QIJm3Lr8s15qFIBWxwqguzPUrnp84LR95lViWlAbUAj2BPjRolRk+E+WGY00HXEbf JgzPrQAjpiOmxgJ0NfP+HP7XlrePQuAUcwmayZ+BAc0j8Bok5uZ6cRUy27l02tCBM2Qqj6x0WPm cvpVR38BGfs+vhMFqFn1Mgq1HoAmZHmK1AK2gjpMcSJHhMe3CkeVhoWce89hXYFMZgkb1Flk0v3 XyRIMRXslvvIIeGwJoiuexMSka3y0PrEBxgGUjnKHrEH2MXzZ/sr+LiW8DQJ84n4qhg0hr/eMlq i8kDDj/JmMbMqg764m8w== X-Google-Smtp-Source: AGHT+IFDrRm6yKEj+7k60YOBMefIUVNVnSXFcBfwOqLJu8OCdkSdcL91EHvuqD8SJNQDE2kHr7o2Xg== X-Received: by 2002:a05:687c:2e10:b0:3ec:2fc8:979a with SMTP id 586e51a60fabf-3f16830a631mr1343021fac.19.1764778507433; Wed, 03 Dec 2025 08:15:07 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v3 6/6] include/aarch64/host: Fix atomic16_fetch_{and,or} Date: Wed, 3 Dec 2025 08:14:59 -0800 Message-ID: <20251203161500.501084-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251203161500.501084-1-richard.henderson@linaro.org> References: <20251203161500.501084-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 client-ip=2001:4860:4864:20::35; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x35.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1764778596588019200 The tmp[lh] variables were defined as inputs to the asm rather than outputs, which meant that the compiler rightly diagnosed uninitialized inputs. Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- host/include/aarch64/host/atomic128-cas.h.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/host/include/aarch64/host/atomic128-cas.h.inc b/host/include/a= arch64/host/atomic128-cas.h.inc index aec27df182..52e98a0bdd 100644 --- a/host/include/aarch64/host/atomic128-cas.h.inc +++ b/host/include/aarch64/host/atomic128-cas.h.inc @@ -67,9 +67,9 @@ static inline Int128 atomic16_fetch_and(Int128 *ptr, Int1= 28 new) "stlxp %w[tmp], %[tmpl], %[tmph], %[mem]\n\t" "cbnz %w[tmp], 0b" : [mem] "+m"(*ptr), [tmp] "=3D&r"(tmp), - [oldl] "=3D&r"(oldl), [oldh] "=3D&r"(oldh) - : [newl] "r"(newl), [newh] "r"(newh), - [tmpl] "r"(tmpl), [tmph] "r"(tmph) + [oldl] "=3D&r"(oldl), [oldh] "=3D&r"(oldh), + [tmpl] "=3D&r"(tmpl), [tmph] "=3D&r"(tmph) + : [newl] "r"(newl), [newh] "r"(newh) : "memory"); =20 return int128_make128(oldl, oldh); @@ -87,9 +87,9 @@ static inline Int128 atomic16_fetch_or(Int128 *ptr, Int12= 8 new) "stlxp %w[tmp], %[tmpl], %[tmph], %[mem]\n\t" "cbnz %w[tmp], 0b" : [mem] "+m"(*ptr), [tmp] "=3D&r"(tmp), - [oldl] "=3D&r"(oldl), [oldh] "=3D&r"(oldh) - : [newl] "r"(newl), [newh] "r"(newh), - [tmpl] "r"(tmpl), [tmph] "r"(tmph) + [oldl] "=3D&r"(oldl), [oldh] "=3D&r"(oldh), + [tmpl] "=3D&r"(tmpl), [tmph] "=3D&r"(tmph) + : [newl] "r"(newl), [newh] "r"(newh) : "memory"); =20 return int128_make128(oldl, oldh); --=20 2.43.0