From nobody Sat Apr 11 20:10:30 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=1775488046; cv=none; d=zohomail.com; s=zohoarc; b=kGDp/lYn36JOr/H+xle1CgiP4JLo9u+oBwbxfOFMJ7PNUVx8Xk4JKb7vEXrq2haU6WKb+0yKC4HvkT/3hopMHvQQOT5YUcxohUyhdbhObzTpVPgtGWK238vltFvmuiK3UOGk6AP4Sw3VC/LQoeUi6ZX1xbuDrmuzdWWiUsERqrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775488046; 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=MwdNd4FHCrq25/1aSpiuowhEqZjmmXC6pqpEfiyTzXI=; b=OCE74XEJ+T7bjgVCO3fjpEugy0+Otvou24bsdcU+ZbU5zpLDidf1qg8aV3cACCnaKseGKdyuHyAvRUYcTUkoFUzd05BcwWPfZvc5QwPWZk0ZBciRIzO3emx/cRJYmH0JoVZLm+70VPqZwThXmBFZ4tN+L4Er66lip1a22CNjNFg= 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 1775488046894282.3831503607064; Mon, 6 Apr 2026 08:07:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w9lVo-0003A0-7e; Mon, 06 Apr 2026 11:05:12 -0400 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 1w9lVm-00038r-Qm for qemu-devel@nongnu.org; Mon, 06 Apr 2026 11:05:10 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w9lVk-00046U-UW for qemu-devel@nongnu.org; Mon, 06 Apr 2026 11:05:10 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2ab46931cf1so33229415ad.0 for ; Mon, 06 Apr 2026 08:05:08 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b274979d72sm137770075ad.51.2026.04.06.08.05.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 08:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775487907; x=1776092707; 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=MwdNd4FHCrq25/1aSpiuowhEqZjmmXC6pqpEfiyTzXI=; b=MBJekGlQgLR/CUftYVERvpLjogsgBtvPKwdhWLgzMJSRXaTDpXFXIVn+MW68ImkF5p tGRCmLXb6JyagHjiKgV8R9/5eSsfzgAhH+FuwIoNoRC5ivIp5gHaLyIOBfpMGNyBLNvc Px9zFoCnALnud+El/ZqnecDTZu/osGiTWI9AAjpByUu6UyUp95+jKEgoDnBkD9/sC9vD nVqsIBvhtN3jgm9FdpEe2LTKONOksyJiU3BFox1YfKNmqLDLmlpqYg4Dr+7FZTdVjZTx P9fds+yKCiGyHXhaYT3gNT3T0rnD2p1XVxDhoq2DrC8Vju7FqDyJiRu2m5P7Qxmwkde0 X1mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775487907; x=1776092707; 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=MwdNd4FHCrq25/1aSpiuowhEqZjmmXC6pqpEfiyTzXI=; b=S8l9azq4j69jDWLlJFrVWkb5xd/0UC2mGgz4wGQasNnOu8ajmC3xPVnWS7ixC21X1W 66WnocM2s1ZV3YZPb3z2J6BGPQBhd4Wf6iCqHFmGZSoQUa/+mbpIPWw+NaJZ42YKhHKF vAHnqqfh/knDkzIT9RQZRgnP6qM19MRc9PUvqZxR9z4gdytvReAlPhnRm6Ykj15a2mZK ZhGhBMMHS7Ub6GKt67k6rH2nXoZX06EwhhDIzn0bgQrpnuF7DdncR9eZgWIipPEl/mRX 8hznt/ixySykJvy12r67qm4FFOOCMZyrLhoviaiEdaGzvNjKnGOipBp5p8mPnpj92FQs mmaA== X-Gm-Message-State: AOJu0Yz78eAt8xfr862Px+EBI2i3z7WErSidz8AoE1ZKxdSTp1N+4Ser rtbmkYDN1fo0bhyhyevyAxEoDa1fXlHQE+rCZVedZ4IrSHEc2AeeC2cU7NCT6JCS6LRh9WNvNdJ OyIAqvaLGcQ== X-Gm-Gg: AeBDiesnoGSb7gU4JMrp9fH0ul69qgaR82goYV9nHsjr/4Rx893xKm3xlXJXihZt38k kddOht+DOK04Au6vVwvNJhXfaTnz5ofhDuJvjn4i2gT3t6iJmTMnPsfWEjZ3uXoNAei/MSXK2aQ BMZQVgptat1Xwn/F8E0RabeKttiCQwstEj7Ey6DdWhsTN1drD6dXDM6HV8uibXnUnLgzK6E91La gCt7to046BVSByRPQraY5cdDABZlyN1+uIcpIGQllwqYdcxSibJYiuxEspEJj2/YrrP4p9RnRVq 8zoCiTLbvw8D+BYM1lmBM8hako+yngpL/sZ/ht1sGqfoHv01w/r8kdYZKo/EJ/JQhKbdYoQM8dS csfFtacQ4z/bBPGxQjdL9iGTNomUmf2WEOGa96fKNrZVgRkVrM/ssHPA1IaP7Yk1qYuRnefj9lC mjct2kC64HXojSFK1W6alS3StTNoaTOjxwGkYe03Cdh2JEj0x5CVo4u6DmBXWjNEBZ8wQXcYeDn P8g X-Received: by 2002:a17:902:ce0b:b0:2b0:c060:aab8 with SMTP id d9443c01a7336-2b277d9b788mr144035945ad.9.1775487907068; Mon, 06 Apr 2026 08:05:07 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier , Peter Maydell , philmd@linaro.org, jim.macarthur@linaro.org, Paolo Bonzini , Richard Henderson Subject: [PATCH v7 14/14] target/arm/tcg/translate.c: replace TCGv with TCGv_va Date: Mon, 6 Apr 2026 08:04:34 -0700 Message-ID: <20260406150434.407201-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260406150434.407201-1-pierrick.bouvier@linaro.org> References: <20260406150434.407201-1-pierrick.bouvier@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::633; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x633.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: 1775488048783154100 Content-Type: text/plain; charset="utf-8" We know this file is for 32-bit runtime target, so we can set TCG_ADDRESS_BITS and pass the correct addr_type to translator_loop. Signed-off-by: Pierrick Bouvier --- target/arm/tcg/translate.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index ebcf68aea97..6ea48efbac2 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -22,7 +22,8 @@ =20 #include "translate.h" #include "translate-a32.h" -#include "tcg/tcg-op.h" +#define TCG_ADDRESS_BITS 32 +#include "tcg/tcg-op-mem.h" #include "qemu/log.h" #include "arm_ldst.h" #include "semihosting/semihost.h" @@ -909,14 +910,14 @@ MemOp pow2_align(unsigned i) * that the address argument is TCGv_i32 rather than TCGv. */ =20 -static TCGv gen_aa32_addr(DisasContext *s, TCGv_i32 a32, MemOp op) +static TCGv_va gen_aa32_addr(DisasContext *s, TCGv_i32 a32, MemOp op) { - TCGv addr =3D tcg_temp_new(); - tcg_gen_extu_i32_tl(addr, a32); + TCGv_va addr =3D tcgv_va_temp_new(); + tcg_gen_mov_i32(addr, a32); =20 /* Not needed for user-mode BE32, where we use MO_BE instead. */ if (!IS_USER_ONLY && s->sctlr_b && (op & MO_SIZE) < MO_32) { - tcg_gen_xori_tl(addr, addr, 4 - (1 << (op & MO_SIZE))); + tcg_gen_xori_i32(addr, addr, 4 - (1 << (op & MO_SIZE))); } return addr; } @@ -928,21 +929,21 @@ static TCGv gen_aa32_addr(DisasContext *s, TCGv_i32 a= 32, MemOp op) void gen_aa32_ld_internal_i32(DisasContext *s, TCGv_i32 val, TCGv_i32 a32, int index, MemOp opc) { - TCGv addr =3D gen_aa32_addr(s, a32, opc); + TCGv_va addr =3D gen_aa32_addr(s, a32, opc); tcg_gen_qemu_ld_i32(val, addr, index, opc); } =20 void gen_aa32_st_internal_i32(DisasContext *s, TCGv_i32 val, TCGv_i32 a32, int index, MemOp opc) { - TCGv addr =3D gen_aa32_addr(s, a32, opc); + TCGv_va addr =3D gen_aa32_addr(s, a32, opc); tcg_gen_qemu_st_i32(val, addr, index, opc); } =20 void gen_aa32_ld_internal_i64(DisasContext *s, TCGv_i64 val, TCGv_i32 a32, int index, MemOp opc) { - TCGv addr =3D gen_aa32_addr(s, a32, opc); + TCGv_va addr =3D gen_aa32_addr(s, a32, opc); =20 tcg_gen_qemu_ld_i64(val, addr, index, opc); =20 @@ -955,7 +956,7 @@ void gen_aa32_ld_internal_i64(DisasContext *s, TCGv_i64= val, void gen_aa32_st_internal_i64(DisasContext *s, TCGv_i64 val, TCGv_i32 a32, int index, MemOp opc) { - TCGv addr =3D gen_aa32_addr(s, a32, opc); + TCGv_va addr =3D gen_aa32_addr(s, a32, opc); =20 /* Not needed for user-mode BE32, where we use MO_BE instead. */ if (!IS_USER_ONLY && s->sctlr_b && (opc & MO_SIZE) =3D=3D MO_64) { @@ -2035,7 +2036,7 @@ static void gen_load_exclusive(DisasContext *s, int r= t, int rt2, * architecturally 64-bit access, but instead do a 64-bit access * using MO_BE if appropriate and then split the two halves. */ - TCGv taddr =3D gen_aa32_addr(s, addr, opc); + TCGv_va taddr =3D gen_aa32_addr(s, addr, opc); =20 tcg_gen_qemu_ld_i64(t64, taddr, get_mem_index(s), opc); tcg_gen_mov_i64(cpu_exclusive_val, t64); @@ -2064,7 +2065,7 @@ static void gen_store_exclusive(DisasContext *s, int = rd, int rt, int rt2, { TCGv_i32 t0, t1, t2; TCGv_i64 extaddr; - TCGv taddr; + TCGv_va taddr; TCGLabel *done_label; TCGLabel *fail_label; MemOp opc =3D size | MO_ALIGN | s->be_data; @@ -3791,7 +3792,7 @@ static void do_ldrd_load(DisasContext *s, TCGv_i32 ad= dr, int rt, int rt2) */ int mem_idx =3D get_mem_index(s); MemOp opc =3D MO_64 | MO_ALIGN_4 | MO_ATOM_SUBALIGN | s->be_data; - TCGv taddr =3D gen_aa32_addr(s, addr, opc); + TCGv_va taddr =3D gen_aa32_addr(s, addr, opc); TCGv_i64 t64 =3D tcg_temp_new_i64(); TCGv_i32 tmp =3D tcg_temp_new_i32(); TCGv_i32 tmp2 =3D tcg_temp_new_i32(); @@ -3846,7 +3847,7 @@ static void do_strd_store(DisasContext *s, TCGv_i32 a= ddr, int rt, int rt2) */ int mem_idx =3D get_mem_index(s); MemOp opc =3D MO_64 | MO_ALIGN_4 | MO_ATOM_SUBALIGN | s->be_data; - TCGv taddr =3D gen_aa32_addr(s, addr, opc); + TCGv_va taddr =3D gen_aa32_addr(s, addr, opc); TCGv_i32 t1 =3D load_reg(s, rt); TCGv_i32 t2 =3D load_reg(s, rt2); TCGv_i64 t64 =3D tcg_temp_new_i64(); @@ -4067,7 +4068,7 @@ DO_LDST(STRH, store, MO_UW) static bool op_swp(DisasContext *s, arg_SWP *a, MemOp opc) { TCGv_i32 addr, tmp; - TCGv taddr; + TCGv_va taddr; =20 opc |=3D s->be_data; addr =3D load_reg(s, a->rn); @@ -6881,6 +6882,7 @@ void arm_translate_code(CPUState *cpu, TranslationBlo= ck *tb, DisasContext dc =3D { }; const TranslatorOps *ops =3D &arm_translator_ops; CPUARMTBFlags tb_flags =3D arm_tbflags_from_tb(tb); + TCGType addr_type =3D is_a64(cpu_env(cpu)) ? TCG_TYPE_I64 : TCG_TYPE_I= 32; =20 if (EX_TBFLAG_AM32(tb_flags, THUMB)) { ops =3D &thumb_translator_ops; @@ -6891,6 +6893,5 @@ void arm_translate_code(CPUState *cpu, TranslationBlo= ck *tb, } #endif =20 - translator_loop(cpu, tb, max_insns, pc, host_pc, ops, &dc.base, - tcg_default_addr_type()); + translator_loop(cpu, tb, max_insns, pc, host_pc, ops, &dc.base, addr_t= ype); } --=20 2.47.3