From nobody Sat Apr 11 20:11:48 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=1775592044; cv=none; d=zohomail.com; s=zohoarc; b=PkC/tMfOshsaAtinjxvqY8/unvtS21+rZPDIhEgKBXY3HZcbD0noWgaVDja4o5f+qUBtdLzyPd5Q/SspaI9sbyluHt5RI2NWM/R0B0UIv4F3xCvm6hm5KBVSKsI/1OaiwpsauAtaMEqEtdO/3VbEXc6Jy4zX+XfzcrGQOSDb2vA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775592044; 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=Smdg2r8Qlu4cp1beF5JjyoiN3F9rXYpZ3sMjVwx1frY=; b=aO4lk66EtvfQnXciBu+EG5tYXiF+XmGzizRkSe8R131zAbHrCqLIMW5mnwJ4EvgjPZ7toTmagAMgd8CCpsZ/kz/Oqu1/ZykmQV5mePN9CUP+V2tTZDqwsg6tV6J1QKZuAYIIQBH4YkOGozPrOv6/9cq6X9ekO3Vfy8/J1Yymmrs= 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 1775592044317294.58532878591257; Tue, 7 Apr 2026 13:00:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wACaV-0004EN-7B; Tue, 07 Apr 2026 15:59:51 -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 1wACaR-00047x-44 for qemu-devel@nongnu.org; Tue, 07 Apr 2026 15:59:47 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wACaO-0007NL-Is for qemu-devel@nongnu.org; Tue, 07 Apr 2026 15:59:46 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-35d9749c26dso3994249a91.2 for ; Tue, 07 Apr 2026 12:59:43 -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 98e67ed59e1d1-35e27c9855csm126911a91.3.2026.04.07.12.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 12:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775591982; x=1776196782; 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=Smdg2r8Qlu4cp1beF5JjyoiN3F9rXYpZ3sMjVwx1frY=; b=zO6s3FCzU8D2l4IZJd8VuZcViiU6acNYjBfEM7CIjiyn36bbZZBPQeon49NnBeGceW TyvuEbkuSwyrZ9ivqRz8nHMu+/vy7n8ojmw8A/xNpnjyziBBAUbWWt9E8KjhJ5LHbfLF dM6S4S/AZ986zM0yhDxdzkkyUjyMNKAAPZDWVq5IA5pLZvq+3z7HNu/dmWQrTI6XRcA0 E0FXUh5ECwZww3C16EMrJ+qsSeDg4xEnojgT31QXQegF+3DbqR23EBxUsM0dwMZGY0Ad 6DH8FO7ahdf08tVEPJjVj9ivc+BhIHnssQ4bN8uAOUOWtzmx8MbiuLu0HOWuOtYYhy30 yEog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775591982; x=1776196782; 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=Smdg2r8Qlu4cp1beF5JjyoiN3F9rXYpZ3sMjVwx1frY=; b=JI3uUQ52KIOJLvVIOct7D5Vfw6vET7xWYXy9f5gxT97bG82YKq9vYtfSBURptsakut tERkITnchWZK1jt/vL5aZ3TjHa5da99Ul71Gw52ggkkSZaJMlciZ4ji1Sdor6lweksrY u1B7btIk3R/cvli5C2MLMpUZzT9PhCWZOdGJy7ngIt6ppYe/iF0agUjznbYsUl43q9fx iuEBqKLjnI6FVrvIg1DAIZTwTTAIPnEg2YyvvzW/ZVGRCOYl0ttMHQFBFkKXXJ5CEoCu 23vEtn26lHVLoQPYyv8EO2kuuj0bnolyrSUpyNn9hvDyGj3XNlJuno8AOCAXhVfRIU+b 658A== X-Gm-Message-State: AOJu0YxP7jPfmRTCf/KU0OTdTa2ww8naEfRjpCNmIjazr+2OWopyoJ09 wR5uzAkzAFpsSQJVm9ksaMJMfO9K+mFiCNLEQ5mxxxYz78PsRWisNaAqBYKJtRsLLpVMHdEFeBH NBzPfy0w= X-Gm-Gg: AeBDietTzb9QcAy9fkvAPHW/zybQV2XinN06zndKqrvqNPHHB3G7wFl0wrBu3uQ41am raTdV7R5FaV9eTWp4DeMmYNQl2llqCCzgzYDGkEuZH3jQ6n30LhFBLYJXbPqW1zwFnVfpn1MTQ9 mgQIV0/DEZwXClYq+FKyLwnZ/i6y8boE7mwq5sVCNB3ELtT1IvxMoMfGVqMoqdvBMmLxMq3dy7d LQidOMdzVeuIoJekkROxEXbTm934qFhkV1hKKqL5upIizne9w4PR8I+l+Nhp6IbSCrg/WZl4vuR AQvnGTfLDS6R9k2Zmlg9GXjUyJ22Ti6ZjT6YjLIVBOcLAseP0qVOK4DF4tnvA/N6rRgJIyt1aQh w4yw3snPSvQXGbUwuuvOB4eQDxwpP/wzmKBDm/YgZgnzGt4fUYRQrQgsS1xZYC602xbjuMgyNfv ABmfSj52+zz4aPburhKSQSFXlFpwmhFDwvbGMMp/h5YbBxjr9V/Ip7+g9uvl+zhl3cSQNqCJVFL cI7 X-Received: by 2002:a17:90b:3d8a:b0:35b:e4f8:7b2b with SMTP id 98e67ed59e1d1-35de68ebaf3mr19639216a91.18.1775591982470; Tue, 07 Apr 2026 12:59:42 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , jim.macarthur@linaro.org, Richard Henderson , philmd@linaro.org, Pierrick Bouvier , qemu-arm@nongnu.org, Paolo Bonzini Subject: [PATCH v10 13/21] target/arm/tcg/translate.c: extract aarch64_translate_code() Date: Tue, 7 Apr 2026 12:59:14 -0700 Message-ID: <20260407195922.196410-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260407195922.196410-1-pierrick.bouvier@linaro.org> References: <20260407195922.196410-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::1031; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1031.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: 1775592046704154100 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/internals.h | 2 ++ target/arm/tcg/stubs32.c | 7 +++++++ target/arm/tcg/translate-a64.c | 9 +++++++++ target/arm/tcg/translate.c | 19 +++++++++---------- 4 files changed, 27 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..7533a4d01b6 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" #include "exec/target_page.h" +#include "exec/translator.h" #include "helper-a64.h" #include "helper-sme.h" #include "helper-sve.h" @@ -10949,3 +10950,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..9ab926b118e 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -28,6 +28,7 @@ #include "semihosting/semihost.h" #include "cpregs.h" #include "exec/target_page.h" +#include "exec/translator.h" #include "helper.h" #include "helper-mve.h" =20 @@ -6878,18 +6879,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