From nobody Sat Apr 11 20:06:20 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=1775528973; cv=none; d=zohomail.com; s=zohoarc; b=N0WhsN2+C650fIxlkMRZbWt5RTgRA0Oo38eByAbZzowenaFRZzzaC+doXl4964Oaep2e8y4yYPBe3uNndaShXkCU+3noARl+Y2p8tLvDtenSQGEIeAGoT3IDDTv+7DSJNDVJ2+pOwyYru2q/FdDEsivp85OCr1jgulbczyt9jPc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775528973; 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=BorICyKUEcit0epVpTcgcaMx1qooML0TzworVFbtz8w=; b=MxF3EqvDv3IpsAhFObddTgOCu0QkVefEXNOj87d4bH1Im5d+M1eW6fLfOTO1gE0zhhElhvB0yuZNEmiZQ8UEky0k5uR62ZHHENOE5UMhN+bpit5HcW/JqLTwwn70b0XRxhFTzO4vqVb5ke9CzoAbPL8/21dQGFdJWPJb2zw+EHM= 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 1775528973687558.8247538953633; Mon, 6 Apr 2026 19:29:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w9wBB-0007mp-Fk; Mon, 06 Apr 2026 22:28:37 -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 1w9wAn-0007aL-LR for qemu-devel@nongnu.org; Mon, 06 Apr 2026 22:28:13 -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 1w9wAj-000703-Bp for qemu-devel@nongnu.org; Mon, 06 Apr 2026 22:28:12 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2ad21f437eeso22686035ad.0 for ; Mon, 06 Apr 2026 19:28: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-2b2749794e8sm161423685ad.53.2026.04.06.19.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 19:28:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775528887; x=1776133687; 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=BorICyKUEcit0epVpTcgcaMx1qooML0TzworVFbtz8w=; b=kI8Dg5WoeqqYdjnEsL6VuOuYot7nLDQH80jlwjI1ZohohivRDbdKboA6B6DQIiuQ5z Aj8TFYml5MwR2U2v8chnXtKr15SKq86jVxU1VdZl7GsFnE2qBUZVQVyYaU6EdZmgnGn+ 1sIcTHRwTf8Xm6b4T6Q7UjcurqRd87eXBGlwcDq+F5+MxWiE2hgH65tHXlPDQfqfxm8l 15Q4n+UyrY8J9dWqEQWjQ3HhcU1M9pcmLYEK8JSgV9xNAm4FPwOt4nyQ/hWI2jwYPBhr wCIYxmVsPsnOdekUpsfNR+PHlgzkQvp2JRAMJwCoEOhIvIfHRJj9qZ8Gagb3Zr0682Qk HxTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775528887; x=1776133687; 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=BorICyKUEcit0epVpTcgcaMx1qooML0TzworVFbtz8w=; b=NhYDck4N/+TkL90Ik0bCgwvbS6i1lV2Mne5i97b62SFjfeXuGL5LP3t8s9LlRY9CKo PqBETasxgajrP3A/0ApTq2IEW99jDd7jmAooOwLlBnziUfNO7qgnBZXOVIQcPRriozKL z/y88U75QxnYd2vpO0VVYHFI1WONWDGs9yjm7n0fqbgA5PAHG1zro1EOv4QxFZfCpoFQ qTxY2xzS+pMdfsQTpgiHXOXItQbIvwhTrSLIE7HykvqXbSQwM6hyfI25aYcq1lQTiN7Y 4xboiYcpSOXAB7jQJIRFnZs8iGhUEmK+/uyvrkLCEJjVl9rYhj3Bp8AGNN2vacB8xF6U +x0Q== X-Gm-Message-State: AOJu0Yw/kffQnR+5oBRahNHdcTissjJl/9qT8WlgY+y1UNL2sBFA/fHp 881B58ePr0uqOOeiAUBfYraVojw7pVFPgGaAdCqXgufCWmUSIM214R2ODA9fGcEc+3EBvPbweZz hXH7XtQ0TSA== X-Gm-Gg: AeBDieselNkCpUTljW+Z5IEXwkpobSiPOSkARBr5117oDd4jSw0BVTsHgyBlv81KbQE 4hkhRSqtFftUcrz4nVkvqIPzzcpdRCANBi9ysxuxrX/DYClefpQffLdDfX9ZXIkDbJrcW7BzJzR HTnI/CeVJNt4X4ZaYPtHrSnIf7a2dMV4UeqtSSPMIXj6lnAWAOZHm0ODX6keNZafU18Knu3jN6g 0f4WI5p7EGOo0kQcbtpGc6eKiSwn4Md3GafFUkFij0x/MIKs6gMkFnk0eZbZBGVO66QowmFrpES RJs6t7O6xY7Bx7KDTBcZsvwXSPOQ56BCwKOEQxkXpmsyNPcfEXuO/RSEC7X206pxnkFSXK/SKi5 E+K5FgVbwfzSHEpGPqX0ekpW0pMb/mKIiB5NAF0p2+1ayMDX4nr5JxUhzdNaNiJlRKLc08kaWMU l1YK1ydfYfpabt59znws79gh5lysh4XcbHBcMnCF7E0xaifk2lq8AXoje7oNFGQlz/yPIVwm1ix Ukk X-Received: by 2002:a17:902:ce0b:b0:2b0:c060:aab8 with SMTP id d9443c01a7336-2b277d9b788mr161050855ad.9.1775528887410; Mon, 06 Apr 2026 19:28:07 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , Peter Maydell , Richard Henderson , Pierrick Bouvier , jim.macarthur@linaro.org, qemu-arm@nongnu.org Subject: [PATCH v9 13/20] target/arm/tcg/translate.c: extract aarch64_translate_code() Date: Mon, 6 Apr 2026 19:27:41 -0700 Message-ID: <20260407022748.57629-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260407022748.57629-1-pierrick.bouvier@linaro.org> References: <20260407022748.57629-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=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: 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: 1775528974835154100 Content-Type: text/plain; charset="utf-8" This allows to get rid of TARGET_AARCH64, and helps with next patch which will define at runtime tcg address type, by adding a second entry point in a different source file. Suggested-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/internals.h | 2 ++ target/arm/tcg/stubs32.c | 7 +++++++ target/arm/tcg/translate-a64.c | 8 ++++++++ target/arm/tcg/translate.c | 18 ++++++++---------- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 8ec27508473..2850edcb198 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -381,6 +381,8 @@ void arm_init_cpreg_list(ARMCPU *cpu); =20 void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu); void arm_translate_init(void); +void aarch64_translate_code(CPUState *cs, TranslationBlock *tb, + int *max_insns, vaddr pc, void *host_pc); void arm_translate_code(CPUState *cs, TranslationBlock *tb, int *max_insns, vaddr pc, void *host_pc); =20 diff --git a/target/arm/tcg/stubs32.c b/target/arm/tcg/stubs32.c index c5a0bc61f47..3945dc49e5e 100644 --- a/target/arm/tcg/stubs32.c +++ b/target/arm/tcg/stubs32.c @@ -3,6 +3,7 @@ */ =20 #include "qemu/osdep.h" +#include "target/arm/internals.h" #include "target/arm/tcg/translate.h" =20 =20 @@ -15,3 +16,9 @@ void a64_translate_init(void) { /* Don't initialize for 32 bits. Call site will be fixed later. */ } + +void aarch64_translate_code(CPUState *cs, TranslationBlock *tb, + int *max_insns, vaddr pc, void *host_pc) +{ + g_assert_not_reached(); +} diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 35ad7530c4b..c5af26e2b7e 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -10949,3 +10949,11 @@ const TranslatorOps aarch64_translator_ops =3D { .translate_insn =3D aarch64_tr_translate_insn, .tb_stop =3D aarch64_tr_tb_stop, }; + +void aarch64_translate_code(CPUState *cpu, TranslationBlock *tb, + int *max_insns, vaddr pc, void *host_pc) +{ + DisasContext dc =3D {}; + translator_loop(cpu, tb, max_insns, pc, host_pc, + &aarch64_translator_ops, &dc.base); +} diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 204f9657993..0597c9d4bed 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -6878,18 +6878,16 @@ static const TranslatorOps thumb_translator_ops =3D= { void arm_translate_code(CPUState *cpu, TranslationBlock *tb, int *max_insns, vaddr pc, void *host_pc) { - DisasContext dc =3D { }; - const TranslatorOps *ops =3D &arm_translator_ops; CPUARMTBFlags tb_flags =3D arm_tbflags_from_tb(tb); =20 - if (EX_TBFLAG_AM32(tb_flags, THUMB)) { - ops =3D &thumb_translator_ops; - } -#ifdef TARGET_AARCH64 if (EX_TBFLAG_ANY(tb_flags, AARCH64_STATE)) { - ops =3D &aarch64_translator_ops; + aarch64_translate_code(cpu, tb, max_insns, pc, host_pc); + } else { + DisasContext dc =3D { }; + translator_loop(cpu, tb, max_insns, pc, host_pc, + (EX_TBFLAG_AM32(tb_flags, THUMB) + ? &thumb_translator_ops + : &arm_translator_ops), + &dc.base); } -#endif - - translator_loop(cpu, tb, max_insns, pc, host_pc, ops, &dc.base); } --=20 2.47.3