From nobody Thu Apr 2 17:21:41 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=1774630359; cv=none; d=zohomail.com; s=zohoarc; b=n6x/uoDBZtPgmfvzz6DjJRr2aDK8OSIAlk8xiF8l6Lae43l/qOmJAIopRfOiEKUAjDybdrYzKvhJ40IIX2EqtVbNG0NdXraS9Ph9+iqEUVd5n3/kGcgt5QWWiSU5HtiBcarpzDzUUW8OG4BZup3f+TggNt0fbWbqxDX1FReYXOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774630359; 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=DX/bojzESdd/nMTMfR/YzLHSz15MCAnc+7A5HExD9cvcwn3Cor5hWLiB43+uJu00rt8i6azzPXGE+RPEZxkA0oRVO9R1lkX5Iji6DW9qbAEj4wodhibXraLq/CeURkB3zYy2FjFJYjHf2b+m04sh/Bn+3YnXrMB/9nXwEk09bec= 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 1774630359963890.0592518002135; Fri, 27 Mar 2026 09:52:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w6AOx-0006I3-6G; Fri, 27 Mar 2026 12:51:18 -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 1w6AOd-00067m-GJ for qemu-devel@nongnu.org; Fri, 27 Mar 2026 12:50:56 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w6AOb-0005Ee-3M for qemu-devel@nongnu.org; Fri, 27 Mar 2026 12:50:55 -0400 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-35c0e7b751aso2247385a91.2 for ; Fri, 27 Mar 2026 09:50:52 -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 41be03b00d2f7-c767399e0casm5514038a12.31.2026.03.27.09.50.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 09:50:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774630252; x=1775235052; 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=NLyadloic6PCp8ebOG/J7vzhwD3BwgQ2QtLN5rJCdNF0oEvBu3FhvR1X+FlAvd8ofo SkOKDDBUKaoXpENKxQALvqIbYWlx8wHDKyUkoBIOO/ektM1YpvXr5bBItu1O+tnEvr47 8ZA+cpIgDPuN2HURSKdE2bQNPOudAS9Vrd+cFOTHzBmh7r4STsY9YqB0MoqtrJbnkTFg ZhjTxr9+BAn6XqOUhDW/KXO+282LoKl1rMWqI3XGrtt6LPkBg6fO7poei7LVwp+dCAGa HWr35J1RDDtT/ZpGstgK/SBJUG1m5bBgSMWjE0AWDDJcYYZtFMrdcxwf+NeILqxBUnlY 3NJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774630252; x=1775235052; 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=g21Rldh95tGZ7DjQwAy7jiJ0z8nOv9KkPjOBUKnZIns4K77cbxgtMvWcwJbSkX0xvL D+LISWB7ytJlYhwEprnBm46WvCE9oVyok7+JcfMti/rU92ESczrkWW3dEXYMFiuCxe+i 5td7HPCV5vql+676y5Gyo0f4fYxcHwPQL9GlTwmTnUYRqX4Pc+lRJStMXJD1pSOWoxHb pUd0dgZFDi3vCrAAstkpS1ROyrWHVXKXDP9b7oyNpQTXu8mjA6uGx3xrCuOlHFI0qjOI TaQeGmx8kSKfHEvmCam2S0tnOBcDDy0ENyqolIFVH/WHNC4FVzCsYQYdGHp+3A1HDT9W 7+yg== X-Gm-Message-State: AOJu0YzKgBWnm41o9Pg5iPHUFOAbQsmrKgN9eq7BaSrHmaCq5QyEUrHj hsruS/0QLSjcJJ5mBlEaIR6u7X4WEmSchgcBMe7adcQF0STmmZ9memKiKeejTPh8EsMCs0OsUKC jkXWO6WA= X-Gm-Gg: ATEYQzyHz/hg922gB+zEkYx7F8wRxKlzqjt8k/p9s/LY2Vjs/+T+rl/OH8I4DiJ9LIx ep0qU6sFj1cuI4a2rKwEtg62Vm9a+z8fo2+zvwgMp89Om8r45zhHM84PWfpB6g0S+D6OWT1jjVa PvvSEDPtYxZ+8VFQ4WdyVK2eG22qtnpdAGQ/5+C+OszIqDPPznI/3pgF8ZGzJTcGHNCtMR18R8l xYt8IJNx12CtyjyP7nA98LUC0ppODqSpOUBbwfr2m6b7obNfE3+1kIU3li5j9td0NFjZLRTbq2z rnvSpvfqVtqke1XHmILNkGKVCa0E6sfXgVdesg428z6HrpdnoGhYMh2UNmeVuKIigiNFVh6vOca dIh85eqrhN2KqDU+37SQi2tO7vVa4tcnRX5IkQHb5Bs/NMBWIBq+r1r9cL3RMxUVfZJgLzw0+xr Gm+0MqYwEGm/bPtUJVdlJqUDc4eWEpKgCYZvshX/8V9eEoqYL8jgLNRPMe4b/PRT3iMC3sbZVnP CuP X-Received: by 2002:a05:6a21:998a:b0:39c:1f90:284e with SMTP id adf61e73a8af0-39c87c283ccmr3652110637.53.1774630251532; Fri, 27 Mar 2026 09:50:51 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, philmd@linaro.org, Paolo Bonzini , Richard Henderson , Peter Maydell , jim.macarthur@linaro.org, Pierrick Bouvier Subject: [PATCH v5 04/12] target/arm/tcg/translate.h: remove TARGET_AARCH64 Date: Fri, 27 Mar 2026 09:50:34 -0700 Message-ID: <20260327165042.604105-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327165042.604105-1-pierrick.bouvier@linaro.org> References: <20260327165042.604105-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::1029; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1029.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: 1774630360556158500 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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