From nobody Mon Feb 9 13:29:12 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=1764951649; cv=none; d=zohomail.com; s=zohoarc; b=XZoiTLnkKPB6paxPHshXUokKbhHQD/R1uL6j8YGWjANH7vvrgc9ymNiWbAG6oU115ZMd8ZfDm2NMwgjm+pp9RdfoHT172jmNTTAbldcS2ZxpODy5VoaZ8kzUD4zaUNy87uVTCalvTudtLEcjr0AhqSkK9hlc+pCge2IPWa98PUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764951649; 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=BdIlsi0gJEHOseBXWtnQc3B3kgBfFxOYQ86yS2xgzgU=; b=dQe/0shJiKb8Iu2nC9s6TlisR4BTejjgeG1ypQa5XkaLbC1fYLs8kmtb4C/gh0G7vGsx8BnkARr6tC1vnnwuz9JDKiN/c3TflivJ4a+IFP4ZbdD22xM4teI6Z3TJGXmliFP8sCg2m6rPWSIN2bhAskHvhvV9Q3z8NUX+RpxOavU= 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 17649516491731016.3998312173783; Fri, 5 Dec 2025 08:20:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vRYXc-00047R-4i; Fri, 05 Dec 2025 11:20:20 -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 1vRYXZ-00046a-L7 for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:17 -0500 Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vRYXX-0001YD-IZ for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:17 -0500 Received: by mail-qv1-xf2c.google.com with SMTP id 6a1803df08f44-8823d5127daso21518916d6.0 for ; Fri, 05 Dec 2025 08:20:15 -0800 (PST) Received: from stoup.. ([172.56.17.137]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-88830bfc22dsm21591636d6.43.2025.12.05.08.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 08:20:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764951614; x=1765556414; 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=BdIlsi0gJEHOseBXWtnQc3B3kgBfFxOYQ86yS2xgzgU=; b=bV907L/s4hMCAY++IXTo3PUEKZ05OYyqqY5FRQKZ/W+kCa5cNwdlDcB7r9Kfu/eHEx ZmQil7DsfsogmUb1mEYLPTO77vtlHD3G00aWtRVWL5lelP4L03Tli8gZf/2jxZuILJp7 dfnCxyYaS3egrV3JvQKuBncmi0wGH2NjzTUwHfrmTGrIWUv0Z2P2lvUegOCMmt5ZBO/G bUFlsz3xZBglBmX1acamNmAwYTDC1FFDqYp17Zb5C7b8uAmNiW8QT9NUkMsWn06ngjnw eJFhyVxw7evuJllX8uV2aAJdQoGzU1nja0X2DKs/mjynTIFRGACHjDxgJwd1oFv/Jww6 UZNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764951614; x=1765556414; 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=BdIlsi0gJEHOseBXWtnQc3B3kgBfFxOYQ86yS2xgzgU=; b=eArPbFy+0hN2qhsP3itodMtD6F777Nqivqk80nfitJl9QLOoEIafajCbf1IwCI5Oxu YKD63RUih4eoKCpI83444VLyXQ1is3nq/8h4If7l+BdlrZsAFzobnUng5ZpTYJmgVrus EwQf69RdWrNfZAFrdApE9vQdlsX+y2u4qGjxAo+Cvm9KVfK/Wfan8SXObmTDA2j2zzMp ovt0o2KRCIJoKo48LIOWwanUdHxeLyXTDXj6oCOpKWEeWCQCrxzPpBtdzU+lTATZJKyW Vz0iB30N/h1DDlJi94bwcSblnw9Tucifph3y/dfrl8A33nMO1d+hrrZKK4W51nq3o5Bf Y0Fw== X-Gm-Message-State: AOJu0YwHMAB6kLbvIJQr+ntnvCU68N0P8F+rxO6gW1+dN8TY4Yj50H72 8DiIphFG1eknm2TDHN9FeXvKWti4eDD+jdncecvM3BkXRBhudyr0uyjBWpTgtZI42h13t3jyI8i 929D2Qo0= X-Gm-Gg: ASbGncszbf+oum7SwuT92AF5X2/5LiK1il04c1RKM1eA09HzLRETVUWFnGY8bNgfoY2 T1RMoHAgwidXIgfv41QZPa9MJ3JQYNVwHaV8OKVsQHSZpX8oKLs2obkVmGQRtyZiaLiA9iI6pA6 Nz5wZLNie4mvo4Dx4yZXs4C3lHQ9/B0IvX2p9/fumNW54eRPKOcVfF0Rr9OaNzPdDQxQtkBy0RQ PiFQ8ZTg1WU2FQ8O96HTcSKu2Kek+0l6Cn3YeLWX/b5TF78pF5zRENxwcSdIV3ql1Jom6Gx9iCk YotGFl7maC1eaOtOueiblg2fJJufyalONKVZMXNY+zJJ/PSNFKbuHuBGWwky7CJK9mHdbamrEQQ iEAYtUENVH7iPHzpcC2NlcOqrtX/G/ZWUHKqBF23JDIoK5ZpObDso49TAcMPUFqJbkXUl2YakBV sKoTp/1nsPFINbei3/hjB8EOp+pKORbF2QZhVjVwuuFR7UD9hkFaexwuShnYA/OO0q+QY= X-Google-Smtp-Source: AGHT+IGDM8KUNczLZpi9eSvyGLWG5hV58NoR7868Y4VTA193WQGmrNo2EBJi8tMY8oTo7RaV5I7lbQ== X-Received: by 2002:a05:6214:4343:b0:880:d580:de2d with SMTP id 6a1803df08f44-888194a69e1mr147888376d6.21.1764951614442; Fri, 05 Dec 2025 08:20:14 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PULL 1/6] tcg: Zero extend 32-bit addresses for TCI Date: Fri, 5 Dec 2025 10:20:02 -0600 Message-ID: <20251205162007.26405-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251205162007.26405-1-richard.henderson@linaro.org> References: <20251205162007.26405-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=2607:f8b0:4864:20::f2c; envelope-from=richard.henderson@linaro.org; helo=mail-qv1-xf2c.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: 1764951650463019200 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 Mon Feb 9 13:29:12 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=1764951648; cv=none; d=zohomail.com; s=zohoarc; b=LGVZyr7UJK6dcOg7ICdhZzLd9ZylfF3pwb9J2gpbRYv1m/1UhUzqt0kGtquUo37hUWssTdCN9WmK46xM5c18ImqnHfN1fTeovmaeJfoUDZR8wxcyD8lS0iDx5A0ye4qqIMMlhPiDy82I1UACCHE/Y1T4tmHAg643WVD/vQnsdRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764951648; 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=6fPJsTPDa10TALVbynk3C88yXdX6ZHPLfRrmJzOfuL4=; b=YZdZDX0Nj0+Tg5qmuy2SSspfFZ6wxuhYn1x3QGPA7bog3oKOPPnXg9YNdRsXu7gYQyr4wnBajffghcyC9s5Acj+VzN5YC7pW0w0u+D99pXoYg++hFBcA3FBqdWB8e4tdq3a+NhjfvvhpE37MoBghaJlNv6K/Wbt02GSSTNG6XBM= 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 176495164886121.470390789494672; Fri, 5 Dec 2025 08:20:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vRYXd-00048c-SY; Fri, 05 Dec 2025 11:20:21 -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 1vRYXb-00047G-LN for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:19 -0500 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vRYXZ-0001YZ-QK for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:19 -0500 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-8b2d32b9777so299226985a.2 for ; Fri, 05 Dec 2025 08:20:17 -0800 (PST) Received: from stoup.. ([172.56.17.137]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-88830bfc22dsm21591636d6.43.2025.12.05.08.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 08:20:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764951616; x=1765556416; 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=6fPJsTPDa10TALVbynk3C88yXdX6ZHPLfRrmJzOfuL4=; b=OqpMyRuNRsXJ4HUztR8nP5RkZ/Nz5pG+ORFbc3bcn0jXBxlfccHzNJR0FiY5UVvrUU 5bdjLNN5YSET2xY+Y+GK+oG6Y/Ln+qNd10PvLYuqbmeyBe8oPM9QlbKMbzPMnIdPDmdx dG1/ENgt0nt9yZN+F/27BIV/CxcvUi1SC2J4gJMeBi0gL4jetpFz8nUicFyb93GAPPuo h1ebhITs0zZCM36+BgGqikuFcYV7+//HbQOjFjmi0DQt1ATNl+8+oyEmJjMC0e3oeWqv UK+my6zpPGQhNcynif5GUjURnxd6w0INYPlETvXE4IMQeELW/mtO4SxB7pxLKyYiZFAO 9nwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764951616; x=1765556416; 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=6fPJsTPDa10TALVbynk3C88yXdX6ZHPLfRrmJzOfuL4=; b=jf4Vp5uK9GbOteRyt9+EFWkP4CHhuQDL4IEIoMdklvYnM1q77UG2IPAtez3HFjDbGt KWF0kRyFRbEdxLATS0zj+Ots66HlZYdxGbh4HBvpv1aglz3TVlZPIePY9F76k20enlN9 L1CzzaGTwSBUO+/TAC23/6+XC4JQqjVWahyPlTdd1+DsyR8r+IQvIPz2EjFWiVdSf9sC dvCbZ3UaWSpF8RD/9e6vevd0BQu83LDB0pw8EWpoEkYbYH7wNqofHtfIop4sQpiNQXik +HwJ0tSK5e0Bi5ECOuKzixyPALdYY+NGiuGznkoQTObOdmOpR5vZKFuXa6USPZlXJldt jDTg== X-Gm-Message-State: AOJu0Ywmgv2/S+zyk9D6TD5AQe5sKQsuinJx7b1DX+4wjcPwQexNUJwI z47MhmP7UjvINTcnD07fOgulnRC7qYmdDDoAAR83XGFNKEd2HD287Xc7OjHVwlelH9DfnFpQi3U Xw7uWbi0= X-Gm-Gg: ASbGncuYyWjGpOzyqRzEYz5I29GAtBrRrAfkSI45ZyQxM8cjiwO7p7CsKbwrMEslbRc qEOtHKphBRi88iWjbgAWIoleH+72EDy7uxUGBns7AsSiyTCbdse/yZgVkpgdtSl81FJkVQPMLbz YTOMd+aE873QLF2Ynk92yhepg172l17+d5NtB5KFcFEJuMABN05C0VUIWQx26kwus1SkU+5hxHg 1HY0iKQgN+1lC2UHqBQSuCaRRVuZKbPbcQY41tWtvF478rwl3Vml1q8q6TPaXz8kIxRf8pdlJpO cLGLTQnMWcoN4S75IBcJRb8NLIl7do56TEHZHjIWx/BT2E1vIuEG3Ps0/e60+paEulb5gww69rs flAS85P075cpjCVDT/bTTKXnROTR6YNTZKh+1oPy2Zi3xgYph2aTwet4FMH2/oN+9ARTFs/Alzj 6qx6Wg4OU7e/3odzdDOLzfUJxFm6UahpjQ94RieLj1le9uKWGKDxrw+QJvyj0cSRWywTY= X-Google-Smtp-Source: AGHT+IFKIVk7fUDFXP8+57tmdLOf4bXxkzzOIlu8P+T33nzzIDk7LyYAwIjBFqyJvYCo6KrbLzlsEA== X-Received: by 2002:a05:620a:4142:b0:8b2:ea33:389d with SMTP id af79cd13be357-8b5e47ceff6mr1445515185a.4.1764951616273; Fri, 05 Dec 2025 08:20:16 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 2/6] tcg/tci: Introduce INDEX_op_tci_qemu_{ld,st}_rrr Date: Fri, 5 Dec 2025 10:20:03 -0600 Message-ID: <20251205162007.26405-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251205162007.26405-1-richard.henderson@linaro.org> References: <20251205162007.26405-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::736; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x736.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: 1764951650538019200 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- 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 Mon Feb 9 13:29:12 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=1764951692; cv=none; d=zohomail.com; s=zohoarc; b=YGd03OPHSX/PpmfQDJkX7zG1dhLtLHAwXUUPLp7s5CbkleuWpXQIwz3JZWef8jl3AvsjqCy0+hBjzhox0ohzVAVcrtvNDVRSbrKwzKfwWhcSlgS5JOUOjeMZGCbXT/9iYh6LI5Qez7IPgmDBQqKe6HrYUun0UitGe8CfIBU4+ig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764951692; 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=/nI2B3s4qT59VpUOR5FSRRVjE02qzSIL1d1ObsWlt6A=; b=iV47gI+YFrFeZQZryqD4sMa+NUTDBJJBte41eiQzP1s6K26eorod1cYatjFVABPMNm126hIWNwBscXrQIxxSt/ZOEl4uM2Du2Agy7Fp86rcHF9+l2a20OCaQ88jFyiRFrX7dxW2RpbWhvMhoK+emm3aa0/VFInIH3pveZG7d/jk= 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 1764951692096382.1656095792383; Fri, 5 Dec 2025 08:21:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vRYXf-00049S-NI; Fri, 05 Dec 2025 11:20:23 -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 1vRYXc-00048K-Tr for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:21 -0500 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vRYXb-0001ZD-Dc for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:20 -0500 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-88054872394so30694576d6.1 for ; Fri, 05 Dec 2025 08:20:18 -0800 (PST) Received: from stoup.. ([172.56.17.137]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-88830bfc22dsm21591636d6.43.2025.12.05.08.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 08:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764951618; x=1765556418; 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=/nI2B3s4qT59VpUOR5FSRRVjE02qzSIL1d1ObsWlt6A=; b=y8EyGcKFASJmGbttmqpv8PILSTKXbhFApK1eaLv/MFZMBPxtuDwbeTiz0VXt2mubo2 omFzeO18C/DZgnwBAWydBgw6tuhD5RweMG2Zh4WqhApyYa/HEp9ToBBoWN4ZXNBGHSts IcCSGnwlY80ZcsUt/PfaKgLAe48ICv4WvhrRTQ1ZDCk2MVUf7CZ8mATwW1E9GIRV3sw9 wuRXZslaJ2+HVsEfdqwrqs51CUfNxORIP9pkNlA0sJjZPhtWHP7t1DSxVOGUTHe6qHnr PMrVquMXIfzbCIWqfAFkCEB2x7yYhrSa9oym+kdr7IQngHDwpCMp/gqjKTxzrswfgW2T +DKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764951618; x=1765556418; 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=/nI2B3s4qT59VpUOR5FSRRVjE02qzSIL1d1ObsWlt6A=; b=KBWkWcaaKkJk2O+IZHMiB4Cm2P4DTK3H5IAZlvDP9MetrS9Ms42eFNwr9vOh2fIePJ WmnaK+kcum+vGLsOmumwbBuq9jQBMh1C1HeIKniUJalWdm/V+K5+tBIaneP+AjWv2R0W aoex48zorO+6z1K/UAmqb0ltw/lou2C4C9uUvhJTfsVThFamkDSGSbtoLmNhRxUE8Sb9 2WLXO+Is7lt4PbCB9mI1TcC7RhR5IN5GW4P1FXjWBboY45TF1R7B8R7XcPhZmVbDv/fO azCyPG+r0v6teUXq2CljWxKJ00ZSKlo5m9M5o42GjVmm14IbpnopbVS/g9UtlN0AKsUn ADzQ== X-Gm-Message-State: AOJu0YyPoTEjbu3NNFzqHRqWq7TZNuUISr/qiNMyU2bBo4vEGkTAaMbR F4FLMwUSpXqWhaQGpE6utrafNeAB/v7R77NWwir0LzPsco/kFqvIYDLUnUzoBCt9S8CJaFc2XOP hqAFepUQ= X-Gm-Gg: ASbGnctndcXOJYzPtfRqNJyCv25rnANu1VAKK25BlZuSyoAln03yCUumpseZalps4OS gEy+uiudXO+FxLJaJc5yvdP2PmvIPzZHyPhO4u0pRwwge8NbZfksoyUbsoFhUGUhK2JJvd7ftS7 wZc0K1B0Y8k+mwadWx64iYY19+moganoaBmKVLwkuLoI7RUrvXvx+QScwPGsiFG61mild0rYW8q qGhLUAK2NPZmJX174H68KADpzFFwMT7UJamhxHfuxBffr44Fw4KhwRQlJmYdQeBSomgoUsa/3sl XXlMwqZNl+h4xlY2bdT2+Uw8tJkup+CCG6phlx9rLQyt9gABHGgr0mRCo922/9keNKyBK2Ber0c LFbR332k/bOvmyrmZyNtrw4N/zFgafKmckwRn7FhD3ZNoyuIKV27jtrrV6m+nCl1lE8vgUd3mK5 N/xk4TPnLh6Q2cQAoXeN7McQHif/AoGmhmhzwHpUZBezcMvGCnJSXuPXstLS/OEqeKfiM= X-Google-Smtp-Source: AGHT+IEQDTUOKxKQk7NQnZzYRSUnjmwBbBjDzT9L0O0GyBxC1K6eT3IQJubUE9ZDyVTldx8F/2KBUw== X-Received: by 2002:a05:6214:2308:b0:880:51f0:5b93 with SMTP id 6a1803df08f44-888194e9285mr148621316d6.18.1764951618159; Fri, 05 Dec 2025 08:20:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 3/6] tcg: Remove duplicate test from plugin_gen_mem_callbacks Date: Fri, 5 Dec 2025 10:20:04 -0600 Message-ID: <20251205162007.26405-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251205162007.26405-1-richard.henderson@linaro.org> References: <20251205162007.26405-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::f30; envelope-from=richard.henderson@linaro.org; helo=mail-qv1-xf30.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: 1764951692723019200 All callers have already tested tcg_ctx->plugin_insn. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- 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 Mon Feb 9 13:29:12 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=1764951659; cv=none; d=zohomail.com; s=zohoarc; b=Uh7OkfCPjCwO+humiEz9z+KG30lorJPzCOhPiXDDIkk97JgxHwILmflodo2vD/lxq7xu47rcnZQUs9YBcsdyqZGmmDZTywZqt7TV7wdC+kMldO/ZuS1ftRBFl5zhCVhRZ495XXZ3xmVX6N7KdsHfJYzKTeXvSmlOFO5GzcYvz0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764951659; 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=IopA0wdhUDZuqTwawVtAEVCBYq9WXZhmde4vE8cm1yo=; b=Bhc6Vh+iL/1UTYqKQKdWQxbYZkq73CBQi/wyO1VdItxKSWRaEigMrVGchZW0lov0MPF22cmQGF1COe7edotvDdwgNaHEtw5cvgZL61xx5Cc0Jd3ZDsTkTUP6flQWIEUn1gjBsBMsr56wLolWF7wv+aQdR6jncyeUf8PHQ9/1+Qg= 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 1764951659081376.0186421005362; Fri, 5 Dec 2025 08:20:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vRYXg-00049m-F9; Fri, 05 Dec 2025 11:20:24 -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 1vRYXe-00048w-JN for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:22 -0500 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vRYXd-0001Zk-33 for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:22 -0500 Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-8b2aa1ae006so286520985a.2 for ; Fri, 05 Dec 2025 08:20:20 -0800 (PST) Received: from stoup.. ([172.56.17.137]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-88830bfc22dsm21591636d6.43.2025.12.05.08.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 08:20:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764951620; x=1765556420; 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=IopA0wdhUDZuqTwawVtAEVCBYq9WXZhmde4vE8cm1yo=; b=fb0hFsOmbK/wVc9P0r+UK+/nAoBjPvgM9XzZBdMS5FEQfJjJ1SeiRNvyCsGwAkgvKH H+lnzfhjVO/4pMZfIn1wwUgf8QDujiOEvF0ud7bErJkEm64lpzBBw45UbmJaNpaEgKOa bsK3MUQi+3STguDMFiybc1L2zInSCTXMFBhTOs8roXijTeQzvqQst6VgBIS6YDOqV5h8 JmV0cIAoFu7FfxcEGlAXLkGp6MDqz3kq15/Fpp4zCyAkrgs9R1A7eGsohHRCc99HnZLm A8qkhMUxacCozW5/byo7JsbWDh6wuW0SMLyodgH4ovNj18VePF+zNYXFbdpwyYX78Qh1 inIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764951620; x=1765556420; 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=IopA0wdhUDZuqTwawVtAEVCBYq9WXZhmde4vE8cm1yo=; b=YLCKOSoBvFmVxHu+0mYd5IsGkwBAWgi3VN+LeMzr4Y9CYvRSPTodCDuzzo+Xi/lOIK D/s3MoY/U7yplscZ+R93IYjnbrM6VNJoYPLDOUcZ1GAn+7g9pSmwQ9D0ZGxOO+AYJPzq 6Gta7RdoHJmU0ENiuLTAMre0t63Tn9BXFINcuQR0wIT3UAbhNfbsDtXNozdpvytzq0uc zV4kHV2fvDe4NY6uAQGe2UhJpvsrBV4t97Xj+Yd/aL5OKS58CXO5+BMXCdAlWeMoOlKa /8d4P/due86WYnLy+tU5w8EK5gzwXdKoZPCo2GuvzGISny8ZFZnk/7DwuEyMkOOpUDhx hYnQ== X-Gm-Message-State: AOJu0YwC1yYka/NrRcVWw0sdoRGMF+N5T36/Zoszgjs8g5p+1IadXADL tm28QrvFNJBptHOJvqjDfH8laXA5v2J07/O6jmNSAFMKfIatUI22/7JD23SeSTg6dVrNVMhqgPi M1vKIJn8= X-Gm-Gg: ASbGncsowuZPYWawmBhnzziCkCwbZxM0TjPbZqZ6bA24xhb4f4UexsdpscoGogagv1p 1rIIo7Kwq4deVKkFZD7/bvhOBfxAnAt/gXvRlPBBEIcgF/KpTaNS3v80XArpX/rhd0q4XCjvHUR XA4QSPLHA1llYzq9Kp4QRwpO7RGhdp+MtZosOaicTpfUL81N/VFBc7+i1YdZxOCgRUfAkXYDKG9 BH1QfWA8Yo8qHv6+w1GecvYZq+42elY5bJA7hfdHRfH3vUhZeDewhKcAMXdbLMRrm8Xg/FWmz5N 1YKOii+0aGc2KOeDy5OKNvYRKL6teUMV13SoUe9CSsBPlcoQasbswLHK/TNuFUo3ywyfY2oy/7F rQ+V9Mts+v6mu70cLlw0l6TtA8qvVUwOmhXiTSMuW8Z+1/2Lc2k9v6oYXQQkGaBsItihugr4pjp OhAs1+YG4Y5qGFejaxdlz3o51ZgTZ8/kVKZgm27c8rT04TWZKtM90i0ehbOxRVXw6zRQo= X-Google-Smtp-Source: AGHT+IE08JdSXB3wTbHctlp7ROToxfyOvJPyJUbRcO3XUT0rTCZK9EmqwQRbPBDFIP8FpctdCc1J4A== X-Received: by 2002:ac8:5fd2:0:b0:4ec:f156:883d with SMTP id d75a77b69052e-4f01769c538mr151784621cf.43.1764951619749; Fri, 05 Dec 2025 08:20:19 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 4/6] tcg/tci: Disable -Wundef FFI_GO_CLOSURES warning Date: Fri, 5 Dec 2025 10:20:05 -0600 Message-ID: <20251205162007.26405-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251205162007.26405-1-richard.henderson@linaro.org> References: <20251205162007.26405-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::734; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x734.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: 1764951660574019200 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- 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 Mon Feb 9 13:29:12 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=1764951668; cv=none; d=zohomail.com; s=zohoarc; b=gFe3KsnfUqtb+pW0xg0IFqMU3z37rH7E3JisZoklRBonGgQTDaLO58m095f/9EkC4+TFHu1bWByl64XFPe0oX1aMqcvpLEw05O/ZuxQCjfBLWdbjiRhyR7Jc4wXNUS4UoarYVYWKQT8EZxooIbBkWCdcAu05YNy9gbdDQqcz7V8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764951668; 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=zxTx6y/mG1lezUhEJHbhJmruSwFmmn0DwrC8QzGpVjk=; b=e5aNiUBIduQKn3BQ1Puk5vzqe5hyxdeZL3tUppDzJBuSjYgUKHLbPbYqqLRU+tpbUxZhAxUtnW4Wik5Q8duLQSqG7kshgnW2WMQuZFEJOjiKNmlVYiALOYFxEAF5qdKVSvk/OtsfGeabptMBUGOWEDPuUS2588pIFZxpIPTZE+Q= 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 1764951668891304.2409213722675; Fri, 5 Dec 2025 08:21:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vRYXj-0004AK-Db; Fri, 05 Dec 2025 11:20:27 -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 1vRYXh-0004A0-3p for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:25 -0500 Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vRYXf-0001a9-HL for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:24 -0500 Received: by mail-qv1-xf2c.google.com with SMTP id 6a1803df08f44-88267973e5cso12514756d6.3 for ; Fri, 05 Dec 2025 08:20:23 -0800 (PST) Received: from stoup.. ([172.56.17.137]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-88830bfc22dsm21591636d6.43.2025.12.05.08.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 08:20:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764951622; x=1765556422; 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=zxTx6y/mG1lezUhEJHbhJmruSwFmmn0DwrC8QzGpVjk=; b=RWG4xY6oDkOV4+i6kHa18dB4bFJg0njzs0jxTCdMiUfpN7iL1Qz/zCz5k7DwV64Zhv kbOh+Eu4q+Dh7rkZgwf7hfBWOVgOzbbR9QJdm1wH56LNgKsi+7szFYYA6h8WBHkFX/rH idHo0Zp6W35cUOFu4QP2phVm7k5nBgopBn3KDpCtXWy50fuE/DKyoretTRHKSmFMlUSH gyHlycng2SttKrfEn0iJvb+LgmHhR15evy+9uNHKBhuST2UrZUI49hGE20rsVSbLKBDx 3t6IGVcntPbeLtrhgKmqcD8Re1cmCEOelRno+JffSJoSrHfdmfI+VzgMkR7vf4ge9+7K k/3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764951622; x=1765556422; 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=zxTx6y/mG1lezUhEJHbhJmruSwFmmn0DwrC8QzGpVjk=; b=SbIiULwOPJyjsoyb1+ybx3ndVy04k1zNcuk1gPIin7/dh8yG2IuDy4yWdDzJ95BTRE KEdIQcW8CiWfTpOGkixnD2FfDNrVl/RnAuwgE1snvnSNNak9TDBb2PVNqo8Ykv10L55n Qj7EkjB+TlwPcvFyj/V0TbZhxxmmVScWwh7VREqvXIeOycvfuTLj3XJeljb0l/cXJCMQ DO/VjulhSK6aiROHwVcdsMTAcCNhYNUkJauTRpwHqd06K5T7NAedzTwUNB9+umnMiYq0 wEwhjpz1HC8YdRfaw14WD2L1XkRhUeJBjigJt0Gk5Cn/929vDsAi3pRFE9XQU04y+6J8 Ovcg== X-Gm-Message-State: AOJu0YxB+isuHwxctGjUK6YQIBJ+Onk/e5gRhJZ9pO50WtxoKfMcpgUA vEAHl7twY+c7C2ONo7lhGSx/j7o1E8JRZ9CEw4g3ab5M8PGewr5zCz8xeV3tFUz3xT/Fy9D4X9t 3N3SSvQo= X-Gm-Gg: ASbGncsR9DxNvidhOEolbo9NN3BI/6HnUtZEXMHZrtc6PL6bzbb8lnEHaHl2VOLw+LN euNhFSn3Ku71d54bPydT8kSa5YJcEjg8iXPUd6tj1Z5fbGHXbdq5fC+ZFXxrb38tzZ5EWOM38j1 UuDKnSqXS9umoyLlcJypaz3QvjcDMRGNYeda2NOnQ/bNsypsIBAGGYmTv+3VSKN/PIPzHk56nnk 8lp29FQLAIqpRzQzpDlHbEb5q5Kr8rFRzhcyXKhfaN3GEqhwPLgee0/7F14qwYb142YvIKs5thr JJXEVw/q0bhrzV4vJbufmrY8x1S9gUBwdX7peEZ+RJd9tv1b7g8l+NoMQ27z+RH8p2k/cavckWv SoK69Ee4TAId9/3/k5Yqig3qqk/R3Mvvz8TwMVVcScNPeOhSgVxsMrr11Zxyf2GmjWflwaSThIJ oIIW4u+FrYhoI2eX3Qqu0SVKC9xQMSsS9XIsDkmkMd3ACaPyXNMHcbPl928Y8OnG1BHwX3GZzMA YvNlw== X-Google-Smtp-Source: AGHT+IGgVrjcQXp4Z7KD1gH3r4lzIBgEJbmkk46fM4b2PrPLMnXoovFFBpcrk7egCBSL4DH7EBJ0NQ== X-Received: by 2002:a05:6214:3d0c:b0:880:621e:3b4a with SMTP id 6a1803df08f44-8882481d4edmr98073136d6.11.1764951621612; Fri, 05 Dec 2025 08:20:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 5/6] include/generic/host: Fix atomic128-cas.h.inc for Int128 structure Date: Fri, 5 Dec 2025 10:20:06 -0600 Message-ID: <20251205162007.26405-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251205162007.26405-1-richard.henderson@linaro.org> References: <20251205162007.26405-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::f2c; envelope-from=richard.henderson@linaro.org; helo=mail-qv1-xf2c.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: 1764951671461019200 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- 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 Mon Feb 9 13:29:12 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=1764951651; cv=none; d=zohomail.com; s=zohoarc; b=LZ/fPq/kGg0iP+zJFODnzzjZi7EdetohEGAKVcD9Ln7naCuBwRzFeobRXwdGOEctCssmmJXxPnpA6fO6BhEAPdODqauLLbX1KkyoMuTa+Prlllwjjj1j1m8eLg5O4y6j+BGhlr3dmfhI2BwJWtT+LlZcPBOU3EwHoT18JdCjdc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764951651; 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=MRpPqJDEzIzTix+d/OG3pbA9XcsjVrzyGrtBXlgNnII=; b=h0cLCrnX1SM9n6sUNpcNoxlVKrtte/9QruzZ2exrxT3xRBunlNmgnm92IwcC8yuX7+pKrl0Odr+x/mKkTdxR+FW727e8xxSSv8ld/pni3oHt9ncTYBNhcdIemFwCIo7cFFx32Loe3O3NiNPfBNEWbnqPxSnrdPGWPAMjOLlr+LE= 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 176495165107073.46314024703076; Fri, 5 Dec 2025 08:20:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vRYXl-0004BB-U9; Fri, 05 Dec 2025 11:20:29 -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 1vRYXl-0004Aq-2R for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:29 -0500 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vRYXi-0001ay-3S for qemu-devel@nongnu.org; Fri, 05 Dec 2025 11:20:28 -0500 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-88245cc8c92so15810816d6.0 for ; Fri, 05 Dec 2025 08:20:25 -0800 (PST) Received: from stoup.. ([172.56.17.137]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-88830bfc22dsm21591636d6.43.2025.12.05.08.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 08:20:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764951624; x=1765556424; 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=MRpPqJDEzIzTix+d/OG3pbA9XcsjVrzyGrtBXlgNnII=; b=lfaM16q66mG3PxYR/PdCQqbprqSKn+CZjw4Ea1uArO5cvU8cqGyrF1e4TITVF+Cmp1 i+UbIZLrFojSI7EV71OTCt5mpVhpyEaewJdglvTcu32XGfoyvA8mr429g3Ju6k3rctAp SW/I4RZvQgIX36tlX9rtJeGIz79K+mI0OJWfSXX8Hhjb2ktuyykIf+scrxWCz3rPDnWN VrDmwFmLjnJBL1PAnIHBADWixuHVG0QsoJCEUSPUk5O9uITrcORTDAT3Mb0m5R6O0z/T 8eqF3NadeiIBe97oM6RR8DQ3Qdug1O3u0O96Eqzqb4LItQ514G04zxTfFkLw3YZmZRTk WzQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764951624; x=1765556424; 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=MRpPqJDEzIzTix+d/OG3pbA9XcsjVrzyGrtBXlgNnII=; b=b1TzX6GpnwCxLieO4Z8l6sbRsrBMNeYzRoTuLQxGA+FRe8N+n9WRCy1E/4QM9NdoCc S1otGKIzLm+MAe1oifSrQR79PsovKDKx9DQ1PmIhKOvqyXryNX9TQTdf2cTc+axpPCtG AZ3wzD5UXmdebzN8YFryGcIgDpbrY/7C/GNb6u6x7qwifUOzX4IkH29r+QZVuBJqVLhB ShMaViMVkKgC8qvtFq3RTzKIhyL791gdUa5eHhpnsEnWSAbcCR2AMC0+4KIBhv38j8TE sffzhIVhsbHXRs6076Mh6Mh3kCVuELj2uRcUnPfP07xc1MrRBemUSxZqTagGtC1+jkSK 89Pg== X-Gm-Message-State: AOJu0Ywm79ObDlzICTycA8Qw6w84Ypk+KBsTM+XtO/nx283tZvT6YPLf 2RKTaxzlvq7fHAkZuGW7jidjdNDiVNHjbw8CNcvVkvAha8Rg6GHMQztVzpMjasapOmRq7DOXKti HXU5aKmM= X-Gm-Gg: ASbGnctsEw+R43rYVfmHbmXKgIQp6Bo2nXkS/la9d4sf9ve1TneHESekT+f7sIYVfYc SM26SrhQJmc/3+u0r5Dh2sig74ijYyJq7X7JmP2fW9Z+T3s5GTiKSmA0skk5t+wZnsFM6+g06FT Bl6tCenNFNDnBgOPS8r4M9AIkc1s2xL6b5NvSeNp5d1MVQA2NpQx0poJWSxMJ7q+2IHzrW9SWxv H45pvorWnVyS7jwLm1W89B4NXoRsLGzBCGFBHtxL/hguE+HjkXd0t6h7bzU/zZFbRLtVNPHtt+k yj3OGSVKYkokdUiX0MFUdDSARRSFlWjQq6Vu1cn0yEGra8A5/2DeEfAEpzbEjSoG3WBEv/lBnab XqMddXgu7DWczUP7haCrui+Av2kFgC7PrM3wSanjVlXBcGUxiYeJpW1I0C6iuCUFSreQALCH9hl b5UA0a6RrdUsMb2a9CO4j5iI5T+NrHUiarPKthAcT2MMuzsgWiNX8uumQzlRyYKXFOwC4= X-Google-Smtp-Source: AGHT+IG/cDHKXqM4TAo1WBgAvxpOThcGndumSrK6YrZxKxHh+vVY23lPO7tXOZ/JQQctsJs0ZF0V9Q== X-Received: by 2002:a05:6214:e61:b0:880:53da:fcbc with SMTP id 6a1803df08f44-8882481ca77mr109489916d6.7.1764951623604; Fri, 05 Dec 2025 08:20:23 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 6/6] include/aarch64/host: Fix atomic16_fetch_{and,or} Date: Fri, 5 Dec 2025 10:20:07 -0600 Message-ID: <20251205162007.26405-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251205162007.26405-1-richard.henderson@linaro.org> References: <20251205162007.26405-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::f34; envelope-from=richard.henderson@linaro.org; helo=mail-qv1-xf34.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: 1764951652330019200 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- 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