From nobody Sun Apr 12 05:51:25 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=1771961529; cv=none; d=zohomail.com; s=zohoarc; b=DedYlrbzPihmdRvwyhmgDGz4e9+zb63lZhUgw50wjoDPnDdieg185AxZ90GnNdxuie8DlINHXacq9jTx7RN0i4QkFhLiE3N81ihzTJqIcEbflqYkTIC1v6KM7nBpzAwMSBil1HFM6o2h9lPYH8TZIiXwu1Q0FHWlkw/9b1NFw9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771961529; 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=Wz4xwsVedpRdwPffxWHKLrRmmOeokKoi4JBBPga8kag=; b=jMjIry2V5/uZjiXHNKspVTuGJlOJZaW6sqkZ6xMBnZAq1pjMmSlJ69ZEuflKOQDGXKANtlArTde83R5iMR6bMUnEbUovBG5Ee28lqJkkW0PE7qoqL4TaKdp99B2syEpt2Zq8p+bKJSIt/zlHQDyzGym1Ov1wdu8bppuTH8cOLLg= 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 1771961529512697.5732426270865; Tue, 24 Feb 2026 11:32:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuy8Q-0002Zk-Ap; Tue, 24 Feb 2026 14:32:00 -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 1vuy7H-0001qL-Nv for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:31:07 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuy7D-0000ng-SP for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:30:43 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4806cc07ce7so56659575e9.1 for ; Tue, 24 Feb 2026 11:30:38 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483bd6f2f88sm20099555e9.2.2026.02.24.11.30.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 24 Feb 2026 11:30:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771961437; x=1772566237; 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=Wz4xwsVedpRdwPffxWHKLrRmmOeokKoi4JBBPga8kag=; b=C1Fh9JgEN/AxYmKQMXFKU3mjD+45t0qX29ozGLdjvYMIw7oHnL7ebBAeOLsMXz9V9p pC0eupxQmhv5631DkQE2Pqk0zUoaH8xSamQKoRxD9uKH11l7N0G+C+3xbzqA5hQ54Bbd EO+U0pxiPuDSKb55BwB167cXWrrWncz6c+IvxUEoFdIfyvcizgGwRE1E5FEt1rkKtZwh DmthWiXNrMjh+MSRVq7rIWOw3k8qv3Y38YcU8DVqj+VxrRbUVu1Y3wAFIs+5eqhf4Ptw 4Ny+CUYgaUL68x1AI7mni0Kx5S/HRYXhknGLlwbDWAROdoMg6kWDkcv1MT69g3CKIbK6 rMew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771961437; x=1772566237; 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=Wz4xwsVedpRdwPffxWHKLrRmmOeokKoi4JBBPga8kag=; b=jqP9yoOx+rWqfjL+nmQ90pBaSk0nW54wFSXt3iq/VVvRLwUlg3yDBo3/DzL/Sd38j4 r0OJziQ6DO+w/ua72Z5ZTxTT3IpNRoB1uc/XN6pl5X9qFXt0MpdsiQEhjGMhCgMaXwOZ 5Yu9NYXysn+g5IYP6FlokTxuPmkDytMw4aBqKj6Lxcn3Ru/cv74f68iS90Ei3F8XEkCs MMgVrMDQhdSkBg6iPQ+ojtR5sYoIZnlGpZw9dywC5KJKiaOH/FS2ywMUTGafR72IPmXy i6WTq//syjb9fuYKjsA7pg799eVkKVT/KlmhRZ2UVQaA9p5cPGvE9cj2uwr7bD3Fh0sE bUDg== X-Gm-Message-State: AOJu0YzV/uwuU4AkZHRAI9u4cnERK31elTwQiiRQA294/L0/hodv70eX 9y2FnG7ikIqfv+jZa5t1Wab2DXBwL4J2xn00hQEwsdiQozBsyCP4tMD838mWpo603dGeABt0D3k 17DhOsAo= X-Gm-Gg: AZuq6aJceL6Jzkk/ErIbnoHZQoKqXS58Y/jMga/PwrVyoxHk/gl/ERuwtdOE3oWNwEj 8MudTNY1vz3Jr/TGFNy8rwCX9CO5eJG6J1TmVMtZG0x6iADvCSNVB7pNpMH4VbiyVUbs9vTVkGz +VT2pNtdTUfp6F03qPMQohWLBRiUOJZXww4lsLNj2GVx9HRJ9pYOvCQMky2Qsdne+WGosQdVDsU 58pV7f+OVyFfvbl4DWgPFDLFxEHO7G1iZcYP+FPA79N5/oojBo0rmtVbVzcouOSIIm7TYhKNXGv O0JctbKXbdIbbxShilabRljoMwxrccfojhxb2VlNnuFcDF7b+4KEAlnUgMN5eSNiodqyfbTsCOu XFvkCmd3LWMQlvYoDcqmnxQ+iN8JK9NXWeJM+YChxhCxQ1/aV2vTDlL7V4e/f1NW3gFnxtSzCyX pZFaRROt90G/rquN7qN9wJVrolYz/mctvsvn5i2iXxgauYMLrkRAimhDGgqkUyMIG1Cq574aCI X-Received: by 2002:a05:600c:821b:b0:483:71f7:2794 with SMTP id 5b1f17b1804b1-483a95c9e73mr240437805e9.15.1771961437464; Tue, 24 Feb 2026 11:30:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Pierrick Bouvier , Paolo Bonzini , qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [RFC PATCH 1/5] target/tcg: Rename bitswap() helpers Date: Tue, 24 Feb 2026 20:30:23 +0100 Message-ID: <20260224193028.2370-2-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260224193028.2370-1-philmd@linaro.org> References: <20260224193028.2370-1-philmd@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=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771961530952158500 In order to avoid symbol name clash when building a single binary, rename TCG helpers prefixing with the target name. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Brian Cain Reviewed-by: Pierrick Bouvier --- target/loongarch/tcg/helper.h | 2 +- target/mips/helper.h | 2 +- target/loongarch/tcg/op_helper.c | 2 +- target/mips/tcg/op_helper.c | 2 +- target/mips/tcg/translate.c | 2 +- target/loongarch/tcg/insn_trans/trans_bit.c.inc | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/loongarch/tcg/helper.h b/target/loongarch/tcg/helper.h index 8a6c62f1161..e36dd2f5de3 100644 --- a/target/loongarch/tcg/helper.h +++ b/target/loongarch/tcg/helper.h @@ -7,7 +7,7 @@ DEF_HELPER_2(raise_exception, noreturn, env, i32) =20 DEF_HELPER_FLAGS_1(bitrev_w, TCG_CALL_NO_RWG_SE, tl, tl) DEF_HELPER_FLAGS_1(bitrev_d, TCG_CALL_NO_RWG_SE, tl, tl) -DEF_HELPER_FLAGS_1(bitswap, TCG_CALL_NO_RWG_SE, tl, tl) +DEF_HELPER_FLAGS_1(loongarch_bitswap, TCG_CALL_NO_RWG_SE, tl, tl) =20 DEF_HELPER_FLAGS_3(asrtle_d, TCG_CALL_NO_WG, void, env, tl, tl) DEF_HELPER_FLAGS_3(asrtgt_d, TCG_CALL_NO_WG, void, env, tl, tl) diff --git a/target/mips/helper.h b/target/mips/helper.h index b6cd53c8538..1c9f76f0c9c 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -16,7 +16,7 @@ DEF_HELPER_3(lld, tl, env, tl, int) #endif #endif =20 -DEF_HELPER_FLAGS_1(bitswap, TCG_CALL_NO_RWG_SE, tl, tl) +DEF_HELPER_FLAGS_1(mips_bitswap, TCG_CALL_NO_RWG_SE, tl, tl) #ifdef TARGET_MIPS64 DEF_HELPER_FLAGS_1(dbitswap, TCG_CALL_NO_RWG_SE, tl, tl) #endif diff --git a/target/loongarch/tcg/op_helper.c b/target/loongarch/tcg/op_hel= per.c index 16ac0d43bc9..6b4fe535300 100644 --- a/target/loongarch/tcg/op_helper.c +++ b/target/loongarch/tcg/op_helper.c @@ -32,7 +32,7 @@ target_ulong helper_bitrev_d(target_ulong rj) return revbit64(rj); } =20 -target_ulong helper_bitswap(target_ulong v) +target_ulong helper_loongarch_bitswap(target_ulong v) { v =3D ((v >> 1) & (target_ulong)0x5555555555555555ULL) | ((v & (target_ulong)0x5555555555555555ULL) << 1); diff --git a/target/mips/tcg/op_helper.c b/target/mips/tcg/op_helper.c index 4502ae2b5be..83c340e38e0 100644 --- a/target/mips/tcg/op_helper.c +++ b/target/mips/tcg/op_helper.c @@ -45,7 +45,7 @@ target_ulong helper_dbitswap(target_ulong rt) } #endif =20 -target_ulong helper_bitswap(target_ulong rt) +target_ulong helper_mips_bitswap(target_ulong rt) { return (int32_t)bitswap(rt); } diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 54849e9ff1a..a63aa67808e 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -4839,7 +4839,7 @@ static void gen_bitswap(DisasContext *ctx, int opc, i= nt rd, int rt) gen_load_gpr(t0, rt); switch (opc) { case OPC_BITSWAP: - gen_helper_bitswap(cpu_gpr[rd], t0); + gen_helper_mips_bitswap(cpu_gpr[rd], t0); break; #if defined(TARGET_MIPS64) case OPC_DBITSWAP: diff --git a/target/loongarch/tcg/insn_trans/trans_bit.c.inc b/target/loong= arch/tcg/insn_trans/trans_bit.c.inc index ee5fa003ce0..76d6ba742d5 100644 --- a/target/loongarch/tcg/insn_trans/trans_bit.c.inc +++ b/target/loongarch/tcg/insn_trans/trans_bit.c.inc @@ -194,8 +194,8 @@ TRANS(revb_2w, 64, gen_rr, EXT_NONE, EXT_NONE, gen_revb= _2w) TRANS(revb_d, 64, gen_rr, EXT_NONE, EXT_NONE, tcg_gen_bswap64_i64) TRANS(revh_2w, 64, gen_rr, EXT_NONE, EXT_NONE, gen_revh_2w) TRANS(revh_d, 64, gen_rr, EXT_NONE, EXT_NONE, gen_revh_d) -TRANS(bitrev_4b, ALL, gen_rr, EXT_ZERO, EXT_SIGN, gen_helper_bitswap) -TRANS(bitrev_8b, 64, gen_rr, EXT_NONE, EXT_NONE, gen_helper_bitswap) +TRANS(bitrev_4b, ALL, gen_rr, EXT_ZERO, EXT_SIGN, gen_helper_loongarch_bit= swap) +TRANS(bitrev_8b, 64, gen_rr, EXT_NONE, EXT_NONE, gen_helper_loongarch_bits= wap) TRANS(bitrev_w, ALL, gen_rr, EXT_NONE, EXT_SIGN, gen_helper_bitrev_w) TRANS(bitrev_d, 64, gen_rr, EXT_NONE, EXT_NONE, gen_helper_bitrev_d) TRANS(maskeqz, ALL, gen_rrr, EXT_NONE, EXT_NONE, EXT_NONE, gen_maskeqz) --=20 2.52.0 From nobody Sun Apr 12 05:51:25 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=1771961529; cv=none; d=zohomail.com; s=zohoarc; b=FGXijkZp4angS/Wyf9a8hOiW7WCUzMzE4io0vqWsayIqPsE1lv0N5BR9YUNOUSOChIjPr5GuluWlgZOOM01yX/nl36W85mhIeaMVA7GUjzjONu8ge//g7AiEo+GesB8X17L9WgMFaQXu6bNm1QFacj3OfXyGoUZ7arphW8sbQlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771961529; 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=ChlHn875Dvv2jy+w+z550jf4WHfHLtbl/BnX8u6SJxg=; b=QGrYCXNyZtoR2D/KDhyKrBy+nq3a7zkNr1vpvkP+8m4NnhFpOAMXX3zi2FZ9janP/hEngmboKgopiaBEjj83IVGWZcgyRjnBoNTP8mfo9QxVfaj63uodIga427J/74MBsXDM97mj89STa1RUaPM6QkmuZ5PYPbKao0OPB2x1PtQ= 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 1771961529219847.2038256263323; Tue, 24 Feb 2026 11:32:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuy84-0002Ir-UQ; Tue, 24 Feb 2026 14:31:33 -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 1vuy7R-0001s8-7i for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:31:09 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuy7N-0000oP-9i for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:30:52 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48372efa020so47452995e9.2 for ; Tue, 24 Feb 2026 11:30:46 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483bd6f2f88sm20104885e9.2.2026.02.24.11.30.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 24 Feb 2026 11:30:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771961445; x=1772566245; 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=ChlHn875Dvv2jy+w+z550jf4WHfHLtbl/BnX8u6SJxg=; b=kakVuhwSMpp9SI+tSfJZSkfy0NNJ1QRSqDi4v2oTEInD0FotqcqsFaFbJSINfUVSwl DGU9S2Cs1V9KZXByUUXzmn3dIWI0+OODEPopFfsC54/wDIJOLyW86j4XWB7EpYfK2PLd lXoNf/XFo9zSmKw6erAqjg9vet1lFxY29UevGarsVS3bSr89OJ16Nf7ru79PQuLnyNpV DKoEsC73hfdsLB/M35KkUmIOuu6hnwsywn63qFFCGEg6YQUExhJrtharoApwX4dEavtf hWuYXK+uPth3UJJ/ATAFxHqzPfqOkQMqZbDH2RImC8zt8cDnIp4DB5VxCZQsz5REDaa/ rYog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771961445; x=1772566245; 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=ChlHn875Dvv2jy+w+z550jf4WHfHLtbl/BnX8u6SJxg=; b=auWKQ3W3uDswMH3loByhqFv59pQLn7ep712VeCpi3jiju/gAvho3QzLt+/6jgYXLzv TBuMwn6LCzGQPB3LXmtGg8qVy24sL+SYXvRFW67AJJZLFc1OE8Ld2i1I/eOmmV3Ihziu wVzyZEEmkOWHWhzD/QDCgQalOLvSZkMz2FNDHedhhDJ+ZMktfcCBzNs2m1JY9MiRkHWa tglASpiiFbMePWU/ERAei4wmgzCIswHqx93gzxrGUwB0FfNkBIDtm5sAsDeXrpdrayNd oyq1RGnHZE66vUbz9e/68XwyZp+f1ZkUapZpDDYwySunvnr9vyQwnTHUorJxD+ebgZcG J1WQ== X-Gm-Message-State: AOJu0YwCnYFH5tRPapsJ6GaxMsV6DAF8vDrcf4dhlREOsWfrLavR9Cch VfhzGsmbBAACJu6ah2FecNtf6mRrsluvWuwnmpAne5GkM/ykSEGyjcFOMboF000PrC+SzPtePY7 do1ngXUk= X-Gm-Gg: AZuq6aLAC2lK7UPWAuoELz9ew9CnBeNDx2iSB7F6eluIiLXGWZmQn9dUFw+LjPi5VIq SHkXkokDwZKUdpbjxjq/Cr50ftFZdUkjzkrkK2LA1+dlgTv4UCWY6pV939OtK9PjdEmPDvYRHRT WstWeFQjzy0PYdlEua1L57dRaKOJQuuE2OBkBqZAGf18J7EJRZWoOBYDeWAt+CP8hNIiyqsksEL WVP5eDUY8bI0Yvqtr5t+zjE5eRY6gi9uen4rrSFosZFTBm4Vvh6KDGj8ouHJ4PQASWX53BAt4xJ Hev1Q4nzjRBta2+GZsXqPqCYKSWff+b71sARGUvu/xzh7hGxgzbq1su58ijsqTyIhybbRlEaijJ OgRsSZ07UtNXW7GWs2I8qEALdo9ev7WbLO0bkAATVb3ABjnwNY0S5ucl1VnQUz5hwyqogdY5ypZ zYZkB9acpZR6wtiL79R7GMC+OhlHyB+1nLTaD7A1V7vJ8p2L+KQwUbcIoTn7tyN9uuXCh0amK9 X-Received: by 2002:a05:600c:3b28:b0:47e:e952:86c9 with SMTP id 5b1f17b1804b1-483a95a2320mr224146815e9.0.1771961444951; Tue, 24 Feb 2026 11:30:44 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Pierrick Bouvier , Paolo Bonzini , qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , Eduardo Habkost , Song Gao , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [RFC PATCH 2/5] target/tcg: Rename crc32*() helpers Date: Tue, 24 Feb 2026 20:30:24 +0100 Message-ID: <20260224193028.2370-3-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260224193028.2370-1-philmd@linaro.org> References: <20260224193028.2370-1-philmd@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=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771961531126158500 In order to avoid symbol name clash when building a single binary, rename TCG helpers prefixing with the target name. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Brian Cain Reviewed-by: Pierrick Bouvier --- target/arm/tcg/helper-defs.h | 4 ++-- target/i386/ops_sse.h | 2 +- target/loongarch/tcg/helper.h | 4 ++-- target/mips/helper.h | 4 ++-- target/i386/tcg/ops_sse_header.h.inc | 2 +- target/arm/tcg/arith_helper.c | 4 ++-- target/arm/tcg/translate.c | 4 ++-- target/loongarch/tcg/op_helper.c | 4 ++-- target/mips/tcg/op_helper.c | 4 ++-- target/mips/tcg/translate.c | 4 ++-- target/i386/tcg/emit.c.inc | 2 +- .../loongarch/tcg/insn_trans/trans_extra.c.inc | 16 ++++++++-------- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/target/arm/tcg/helper-defs.h b/target/arm/tcg/helper-defs.h index 5a10a9fba3b..a9e3583e2bb 100644 --- a/target/arm/tcg/helper-defs.h +++ b/target/arm/tcg/helper-defs.h @@ -493,8 +493,8 @@ DEF_HELPER_FLAGS_4(crypto_sm4ekey, TCG_CALL_NO_RWG, voi= d, ptr, ptr, ptr, i32) =20 DEF_HELPER_FLAGS_4(crypto_rax1, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) =20 -DEF_HELPER_FLAGS_3(crc32, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) -DEF_HELPER_FLAGS_3(crc32c, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) +DEF_HELPER_FLAGS_3(arm_crc32, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) +DEF_HELPER_FLAGS_3(arm_crc32c, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) =20 DEF_HELPER_FLAGS_5(gvec_qrdmlah_s16, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 99c4728ec81..3c683185253 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -2115,7 +2115,7 @@ void glue(helper_pcmpistrm, SUFFIX)(CPUX86State *env,= Reg *d, Reg *s, =20 #define CRCPOLY 0x1edc6f41 #define CRCPOLY_BITREV 0x82f63b78 -target_ulong helper_crc32(uint32_t crc1, target_ulong msg, uint32_t len) +target_ulong helper_x86_crc32(uint32_t crc1, target_ulong msg, uint32_t le= n) { target_ulong crc =3D (msg & ((target_ulong) -1 >> (TARGET_LONG_BITS - len))) ^ crc1; diff --git a/target/loongarch/tcg/helper.h b/target/loongarch/tcg/helper.h index e36dd2f5de3..35b055eb3bc 100644 --- a/target/loongarch/tcg/helper.h +++ b/target/loongarch/tcg/helper.h @@ -12,8 +12,8 @@ DEF_HELPER_FLAGS_1(loongarch_bitswap, TCG_CALL_NO_RWG_SE,= tl, tl) DEF_HELPER_FLAGS_3(asrtle_d, TCG_CALL_NO_WG, void, env, tl, tl) DEF_HELPER_FLAGS_3(asrtgt_d, TCG_CALL_NO_WG, void, env, tl, tl) =20 -DEF_HELPER_FLAGS_3(crc32, TCG_CALL_NO_RWG_SE, tl, tl, tl, tl) -DEF_HELPER_FLAGS_3(crc32c, TCG_CALL_NO_RWG_SE, tl, tl, tl, tl) +DEF_HELPER_FLAGS_3(loongarch_crc32, TCG_CALL_NO_RWG_SE, tl, tl, tl, tl) +DEF_HELPER_FLAGS_3(loongarch_crc32c, TCG_CALL_NO_RWG_SE, tl, tl, tl, tl) DEF_HELPER_FLAGS_2(cpucfg, TCG_CALL_NO_RWG_SE, tl, env, tl) =20 /* Floating-point helper */ diff --git a/target/mips/helper.h b/target/mips/helper.h index 1c9f76f0c9c..e70a3942fac 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -21,8 +21,8 @@ DEF_HELPER_FLAGS_1(mips_bitswap, TCG_CALL_NO_RWG_SE, tl, = tl) DEF_HELPER_FLAGS_1(dbitswap, TCG_CALL_NO_RWG_SE, tl, tl) #endif =20 -DEF_HELPER_3(crc32, tl, tl, tl, i32) -DEF_HELPER_3(crc32c, tl, tl, tl, i32) +DEF_HELPER_3(mips_crc32, tl, tl, tl, i32) +DEF_HELPER_3(mips_crc32c, tl, tl, tl, i32) DEF_HELPER_FLAGS_4(rotx, TCG_CALL_NO_RWG_SE, tl, tl, i32, i32, i32) =20 /* microMIPS functions */ diff --git a/target/i386/tcg/ops_sse_header.h.inc b/target/i386/tcg/ops_sse= _header.h.inc index bbeb7301c33..8569f9935e3 100644 --- a/target/i386/tcg/ops_sse_header.h.inc +++ b/target/i386/tcg/ops_sse_header.h.inc @@ -337,7 +337,7 @@ DEF_HELPER_4(glue(pcmpestri, SUFFIX), void, env, Reg, R= eg, i32) DEF_HELPER_4(glue(pcmpestrm, SUFFIX), void, env, Reg, Reg, i32) DEF_HELPER_4(glue(pcmpistri, SUFFIX), void, env, Reg, Reg, i32) DEF_HELPER_4(glue(pcmpistrm, SUFFIX), void, env, Reg, Reg, i32) -DEF_HELPER_3(crc32, tl, i32, tl, i32) +DEF_HELPER_3(x86_crc32, tl, i32, tl, i32) #endif =20 /* AES-NI op helpers */ diff --git a/target/arm/tcg/arith_helper.c b/target/arm/tcg/arith_helper.c index cc081c8f966..3a5cb41c7a9 100644 --- a/target/arm/tcg/arith_helper.c +++ b/target/arm/tcg/arith_helper.c @@ -275,7 +275,7 @@ uint32_t HELPER(sel_flags)(uint32_t flags, uint32_t a, = uint32_t b) * The upper bytes of val (above the number specified by 'bytes') must have * been zeroed out by the caller. */ -uint32_t HELPER(crc32)(uint32_t acc, uint32_t val, uint32_t bytes) +uint32_t HELPER(arm_crc32)(uint32_t acc, uint32_t val, uint32_t bytes) { uint8_t buf[4]; =20 @@ -285,7 +285,7 @@ uint32_t HELPER(crc32)(uint32_t acc, uint32_t val, uint= 32_t bytes) return crc32(acc ^ 0xffffffff, buf, bytes) ^ 0xffffffff; } =20 -uint32_t HELPER(crc32c)(uint32_t acc, uint32_t val, uint32_t bytes) +uint32_t HELPER(arm_crc32c)(uint32_t acc, uint32_t val, uint32_t bytes) { uint8_t buf[4]; =20 diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index f9d1b8897d2..24cd316ee7a 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -3348,9 +3348,9 @@ static bool op_crc32(DisasContext *s, arg_rrr *a, boo= l c, MemOp sz) } t3 =3D tcg_constant_i32(1 << sz); if (c) { - gen_helper_crc32c(t1, t1, t2, t3); + gen_helper_arm_crc32c(t1, t1, t2, t3); } else { - gen_helper_crc32(t1, t1, t2, t3); + gen_helper_arm_crc32(t1, t1, t2, t3); } store_reg(s, a->rd, t1); return true; diff --git a/target/loongarch/tcg/op_helper.c b/target/loongarch/tcg/op_hel= per.c index 6b4fe535300..427b1da4004 100644 --- a/target/loongarch/tcg/op_helper.c +++ b/target/loongarch/tcg/op_helper.c @@ -60,7 +60,7 @@ void helper_asrtgt_d(CPULoongArchState *env, target_ulong= rj, target_ulong rk) } } =20 -target_ulong helper_crc32(target_ulong val, target_ulong m, uint64_t sz) +target_ulong helper_loongarch_crc32(target_ulong val, target_ulong m, uint= 64_t sz) { uint8_t buf[8]; target_ulong mask =3D ((sz * 8) =3D=3D 64) ? -1ULL : ((1ULL << (sz * 8= )) - 1); @@ -70,7 +70,7 @@ target_ulong helper_crc32(target_ulong val, target_ulong = m, uint64_t sz) return (int32_t) (crc32(val ^ 0xffffffff, buf, sz) ^ 0xffffffff); } =20 -target_ulong helper_crc32c(target_ulong val, target_ulong m, uint64_t sz) +target_ulong helper_loongarch_crc32c(target_ulong val, target_ulong m, uin= t64_t sz) { uint8_t buf[8]; target_ulong mask =3D ((sz * 8) =3D=3D 64) ? -1ULL : ((1ULL << (sz * 8= )) - 1); diff --git a/target/mips/tcg/op_helper.c b/target/mips/tcg/op_helper.c index 83c340e38e0..723253da59d 100644 --- a/target/mips/tcg/op_helper.c +++ b/target/mips/tcg/op_helper.c @@ -145,7 +145,7 @@ target_ulong helper_rotx(target_ulong rs, uint32_t shif= t, uint32_t shiftx, } =20 /* these crc32 functions are based on target/loongarch/tcg/op_helper.c */ -target_ulong helper_crc32(target_ulong val, target_ulong m, uint32_t sz) +target_ulong helper_mips_crc32(target_ulong val, target_ulong m, uint32_t = sz) { uint8_t buf[8]; target_ulong mask =3D ((sz * 8) =3D=3D 64) ? @@ -157,7 +157,7 @@ target_ulong helper_crc32(target_ulong val, target_ulon= g m, uint32_t sz) return (int32_t) (crc32(val ^ 0xffffffff, buf, sz) ^ 0xffffffff); } =20 -target_ulong helper_crc32c(target_ulong val, target_ulong m, uint32_t sz) +target_ulong helper_mips_crc32c(target_ulong val, target_ulong m, uint32_t= sz) { uint8_t buf[8]; target_ulong mask =3D ((sz * 8) =3D=3D 64) ? diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index a63aa67808e..7ffa0d77273 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -13440,9 +13440,9 @@ void gen_crc32(DisasContext *ctx, int rd, int rs, i= nt rt, int sz, gen_load_gpr(t1, rs); =20 if (crc32c) { - gen_helper_crc32c(cpu_gpr[rd], t0, t1, tsz); + gen_helper_mips_crc32c(cpu_gpr[rd], t0, t1, tsz); } else { - gen_helper_crc32(cpu_gpr[rd], t0, t1, tsz); + gen_helper_mips_crc32(cpu_gpr[rd], t0, t1, tsz); } } =20 diff --git a/target/i386/tcg/emit.c.inc b/target/i386/tcg/emit.c.inc index ce636b6c56c..47b3940e943 100644 --- a/target/i386/tcg/emit.c.inc +++ b/target/i386/tcg/emit.c.inc @@ -1916,7 +1916,7 @@ static void gen_CRC32(DisasContext *s, X86DecodedInsn= *decode) TCGv_i32 tmp =3D tcg_temp_new_i32(); =20 tcg_gen_trunc_tl_i32(tmp, s->T0); - gen_helper_crc32(s->T0, tmp, s->T1, tcg_constant_i32(8 << ot)); + gen_helper_x86_crc32(s->T0, tmp, s->T1, tcg_constant_i32(8 << ot)); } =20 static void gen_CVTPI2Px(DisasContext *s, X86DecodedInsn *decode) diff --git a/target/loongarch/tcg/insn_trans/trans_extra.c.inc b/target/loo= ngarch/tcg/insn_trans/trans_extra.c.inc index 298a80cff55..0a45f6c16a2 100644 --- a/target/loongarch/tcg/insn_trans/trans_extra.c.inc +++ b/target/loongarch/tcg/insn_trans/trans_extra.c.inc @@ -101,11 +101,11 @@ static bool gen_crc(DisasContext *ctx, arg_rrr *a, return true; } =20 -TRANS(crc_w_b_w, CRC, gen_crc, gen_helper_crc32, tcg_constant_tl(1)) -TRANS(crc_w_h_w, CRC, gen_crc, gen_helper_crc32, tcg_constant_tl(2)) -TRANS(crc_w_w_w, CRC, gen_crc, gen_helper_crc32, tcg_constant_tl(4)) -TRANS64(crc_w_d_w, CRC, gen_crc, gen_helper_crc32, tcg_constant_tl(8)) -TRANS(crcc_w_b_w, CRC, gen_crc, gen_helper_crc32c, tcg_constant_tl(1)) -TRANS(crcc_w_h_w, CRC, gen_crc, gen_helper_crc32c, tcg_constant_tl(2)) -TRANS(crcc_w_w_w, CRC, gen_crc, gen_helper_crc32c, tcg_constant_tl(4)) -TRANS64(crcc_w_d_w, CRC, gen_crc, gen_helper_crc32c, tcg_constant_tl(8)) +TRANS(crc_w_b_w, CRC, gen_crc, gen_helper_loongarch_crc32, tcg_constant_tl= (1)) +TRANS(crc_w_h_w, CRC, gen_crc, gen_helper_loongarch_crc32, tcg_constant_tl= (2)) +TRANS(crc_w_w_w, CRC, gen_crc, gen_helper_loongarch_crc32, tcg_constant_tl= (4)) +TRANS64(crc_w_d_w, CRC, gen_crc, gen_helper_loongarch_crc32, tcg_constant_= tl(8)) +TRANS(crcc_w_b_w, CRC, gen_crc, gen_helper_loongarch_crc32c, tcg_constant_= tl(1)) +TRANS(crcc_w_h_w, CRC, gen_crc, gen_helper_loongarch_crc32c, tcg_constant_= tl(2)) +TRANS(crcc_w_w_w, CRC, gen_crc, gen_helper_loongarch_crc32c, tcg_constant_= tl(4)) +TRANS64(crcc_w_d_w, CRC, gen_crc, gen_helper_loongarch_crc32c, tcg_constan= t_tl(8)) --=20 2.52.0 From nobody Sun Apr 12 05:51:25 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=1771961544; cv=none; d=zohomail.com; s=zohoarc; b=YeMnjR6tptKXO3hSl9osCzB5oghUy3nMAK8nALZV1ApffMKKEz6C9IdFqn3Qh2bPnu2fTJ0BQ4DU1E2WyzycTDhNIFSaOC2D/k0q7K/TtOKa2rf/bd0EYC3bNLtI5jfB0r+fRl5DntBIv8hubcp0AjETdkNNg634NbOLOkAcxX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771961544; 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=g2xKkJpEboPawLV+v3FvCyWeGhL4Wa6PCRD9MvOpmIE=; b=IFeaEePgXIqtlFzGU+Xe6/t+DxtZ0t2s2riGIgiS6YASLLeL1kdAK/d2hVO0Syif7ZZc83/hksV4Bd+1qMHg4iZmN5j5sDLNIuaIwS12V0ZzG6Q1u/XOf2r73XekiW02pcwL6m/Yeu1yp0jyBSzrt32HDTPoGZFE90vmtGwbn1M= 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 1771961544169396.70911621207983; Tue, 24 Feb 2026 11:32:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuy8b-0002nj-F6; Tue, 24 Feb 2026 14:32:05 -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 1vuy7b-0001sZ-CU for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:31:09 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuy7U-0000pA-Lx for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:31:02 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-483bd7354efso4195155e9.2 for ; Tue, 24 Feb 2026 11:30:53 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43986aa2f84sm6184578f8f.7.2026.02.24.11.30.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 24 Feb 2026 11:30:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771961452; x=1772566252; 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=g2xKkJpEboPawLV+v3FvCyWeGhL4Wa6PCRD9MvOpmIE=; b=wMTkAKblyz59mxDWTn14kqMdOfanzI1WbeGzPExnqAaf2TReEPRlc9tpG/yoiPYyGZ UERsUW8kqbdZqvHV8X6LcIWJp5SN0Of6kF5Eyrl4B38b44BVHuUeAwWBNC3aETdoelnz KEfOzlUAAnrSxi9pw1lgHGV1yN8QLHfS0mkLTWVyH0V5ybV3APiLMCofQJC87WtipCUc pVXERt08r0amMUHFZZFp98pgHdPx4CntdijjRtoPjF6ykTNmRoZGQIFOz7YGC5k2C/v6 z/8SICR7tQgC3QKqM221cIZZC9j2i7vEkRWOomDwY9FwwbsPgbZMNW5tY321pppjWdZm B9Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771961452; x=1772566252; 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=g2xKkJpEboPawLV+v3FvCyWeGhL4Wa6PCRD9MvOpmIE=; b=JFKzUbV1H3yfVyCu+avTYieGP2MSRCjl3kmk+zrTHGxVO7ED9ZvBHJUy+1DQseAhwj hyGuT+lfxV5zVNn13i4k+EPomhRV9PeHERMsbE0RYU31CvPkd75BS8nov83A6hrkRjK2 SHb3y5TXnaN4nEnqcD8m9w+aaKGHUvhAh8XUQkSH+l/9SoWmnYF5vEvepKQgYguDigkW +d2qluAu4E+n98lqfdfpF2Vr4i+sjledktZNRthdjwtOEELZh/EP194qe0gHv8wwhCci z5efjLV+OOdYGAr0dwGGlm7FkYa2HUzRRa2sGUvp45Ytn6FQBuWtuf+tUdztgSFS3z+P LlFQ== X-Gm-Message-State: AOJu0YzS3NDTJWRxZjMF7eZ+SVWP9kxeY/20fyeoxLrdamh7iq+/unEq OWmwu8unG/fZr68sBFPlzhDbPrqWnkrg+9E1DVH95OnpPWt7pMQQMxQW79boBDsjWaF1QKzvdsQ bpIDzxvg= X-Gm-Gg: AZuq6aJyxuBoMSYm0lqOewvW/QqsaPxyBM6cQLpEVNQVpY43uawMBBD/bW/5Jdu+5+n GFyxrcJEb8RvqQBVZ1YdGg6QjcDmqqy8LMM6GdkYRO9MYS9nXnoE07McTmhAoY9gbTuua2C0NSo azKHTgFTurdVlsY2Qq0yfgPQjmEZWhxEf5x155CK/GbEZoBFt0JiRoYopKSO3XDREvP6FUMs7Zm ZvVlLltOFBjfTTXjtprgqPPn9py97xBI8GvcHXhaIc2A3BXr29I2wk6Jt0alT8i1/PDEunRJz5t VKAxwL7Mjiy/Sy8g10KJ7uuoG8E/UKMUFy+LvH2BOEnoVWE1SmS3i160w39Bpm+3s2FveTMaOHG BU1BEe2mJYYpuIYsK+E2Oqjt1s18IIbvljgw0VL1UNILaYmQFmP1fMa71Oobp613zg6DQz70g6i 2bfymMLiRYu09txrVh0yi1WH5TGoTKjVepeCoojSy4KIml7nFPH633Q4qFgU6pM6p4GIGnUD0JG 8g8j8k6z2o= X-Received: by 2002:a05:600c:c4ac:b0:477:a219:cdb7 with SMTP id 5b1f17b1804b1-483a95a3822mr226754315e9.0.1771961452425; Tue, 24 Feb 2026 11:30:52 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Pierrick Bouvier , Paolo Bonzini , qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [RFC PATCH 3/5] target/tcg: Rename unaligned_access() helpers Date: Tue, 24 Feb 2026 20:30:25 +0100 Message-ID: <20260224193028.2370-4-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260224193028.2370-1-philmd@linaro.org> References: <20260224193028.2370-1-philmd@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=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771961544581158500 In order to avoid symbol name clash when building a single binary, rename TCG helpers prefixing with the target name. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Brian Cain Reviewed-by: Pierrick Bouvier --- target/arm/tcg/helper-a64-defs.h | 2 +- target/microblaze/helper.h | 2 +- target/arm/tcg/helper-a64.c | 4 ++-- target/arm/tcg/translate-a64.c | 4 ++-- target/microblaze/helper.c | 2 +- target/microblaze/translate.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/arm/tcg/helper-a64-defs.h b/target/arm/tcg/helper-a64-d= efs.h index b6008b5a3ac..b329d7eb6a6 100644 --- a/target/arm/tcg/helper-a64-defs.h +++ b/target/arm/tcg/helper-a64-defs.h @@ -113,7 +113,7 @@ DEF_HELPER_FLAGS_2(ldgm, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_3(stgm, TCG_CALL_NO_WG, void, env, i64, i64) DEF_HELPER_FLAGS_3(stzgm_tags, TCG_CALL_NO_WG, void, env, i64, i64) =20 -DEF_HELPER_FLAGS_4(unaligned_access, TCG_CALL_NO_WG, +DEF_HELPER_FLAGS_4(arm_unaligned_access, TCG_CALL_NO_WG, noreturn, env, i64, i32, i32) =20 DEF_HELPER_3(setp, void, env, i32, i32) diff --git a/target/microblaze/helper.h b/target/microblaze/helper.h index 01eba592b26..1429c1727ef 100644 --- a/target/microblaze/helper.h +++ b/target/microblaze/helper.h @@ -27,7 +27,7 @@ DEF_HELPER_FLAGS_3(put, TCG_CALL_NO_RWG, void, i32, i32, = i32) #ifndef CONFIG_USER_ONLY DEF_HELPER_FLAGS_3(mmu_read, TCG_CALL_NO_RWG, i32, env, i32, i32) DEF_HELPER_FLAGS_4(mmu_write, TCG_CALL_NO_RWG, void, env, i32, i32, i32) -DEF_HELPER_FLAGS_2(unaligned_access, TCG_CALL_NO_WG, noreturn, env, i64) +DEF_HELPER_FLAGS_2(microblaze_unaligned_access, TCG_CALL_NO_WG, noreturn, = env, i64) DEF_HELPER_FLAGS_2(lbuea, TCG_CALL_NO_WG, i32, env, i64) DEF_HELPER_FLAGS_2(lhuea_be, TCG_CALL_NO_WG, i32, env, i64) DEF_HELPER_FLAGS_2(lhuea_le, TCG_CALL_NO_WG, i32, env, i64) diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 2dec587d386..f824c662a3a 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -835,8 +835,8 @@ void HELPER(dc_zva)(CPUARMState *env, uint64_t vaddr_in) clear_helper_retaddr(); } =20 -void HELPER(unaligned_access)(CPUARMState *env, uint64_t addr, - uint32_t access_type, uint32_t mmu_idx) +void HELPER(arm_unaligned_access)(CPUARMState *env, uint64_t addr, + uint32_t access_type, uint32_t mmu_idx) { arm_cpu_do_unaligned_access(env_cpu(env), addr, access_type, mmu_idx, GETPC()); diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 5d261a5e32b..c17ddf9e70e 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -381,8 +381,8 @@ static void check_lse2_align(DisasContext *s, int rn, i= nt imm, =20 type =3D is_write ? MMU_DATA_STORE : MMU_DATA_LOAD, mmu_idx =3D get_mem_index(s); - gen_helper_unaligned_access(tcg_env, addr, tcg_constant_i32(type), - tcg_constant_i32(mmu_idx)); + gen_helper_arm_unaligned_access(tcg_env, addr, tcg_constant_i32(type), + tcg_constant_i32(mmu_idx)); =20 gen_set_label(over_label); =20 diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c index a1857b72172..24a9b50183d 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/helper.c @@ -69,7 +69,7 @@ void mb_cpu_do_unaligned_access(CPUState *cs, vaddr addr, =20 #ifndef CONFIG_USER_ONLY =20 -void HELPER(unaligned_access)(CPUMBState *env, uint64_t addr) +void HELPER(microblaze_unaligned_access)(CPUMBState *env, uint64_t addr) { mb_unaligned_access_internal(env_cpu(env), addr, GETPC()); } diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 2af67beecec..8b896abf0e5 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -689,7 +689,7 @@ static void gen_alignment_check_ea(DisasContext *dc, TC= Gv_i64 ea, int rb, record_unaligned_ess(dc, rd, size, store); =20 tcg_gen_brcondi_i64(TCG_COND_TSTEQ, ea, (1 << size) - 1, over); - gen_helper_unaligned_access(tcg_env, ea); + gen_helper_microblaze_unaligned_access(tcg_env, ea); gen_set_label(over); } } --=20 2.52.0 From nobody Sun Apr 12 05:51:25 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=1771961552; cv=none; d=zohomail.com; s=zohoarc; b=DU4px/OdQ/FHQWYRxuCiBLqeOgVjs0iN24FmuYzMVEc8uZK4SSWw/vj21ctDXeiYphmwc/4kA8ZXOsiFz9RAlOBoKMqkBs546Zi7lSgliE42Js1t8QXeA3Z4xHEwbmD8w8M4Cd+4xzVTkoNfbn11qLBsAe/727Itt7lKxpVHwTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771961552; 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=q5mvKXt71l6TX2SjTD1rBiImXi8PdwKcev8DyFv9G1A=; b=URlkGMa3R+7EgSXdqzk9QR2T3qXZJDUzyi4wVVXXv6sxszJ6MPkibxnwtvXhk3dYgAve9zronVMLnC5fryupyhqAlx3U//OYw+X5J/YF3KpY3CjuWYNQSHCumfip1S8qW2EUpv9WrZ4Lv/lH3ENXkvYBual8BE6L0mQJYHRrBiY= 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 1771961552269139.74014775411433; Tue, 24 Feb 2026 11:32:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuy88-0002Kc-OW; Tue, 24 Feb 2026 14:31:37 -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 1vuy7h-0001tQ-5B for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:31:10 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuy7b-0000pq-5Q for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:31:08 -0500 Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-4806bf39419so914535e9.1 for ; Tue, 24 Feb 2026 11:31:01 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483bd7031f3sm18692815e9.6.2026.02.24.11.30.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 24 Feb 2026 11:30:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771961460; x=1772566260; 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=q5mvKXt71l6TX2SjTD1rBiImXi8PdwKcev8DyFv9G1A=; b=rkVsOSiSFJlQkVnRGcfGIPIYkgXUSZ4shBRCFnDQ2NQ7Z1yzaYk2VEpi1RcDyHvhtu yHED5K62CtkioxOCy+/XKoPJKEYiRWYgS0AwZos7sizj366fGg1WZ6FbsUWZg4qLPUD4 TpBwi4jP2bosg6No6RIxPpcSATRis3viihvzWCEwTxvajsU9sXZHyJPKbfftG1zID9m+ wYktPpl9PiZGBzG4O8q+eQx0W3l9rzn/eWbnwd3GA+eZiwuWSiZjoR3nJC6THb1XWKrt 7dPF42Ep1kiG15Jo0aScb4A4chnHyDa0yTgEplWYBku02szlFtadO5SmBV6jhHIHG5L8 DIBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771961460; x=1772566260; 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=q5mvKXt71l6TX2SjTD1rBiImXi8PdwKcev8DyFv9G1A=; b=XGLzYDl+Xdb8JJNWtcP6Xc5yzgQDOnpqHhDhUPTTqKfePYS6B94n5ZvgJAYVczJgcM da1x8jiHrMPLsgjOkLc/aIM/e7T1PSUU9+RdBKBxH49oyntZG484j67uvTubSozlAdxy Mh02PkNBH5s/DcW1Vj/ZZ7MyYKuY4599Ah6Rbb0Mzm2HvDCASOZ0+WUel2+8Ss/eVoBD jSwIj1iI2zyj/UQTZZNxchFJnYI/A0oFAXfvOdO9/TzSRyE1UV/W0YTWkNC9Y6iQeIuP 3ow54e1dlok5A5kDlaRoLrAyp5lvjGTd+F/r6UATxLY4Bfu1gNlFrhv+iXhWiZSYOJsh m/LA== X-Gm-Message-State: AOJu0Yx2sInZPKSA/p5lm4WN3LFwf5Y5CX1djCbBT1QMDgh2nNMak4L6 HObECSwu2Ahg37XU11sOCuwqUexS5HFN8oyVHTZNhbKordhbsO9c83W28N8ey1xp5v9UhZLbICL MaDeCYro= X-Gm-Gg: AZuq6aLrxutIPua6RBeXzj0c4HDCbbD4NOizLBN9ohhErWRJVCC6O1/PIHnbWbhpLd3 /aQCTgXc2n86J5A4bTtczNU3AXR82qB23DX3ep4H+auMap9axXzpN4fFXoc0IqVSIPx/HkNXd0B YJ4iFMB/8nLV3TzfqxT/C5RshSTt0rUP9agaEGOkgXLBSb+BajYkUrGR+jcV09IgJEcvSFZ4fK6 5WRnpMrUOmNc5LJ6b7jjRVsm0mzd1CgHFEDee51dqV4i8V52C8v9Hd0PKzWArs6nIQyv0IRBuwk t//NaLJcBENISJi80p11mBbfh9gGIWnQxhJD6/6f7yrzDgrHeerO1cdF3EFSBLoeE6w6MTWVnUH lAkkXGTHgHxdEYmTIDKdlg+/9AU4EPPHp/nQn8w3uCdiDXR/kikqwgXKw0e7GBIWHQocd4KGF3L M26dyMORJSbp+3HeVfkffeSJIVXxn8sienQTUgHypZ08yX0mhujvNVjKZqKfbC6rjjTyiB0agE X-Received: by 2002:a05:600c:8b56:b0:483:7b99:131d with SMTP id 5b1f17b1804b1-483bd75e26emr21201015e9.16.1771961460101; Tue, 24 Feb 2026 11:31:00 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Pierrick Bouvier , Paolo Bonzini , qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Brian Cain , Zhao Liu , Eduardo Habkost , Laurent Vivier , "Edgar E. Iglesias" , Nicholas Piggin , Chinmay Rath , Mark Cave-Ayland , Artyom Tarasenko Subject: [RFC PATCH 4/5] target/tcg: Rename raise_exception() helpers Date: Tue, 24 Feb 2026 20:30:26 +0100 Message-ID: <20260224193028.2370-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260224193028.2370-1-philmd@linaro.org> References: <20260224193028.2370-1-philmd@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=2a00:1450:4864:20::343; envelope-from=philmd@linaro.org; helo=mail-wm1-x343.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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771961552579158500 In order to avoid symbol name clash when building a single binary, rename TCG helpers prefixing with the target name. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Brian Cain Reviewed-by: Pierrick Bouvier --- target/hexagon/gen_tcg.h | 2 +- target/hexagon/helper.h | 2 +- target/i386/helper.h | 2 +- target/m68k/helper.h | 2 +- target/microblaze/helper.h | 2 +- target/ppc/helper.h | 2 +- target/sparc/helper.h | 2 +- target/hexagon/op_helper.c | 2 +- target/hexagon/translate.c | 2 +- target/i386/tcg/excp_helper.c | 2 +- target/i386/tcg/translate.c | 2 +- target/m68k/op_helper.c | 2 +- target/m68k/translate.c | 2 +- target/microblaze/op_helper.c | 2 +- target/microblaze/translate.c | 2 +- target/ppc/tcg-excp_helper.c | 2 +- target/ppc/translate.c | 6 +++--- target/sparc/helper.c | 2 +- target/sparc/translate.c | 6 +++--- 19 files changed, 23 insertions(+), 23 deletions(-) diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index 7b96dab9185..7ceab81817c 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -1365,7 +1365,7 @@ uiV =3D uiV; \ tcg_gen_movi_tl(hex_gpr[HEX_REG_PC], ctx->pkt->pc); \ TCGv excp =3D tcg_constant_tl(HEX_EVENT_TRAP0); \ - gen_helper_raise_exception(tcg_env, excp); \ + gen_helper_hexagon_raise_exception(tcg_env, excp); \ } while (0) #endif =20 diff --git a/target/hexagon/helper.h b/target/hexagon/helper.h index 64456822bc1..021f9364ad8 100644 --- a/target/hexagon/helper.h +++ b/target/hexagon/helper.h @@ -18,7 +18,7 @@ #include "internal.h" #include "helper_protos_generated.h.inc" =20 -DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_RETURN, noreturn, env, i32) +DEF_HELPER_FLAGS_2(hexagon_raise_exception, TCG_CALL_NO_RETURN, noreturn, = env, i32) DEF_HELPER_2(commit_store, void, env, int) DEF_HELPER_3(gather_store, void, env, i32, int) DEF_HELPER_1(commit_hvx_stores, void, env) diff --git a/target/i386/helper.h b/target/i386/helper.h index 3f67098f11f..8099c40cc90 100644 --- a/target/i386/helper.h +++ b/target/i386/helper.h @@ -56,7 +56,7 @@ DEF_HELPER_2(syscall, void, env, int) DEF_HELPER_2(sysret, void, env, int) DEF_HELPER_FLAGS_1(pause, TCG_CALL_NO_WG, noreturn, env) DEF_HELPER_FLAGS_3(raise_interrupt, TCG_CALL_NO_WG, noreturn, env, int, in= t) -DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, int) +DEF_HELPER_FLAGS_2(x86_raise_exception, TCG_CALL_NO_WG, noreturn, env, int) DEF_HELPER_FLAGS_1(icebp, TCG_CALL_NO_WG, noreturn, env) DEF_HELPER_3(boundw, void, env, tl, int) DEF_HELPER_3(boundl, void, env, tl, int) diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 0bda8f8152d..a76d455cde1 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -111,7 +111,7 @@ DEF_HELPER_3(set_mac_extu, void, env, i32, i32) DEF_HELPER_2(flush_flags, void, env, i32) DEF_HELPER_2(set_ccr, void, env, i32) DEF_HELPER_FLAGS_1(get_ccr, TCG_CALL_NO_WG_SE, i32, env) -DEF_HELPER_2(raise_exception, noreturn, env, i32) +DEF_HELPER_2(m68k_raise_exception, noreturn, env, i32) =20 DEF_HELPER_FLAGS_3(bfffo_reg, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) =20 diff --git a/target/microblaze/helper.h b/target/microblaze/helper.h index 1429c1727ef..e589a8422f0 100644 --- a/target/microblaze/helper.h +++ b/target/microblaze/helper.h @@ -1,4 +1,4 @@ -DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) +DEF_HELPER_FLAGS_2(microblaze_raise_exception, TCG_CALL_NO_WG, noreturn, e= nv, i32) =20 DEF_HELPER_FLAGS_3(divs, TCG_CALL_NO_WG, i32, env, i32, i32) DEF_HELPER_FLAGS_3(divu, TCG_CALL_NO_WG, i32, env, i32, i32) diff --git a/target/ppc/helper.h b/target/ppc/helper.h index e99c8c824b4..3548af5f1c0 100644 --- a/target/ppc/helper.h +++ b/target/ppc/helper.h @@ -1,5 +1,5 @@ DEF_HELPER_FLAGS_3(raise_exception_err, TCG_CALL_NO_WG, noreturn, env, i32= , i32) -DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) +DEF_HELPER_FLAGS_2(ppc_raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) DEF_HELPER_FLAGS_4(TW, TCG_CALL_NO_WG, void, env, tl, tl, i32) #if defined(TARGET_PPC64) DEF_HELPER_FLAGS_4(TD, TCG_CALL_NO_WG, void, env, tl, tl, i32) diff --git a/target/sparc/helper.h b/target/sparc/helper.h index 3a7f7dc1296..6de773445fe 100644 --- a/target/sparc/helper.h +++ b/target/sparc/helper.h @@ -53,7 +53,7 @@ DEF_HELPER_FLAGS_3(fcmpq, TCG_CALL_NO_WG, i32, env, i128,= i128) DEF_HELPER_FLAGS_3(fcmpeq, TCG_CALL_NO_WG, i32, env, i128, i128) DEF_HELPER_FLAGS_3(flcmps, TCG_CALL_NO_RWG_SE, i32, env, f32, f32) DEF_HELPER_FLAGS_3(flcmpd, TCG_CALL_NO_RWG_SE, i32, env, f64, f64) -DEF_HELPER_2(raise_exception, noreturn, env, int) +DEF_HELPER_2(sparc_raise_exception, noreturn, env, int) =20 DEF_HELPER_FLAGS_3(faddd, TCG_CALL_NO_WG, f64, env, f64, f64) DEF_HELPER_FLAGS_3(fsubd, TCG_CALL_NO_WG, f64, env, f64, f64) diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 368391bb846..605fd95e2a5 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -46,7 +46,7 @@ G_NORETURN void hexagon_raise_exception_err(CPUHexagonSta= te *env, cpu_loop_exit_restore(cs, pc); } =20 -G_NORETURN void HELPER(raise_exception)(CPUHexagonState *env, uint32_t exc= p) +G_NORETURN void HELPER(hexagon_raise_exception)(CPUHexagonState *env, uint= 32_t excp) { hexagon_raise_exception_err(env, excp, 0); } diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 8a223f6e13e..8e6949640ee 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -119,7 +119,7 @@ intptr_t ctx_tmp_vreg_off(DisasContext *ctx, int regnum, =20 static void gen_exception_raw(int excp) { - gen_helper_raise_exception(tcg_env, tcg_constant_i32(excp)); + gen_helper_hexagon_raise_exception(tcg_env, tcg_constant_i32(excp)); } =20 static void gen_exec_counters(DisasContext *ctx) diff --git a/target/i386/tcg/excp_helper.c b/target/i386/tcg/excp_helper.c index 32f2784e923..f503f1863ee 100644 --- a/target/i386/tcg/excp_helper.c +++ b/target/i386/tcg/excp_helper.c @@ -31,7 +31,7 @@ G_NORETURN void helper_raise_interrupt(CPUX86State *env, = int intno, raise_interrupt(env, intno, next_eip_addend); } =20 -G_NORETURN void helper_raise_exception(CPUX86State *env, int exception_ind= ex) +G_NORETURN void helper_x86_raise_exception(CPUX86State *env, int exception= _index) { raise_exception(env, exception_index); } diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 14210d569f7..adcc887d80f 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -1515,7 +1515,7 @@ static void gen_exception(DisasContext *s, int trapno) { gen_update_cc_op(s); gen_update_eip_cur(s); - gen_helper_raise_exception(tcg_env, tcg_constant_i32(trapno)); + gen_helper_x86_raise_exception(tcg_env, tcg_constant_i32(trapno)); s->base.is_jmp =3D DISAS_NORETURN; } =20 diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 8148a8852e7..be4edcbc5b8 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -552,7 +552,7 @@ G_NORETURN static void raise_exception(CPUM68KState *en= v, int tt) raise_exception_ra(env, tt, 0); } =20 -void HELPER(raise_exception)(CPUM68KState *env, uint32_t tt) +void HELPER(m68k_raise_exception)(CPUM68KState *env, uint32_t tt) { raise_exception(env, tt); } diff --git a/target/m68k/translate.c b/target/m68k/translate.c index abc1c79f3cd..e169d252935 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -252,7 +252,7 @@ static void gen_jmp(DisasContext *s, TCGv dest) =20 static void gen_raise_exception(int nr) { - gen_helper_raise_exception(tcg_env, tcg_constant_i32(nr)); + gen_helper_m68k_raise_exception(tcg_env, tcg_constant_i32(nr)); } =20 static void gen_raise_exception_format2(DisasContext *s, int nr, diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index 31da2c7c3ae..6f964635244 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -61,7 +61,7 @@ uint32_t helper_get(uint32_t id, uint32_t ctrl) return 0xdead0000 | id; } =20 -void helper_raise_exception(CPUMBState *env, uint32_t index) +void helper_microblaze_raise_exception(CPUMBState *env, uint32_t index) { CPUState *cs =3D env_cpu(env); =20 diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 8b896abf0e5..0f753c1595d 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -97,7 +97,7 @@ static void t_sync_flags(DisasContext *dc) =20 static void gen_raise_exception(DisasContext *dc, uint32_t index) { - gen_helper_raise_exception(tcg_env, tcg_constant_i32(index)); + gen_helper_microblaze_raise_exception(tcg_env, tcg_constant_i32(index)= ); dc->base.is_jmp =3D DISAS_NORETURN; } =20 diff --git a/target/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c index 5e6c1e326d4..3f4fd7f0c23 100644 --- a/target/ppc/tcg-excp_helper.c +++ b/target/ppc/tcg-excp_helper.c @@ -49,7 +49,7 @@ void helper_raise_exception_err(CPUPPCState *env, uint32_= t exception, raise_exception_err_ra(env, exception, error_code, 0); } =20 -void helper_raise_exception(CPUPPCState *env, uint32_t exception) +void helper_ppc_raise_exception(CPUPPCState *env, uint32_t exception) { raise_exception_err_ra(env, exception, 0, 0); } diff --git a/target/ppc/translate.c b/target/ppc/translate.c index a09a6df93fd..f26b0281737 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -334,7 +334,7 @@ static void gen_exception_nip(DisasContext *ctx, uint32= _t excp, =20 gen_update_nip(ctx, nip); t0 =3D tcg_constant_i32(excp); - gen_helper_raise_exception(tcg_env, t0); + gen_helper_ppc_raise_exception(tcg_env, t0); ctx->base.is_jmp =3D DISAS_NORETURN; } =20 @@ -377,8 +377,8 @@ static void gen_debug_exception(DisasContext *ctx, bool= rfi_type) gen_load_spr(t0, SPR_BOOKE_DBSR); tcg_gen_ori_tl(t0, t0, dbsr); gen_store_spr(SPR_BOOKE_DBSR, t0); - gen_helper_raise_exception(tcg_env, - tcg_constant_i32(POWERPC_EXCP_DEBUG)); + gen_helper_ppc_raise_exception(tcg_env, + tcg_constant_i32(POWERPC_EXCP_DEBUG= )); ctx->base.is_jmp =3D DISAS_NORETURN; } else { if (!rfi_type) { /* BookS does not single step rfi type instructio= ns */ diff --git a/target/sparc/helper.c b/target/sparc/helper.c index c5d88de37c9..7b0023fba45 100644 --- a/target/sparc/helper.c +++ b/target/sparc/helper.c @@ -32,7 +32,7 @@ void cpu_raise_exception_ra(CPUSPARCState *env, int tt, u= intptr_t ra) cpu_loop_exit_restore(cs, ra); } =20 -void helper_raise_exception(CPUSPARCState *env, int tt) +void helper_sparc_raise_exception(CPUSPARCState *env, int tt) { CPUState *cs =3D env_cpu(env); =20 diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 7e8558dbbd8..3e4e6f14748 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -1048,7 +1048,7 @@ static void gen_exception(DisasContext *dc, int which) { finishing_insn(dc); save_state(dc); - gen_helper_raise_exception(tcg_env, tcg_constant_i32(which)); + gen_helper_sparc_raise_exception(tcg_env, tcg_constant_i32(which)); dc->base.is_jmp =3D DISAS_NORETURN; } =20 @@ -2811,7 +2811,7 @@ static bool do_tcc(DisasContext *dc, int cond, int cc, /* Trap always. */ if (cond =3D=3D 8) { save_state(dc); - gen_helper_raise_exception(tcg_env, trap); + gen_helper_sparc_raise_exception(tcg_env, trap); dc->base.is_jmp =3D DISAS_NORETURN; return true; } @@ -5833,7 +5833,7 @@ static void sparc_tr_tb_stop(DisasContextBase *dcbase= , CPUState *cs) if (e->npc % 4 =3D=3D 0) { tcg_gen_movi_tl(cpu_npc, e->npc); } - gen_helper_raise_exception(tcg_env, e->excp); + gen_helper_sparc_raise_exception(tcg_env, e->excp); =20 e_next =3D e->next; g_free(e); --=20 2.52.0 From nobody Sun Apr 12 05:51:25 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=1771961565; cv=none; d=zohomail.com; s=zohoarc; b=mf/NpptF1980MLc2y7yyLjrlMJTVhWgEmD1nb/o2SRy8PVrO4Vqb4HXhQGnqPKpWYJn6vSCNTXNYeMh1qArhZ+MKnAYVj7dVPaReyxyqJkrYNvQkSuqd3/ROOSW6F+mvqO/GuQrcEAxfPSDUoAPk0s+87LcFSgtDEFdbeMbxyy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771961565; 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=rPnvzN0vdBAhi5qvrlwZOx/MNlbXvoochlMrzgm+Op8=; b=W2hEsFPhNtVZUqKoEhg9tA1jrulRAlJT15lkPRE3zZKmVvcbJZ6YrQHvwve2TUL1H27/SyBXvV52K7oInYbUQMa4NH+kBG2JFmA3T6ekq/UZWfeeODdE1PY5YCxsRlxx0Dw2S+JtRWOnLITpapSTf4H2cHq1WrFZGHokt3rBMRg= 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 1771961565920397.6214304592031; Tue, 24 Feb 2026 11:32:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuy8e-0002q7-R0; Tue, 24 Feb 2026 14:32: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 1vuy7k-0001wp-3k for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:31:13 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuy7h-0000qU-70 for qemu-devel@nongnu.org; Tue, 24 Feb 2026 14:31:11 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-480706554beso70999215e9.1 for ; Tue, 24 Feb 2026 11:31:08 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4398a09aad0sm4527773f8f.2.2026.02.24.11.31.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 24 Feb 2026 11:31:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771961467; x=1772566267; 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=rPnvzN0vdBAhi5qvrlwZOx/MNlbXvoochlMrzgm+Op8=; b=Raq/A5Xqg+7X6sdX/5Vk85NJaRKMrGKkhcXtF19IGQNMhFcGUuC990cPA0mQIAm//8 fWGlQmlVuXFwq1F6E2zB8f+gdLzmcEN2PyMVYR+5xh68m009QmijPv7wjfZSWPwL11M6 322GQuqHkRtM+1torFb8S2SShiISSG3hkywJ3/fppFYkxHJP0aFnCxCPe1IMJtR5Gcz2 sI8YVHbSjVDJyt4BBN/z1m5t8Va7cfbUPUWpgrVthH1ElJZH7/o093U7X/N9Xv4DWh0K 6zJRVmMr3HBmuAgosXoP3phA6XxQk3eZnyXNVKZqx0/n5iRUG8iU8S8HKg29iFGQ3orJ 8cMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771961467; x=1772566267; 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=rPnvzN0vdBAhi5qvrlwZOx/MNlbXvoochlMrzgm+Op8=; b=opVsxrliI5v0+6OxWsK8rraf+AQCFXxDDO42m06tZQBkNBO55VQNotOyZuX4d9XI4f ca0SqJ6mdl+akSRBZ55//dcbLP37VkjAG+bu58tJQHni8Teh8H9Cp9vgkGgoxo5JJjpx yhbsuO4zOy7dfzaG6oa9k/5hRzLmR4SSwBsTuR8NZ8GERPjmwyZ6dlAfPrzGMcsZJpm0 5jyuwxSWWM7yjNGEwi07oUB4+zTq/xnSMn8ALVC7LbIHchyL7e8QJICJYBP8G0bjAMR0 JQvJoiJVRmdOJesLNkNqQT0qHTiVrVNfJkpprVSA6Kkfgt7GmnDYsZOkVMv44CZSNKLS ncLg== X-Gm-Message-State: AOJu0YwHDMpehZnLaYVV46p+eUV/6Rrees6COwuCOxIimhpbvDJqpQ/E UMKpxCz0AQoFDSf1+CjiY9Hy5dqTMraXApdfb60WmMRz8NZRq5GEXIOv0+JUgkQiDIoqNXoMRyS 2krclomo= X-Gm-Gg: AZuq6aJkwHaaq65o6K5R6byrpan2UWsOv/EjO05b+isxJv+mTrNL8TWyBn2cur7xh03 uWoIU3Nc3lUlg8gd3h07+WTWGjAquSOdcj8hv1l/SOiGaDOzltYnKuDAlMRJSd2EbgaxywZUNQ6 w6CXH6GL7AWcaAc4OOreVV2cKebuyJvUSwgInHJjgRwm1Bt8zWBso1wbKF/A1QIhToZOV6Za5Np cOEFpyxBy8AWuG3sgQPCtebsjkiBpHXaj0TE8XJHrfSwVzVvtV7BG27ov/GTZYj2ImeuY91DmHR 3v6AnDNrKmIOFqvudKKhfPCwJyNSjrCHUIfM7TvQFsrZV0aew/6JohA2bP0rp2+EOFRhL78ntH6 9shDoK5IxpmsadCsMCAmxtYxhw8JqMeKj7mP18JBbBuzIpDgrHxUj9v3ExV0bC+5k3nzK44Lrg8 9hL/JybTwfFT+wzQpM09ViHOkEnT7q3w0jn+1DUeulvOPSW6EBqJbRh3kW4O+AumDMG5Br9H4N X-Received: by 2002:a05:600c:3516:b0:477:9b4a:a82 with SMTP id 5b1f17b1804b1-483a963df3cmr283923845e9.35.1771961467457; Tue, 24 Feb 2026 11:31:07 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Pierrick Bouvier , Paolo Bonzini , qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei Subject: [RFC PATCH 5/5] target/tcg: Rename set_rounding_mode() helpers Date: Tue, 24 Feb 2026 20:30:27 +0100 Message-ID: <20260224193028.2370-6-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260224193028.2370-1-philmd@linaro.org> References: <20260224193028.2370-1-philmd@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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771961566752158500 In order to avoid symbol name clash when building a single binary, rename TCG helpers prefixing with the target name. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Brian Cain Reviewed-by: Pierrick Bouvier --- target/loongarch/tcg/helper.h | 2 +- target/riscv/helper.h | 2 +- target/loongarch/tcg/fpu_helper.c | 2 +- target/riscv/fpu_helper.c | 2 +- target/riscv/translate.c | 2 +- target/loongarch/tcg/insn_trans/trans_fmov.c.inc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/loongarch/tcg/helper.h b/target/loongarch/tcg/helper.h index 35b055eb3bc..154e70c0191 100644 --- a/target/loongarch/tcg/helper.h +++ b/target/loongarch/tcg/helper.h @@ -91,7 +91,7 @@ DEF_HELPER_2(ftint_w_d, i64, env, i64) DEF_HELPER_2(frint_s, i64, env, i64) DEF_HELPER_2(frint_d, i64, env, i64) =20 -DEF_HELPER_FLAGS_1(set_rounding_mode, TCG_CALL_NO_RWG, void, env) +DEF_HELPER_FLAGS_1(loongarch_set_rounding_mode, TCG_CALL_NO_RWG, void, env) =20 DEF_HELPER_1(rdtime_d, i64, env) =20 diff --git a/target/riscv/helper.h b/target/riscv/helper.h index b785456ee08..90c8e7eb31f 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -2,7 +2,7 @@ DEF_HELPER_2(raise_exception, noreturn, env, i32) =20 /* Floating Point - rounding mode */ -DEF_HELPER_FLAGS_2(set_rounding_mode, TCG_CALL_NO_WG, void, env, i32) +DEF_HELPER_FLAGS_2(riscv_set_rounding_mode, TCG_CALL_NO_WG, void, env, i32) DEF_HELPER_FLAGS_2(set_rounding_mode_chkfrm, TCG_CALL_NO_WG, void, env, i3= 2) =20 /* Floating Point - fused */ diff --git a/target/loongarch/tcg/fpu_helper.c b/target/loongarch/tcg/fpu_h= elper.c index fc9c64c20a8..265f608cddd 100644 --- a/target/loongarch/tcg/fpu_helper.c +++ b/target/loongarch/tcg/fpu_helper.c @@ -878,7 +878,7 @@ uint64_t helper_ftint_w_d(CPULoongArchState *env, uint6= 4_t fj) return fd; } =20 -void helper_set_rounding_mode(CPULoongArchState *env) +void helper_loongarch_set_rounding_mode(CPULoongArchState *env) { set_float_rounding_mode(ieee_rm[(env->fcsr0 >> FCSR0_RM) & 0x3], &env->fp_status); diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c index af40561b318..aa343ce264d 100644 --- a/target/riscv/fpu_helper.c +++ b/target/riscv/fpu_helper.c @@ -50,7 +50,7 @@ void riscv_cpu_set_fflags(CPURISCVState *env, target_ulon= g hard) set_float_exception_flags(soft, &env->fp_status); } =20 -void helper_set_rounding_mode(CPURISCVState *env, uint32_t rm) +void helper_riscv_set_rounding_mode(CPURISCVState *env, uint32_t rm) { int softrm; =20 diff --git a/target/riscv/translate.c b/target/riscv/translate.c index cb4f4436018..6d0f316ef1e 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -757,7 +757,7 @@ static void gen_set_rm(DisasContext *ctx, int rm) =20 /* The helper may raise ILLEGAL_INSN -- record binv for unwind. */ decode_save_opc(ctx, 0); - gen_helper_set_rounding_mode(tcg_env, tcg_constant_i32(rm)); + gen_helper_riscv_set_rounding_mode(tcg_env, tcg_constant_i32(rm)); } =20 static void gen_set_rm_chkfrm(DisasContext *ctx, int rm) diff --git a/target/loongarch/tcg/insn_trans/trans_fmov.c.inc b/target/loon= garch/tcg/insn_trans/trans_fmov.c.inc index 5cbd9d3f347..c4c4c2000f7 100644 --- a/target/loongarch/tcg/insn_trans/trans_fmov.c.inc +++ b/target/loongarch/tcg/insn_trans/trans_fmov.c.inc @@ -112,7 +112,7 @@ static bool trans_movgr2fcsr(DisasContext *ctx, arg_mov= gr2fcsr *a) * Note that FCSR3 is exactly the rounding mode field. */ if (mask & FCSR0_M3) { - gen_helper_set_rounding_mode(tcg_env); + gen_helper_loongarch_set_rounding_mode(tcg_env); } return true; } --=20 2.52.0