From nobody Thu Apr 2 17:21:42 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=1774630115; cv=none; d=zohomail.com; s=zohoarc; b=KB6B4tTwsLly09aO5xVAjcUa1lLkpYFjeYO6eachP1tbSSng39hJzDokwY7dpBtgOicfGS4ziLEf3Qo7RIESGevHLbr3iKH8IOxlBpXoDIXqlfLfsHnFGK72NGSAHu+4OGxLo4iIL2CCgihBMf3Qnb5s/rXhdizp2Yvu6lqSTCc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774630115; 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=OGa6TMkmYmwI7/7vLSYxk6iKMksC7GlEB26vrLcMz2w=; b=Wk/04dH1l+psNF8o96Z/Pcb9IOysi5N5g2zDSWsXhQl6b6UgQxxcRg5wRx/ZUdWcebmsAipJAOhwa66DCdiQDEPL6vOjVORJpOkLd7V9pfaSNUA28OSqaEkIHJgfPdYozUHyR1HesQ5H7vGyvVNAmufXihV8NfBJU1nKifsaN+I= 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 1774630115735738.5362458528978; Fri, 27 Mar 2026 09:48:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w6AJs-000753-At; Fri, 27 Mar 2026 12:46:00 -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 1w6AJ5-0006ei-AV for qemu-devel@nongnu.org; Fri, 27 Mar 2026 12:45:12 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w6AJ0-00039C-AO for qemu-devel@nongnu.org; Fri, 27 Mar 2026 12:45:10 -0400 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-b6ce6d1d3dcso942030a12.3 for ; Fri, 27 Mar 2026 09:45:00 -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-2b0bc882339sm63890655ad.43.2026.03.27.09.44.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 09:44:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774629899; x=1775234699; 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=OGa6TMkmYmwI7/7vLSYxk6iKMksC7GlEB26vrLcMz2w=; b=h2ljZiciT1Ik4VA/f+R4xnNVGcPuqbgvDY+fULzf2pINNJqQ0EHoMEMJb0HOVEki0Z b+G9dOIOM2x5+tTVU85jC5zuKS8CjLQgcMMSwwTFyJzIxiZH/s3y/H6HKQtS+I5wgumm qk6VrZsYwXZpbwpLEbEtk07njpFbEBAwGEXCUzY+YqbqkQyKT+ikqA4VY0OfAcHYoR/2 JemHCcH81c7DOWVOgcfxmP1Xtm+fOeg8Dbmhh6cBt+O6jQb9JGylNJOo/ZxNf4KwOM0v NG4QfCV4iZjkzU2O1ZHgrtv7kGr61Jvwe6xu2SVH8mrUm4WJalWy0Bt9MDit0rnhG4a5 tlOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774629899; x=1775234699; 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=OGa6TMkmYmwI7/7vLSYxk6iKMksC7GlEB26vrLcMz2w=; b=rRdyHlwwELv7A6moAXlWIaXpCcKluNDRNsMql2bsP3qmvPHL8GywJp9wLsCyyClYp3 FzmDkvQs0h7kMUdW3Af/milVm+f/8qWbhnxOwELXsOjmW6hwlcDWo99oEVpLlGUztlKE 9KoUoDiUQJvzgJTe9Jg5tGygH0fDA1yZqpEjnEWxDEiOUD3BSe/NBD2vlzjaJcrV8unU I1QOkZFGlkm5+WGE9s/wSJ2GFILsyXs2tpClpmBkv5iBGtT2WXYQp5ZvzSrlIb+0UFY+ 0CtCjFiaYLEZTXQZgkcpojxpCFLT/E7P8TiJTqzNlb6jiRBcTHRbaKVwxLWPqyJ9SCKp Rlrg== X-Gm-Message-State: AOJu0YzwBhHV5zCBcOk9n7vfeLtnUIpzk8UldwVK4Lwde0p4jrR4+kf6 cqISBqsy0U1acTh6bJ+CMS5FXU8QmNff9wb6/WMKCF0L6uYoYPEtF69o5nZY9eWfWH2FOoJUhLZ g3owfz9k= X-Gm-Gg: ATEYQzymFxkk+EMvTKsE4OeCL7VlGEwSknB91GoiThYKXYdVXdZKIeBBr4Z+BmyL8Pk 9XRrmwW5wugh9iy/0bCCweD71ymv44VKnpU2S4J0HNJYGJzwKMuMPErakwIMX6LJLyKO9omrb7X SZv6dJofwotvWKtyQ/DpN2+3KifEUwEGvF+gXhsG1ENeKbY6WnP8smUWPLMaiEpF1OqzczrjaJQ uwn5dOrPUKNxj5ko4cLnsWJcj6074uFGuEVPnttIX7qxUi/bhKfoiI2aiCjY5e9CO2GfwJNNIH0 BeHC0DGz1qBioHMX8qCtfhI7tdeEHNh06qioOevsgkhRCsnb0S7M8ZUIQrWpgjUHzk9+R/AaP4/ sNrvZlu4KGE5srz9opa/JpJ0JaknWnW6M+j5PpcfmjqiMNPs5A5c+/cL6mLwnsz/29LVFPrCKBk XN3jJtY3zPCEvnZnDvO705PapkhxHne20SpC9SSfIp9S0DSPwCgqbNylI0N80VVSZO2mipI2ndl FQb X-Received: by 2002:a17:903:a86:b0:2b0:603e:e13c with SMTP id d9443c01a7336-2b0cdc9eacfmr33490565ad.33.1774629898980; Fri, 27 Mar 2026 09:44:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paolo Bonzini , jim.macarthur@linaro.org, qemu-arm@nongnu.org, philmd@linaro.org, Peter Maydell , Richard Henderson , Pierrick Bouvier Subject: [PATCH 04/12] target/arm/tcg/translate.h: remove TARGET_AARCH64 Date: Fri, 27 Mar 2026 09:44:41 -0700 Message-ID: <20260327164449.596767-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327164449.596767-1-pierrick.bouvier@linaro.org> References: <20260327164449.596767-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::535; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x535.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: 1774630117284158500 Content-Type: text/plain; charset="utf-8" We need to stub a64_translate_init and gen_a64_update_pc. At this point, we don't need to do anything for aarch64_translator_ops since it's just an external symbol. We can now include target/arm/tcg/translate.h from common code, since all target specific bits have been removed, or can be specialized with specific defines. Signed-off-by: Pierrick Bouvier --- target/arm/tcg/translate.h | 10 ---------- target/arm/tcg/stubs32.c | 17 +++++++++++++++++ target/arm/tcg/meson.build | 1 + 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 target/arm/tcg/stubs32.c diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index e28eac54afb..77fdc5f3a17 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -357,19 +357,9 @@ static inline int curr_insn_len(DisasContext *s) /* CPU state was modified dynamically; no need to exit, but do not chain. = */ #define DISAS_UPDATE_NOCHAIN DISAS_TARGET_10 =20 -#ifdef TARGET_AARCH64 void a64_translate_init(void); void gen_a64_update_pc(DisasContext *s, int64_t diff); extern const TranslatorOps aarch64_translator_ops; -#else -static inline void a64_translate_init(void) -{ -} - -static inline void gen_a64_update_pc(DisasContext *s, int64_t diff) -{ -} -#endif =20 void arm_test_cc(DisasCompare *cmp, int cc); void arm_jump_cc(DisasCompare *cmp, TCGLabel *label); diff --git a/target/arm/tcg/stubs32.c b/target/arm/tcg/stubs32.c new file mode 100644 index 00000000000..c5a0bc61f47 --- /dev/null +++ b/target/arm/tcg/stubs32.c @@ -0,0 +1,17 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "target/arm/tcg/translate.h" + + +void gen_a64_update_pc(DisasContext *s, int64_t diff) +{ + g_assert_not_reached(); +} + +void a64_translate_init(void) +{ + /* Don't initialize for 32 bits. Call site will be fixed later. */ +} diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 5f591560551..3e96c77df73 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -21,6 +21,7 @@ gen_a32 =3D [ =20 arm_ss.add(gen_a32) arm_ss.add(when: 'TARGET_AARCH64', if_true: gen_a64) +arm_ss.add(when: 'TARGET_AARCH64', if_false: files('stubs32.c')) =20 arm_ss.add(files( 'cpu32.c', --=20 2.47.3