From nobody Sat Apr 11 20:13:00 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=1775500081; cv=none; d=zohomail.com; s=zohoarc; b=FHM9glQXVeQZansOlxtVmVKfesfZQptQFa9KYtyiotlJO5YDGx4I816GWyFsGDaJsn5CU9M3S4smTzN0uXwsz/vJwE8S6TaR1qXJVLe9UGIVQVnI5FZxqpZwPic6WpCWQ6zaxLk9xq/l/2MHR/aw1kj4mnJThtoedPbMR9VyFQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775500081; 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=LlPwFDDr+q5Z7Q+lOvT8JYJLE7NSR8Cfyj45g3xJxl8=; b=LJdwjY9FTfyyR/5ZF6A9h8zERTvJP9EsWrPD+St68rUKpX/Xt+rzZSt02eLFRCdU6x9RMPlAQKhMOFdoYzFg0t22hltaccBVvu1pqgxez6bVGstf6zgiOORuQkhbjJaY275x+7YDG1VNqe2Mh6YfEkQrfHYrmg39Q8XOqm7Z5p4= 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 1775500081372372.96605850398134; Mon, 6 Apr 2026 11:28:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w9oer-0007ae-N1; Mon, 06 Apr 2026 14:26:45 -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 1w9oeq-0007Z9-AN for qemu-devel@nongnu.org; Mon, 06 Apr 2026 14:26:44 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w9oem-0002Ro-0L for qemu-devel@nongnu.org; Mon, 06 Apr 2026 14:26:44 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-c06cb8004e8so1505790a12.0 for ; Mon, 06 Apr 2026 11:26:39 -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-c76c6561fe9sm12765080a12.15.2026.04.06.11.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 11:26:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775499998; x=1776104798; 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=LlPwFDDr+q5Z7Q+lOvT8JYJLE7NSR8Cfyj45g3xJxl8=; b=YDNqmZO0A7sQSkRUtowXqkNHqnCpuRqAXXl8CGTaR1nH2yhPYxiFBOlRWTq8HF25zT aFanykQXRrwpefMwY5zwfOjYXe4RPYI5iTrqfukU9lcL8kqPdhUiIzT8wupwBN+FlqbP 0FDB5zj2I6LBRBU5GHrkH5dGDVPJGIdxpovPe7hmDuQjvQWGd5i/YzPOx4XHhFZjtVwn isP/Ee0S3uXR+6XUHfL87HJ5vC5rNuIzpFJQ8CmT4p5TfJhVEKYukRRazU6ss491sdhB uF2PygJZZp5ijMhwBqBG/6UMb1YUwhn1cVHivswAUN7j2ohnDetgK9XVZb0fcDroV3Zv 2beA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775499998; x=1776104798; 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=LlPwFDDr+q5Z7Q+lOvT8JYJLE7NSR8Cfyj45g3xJxl8=; b=O62fO7ZFsFCBFffTZt7qlAh5H5HXGekrYVuab0BOOM7G38JzfmMnmJ2o8Y5vtQw+jh kVStcjW2ymfZpJaNxy3nSpioeJSUO2yE3bxQEyu2HexhJdU0cdIK7BWVRiEXtVA3GwNG pAFdjdVXxYmQ6PWottLY0+QAHED7SPir5a2BbkUPy3KoIt96H7kaP6m3kww5ndSFk9TQ cymOxWw7spnUSTo+e5DYY55mnqus5pG1SVVMVEncHjgk6jyvMW3eeU/lonnEpvCE8jkZ GSMZfmYLPCR3AerANFnUUTXws01g2YKuT85qW7vP4kp/oSwFQZ9tEYYwaKoH2cgxFKLk iK4Q== X-Gm-Message-State: AOJu0Yw7jvc0vLBpr2sRnDCi52DHYNOtHp6VhjuVr54QJo3P72+ezZJS Q0wOJGcdGKrAmvSmLibSYlqkWAD9U3E+XuPXdhxjtBoWygNFQCcRio//ZvepQfDyE5VGm6ccy4j /lZVQd02ecA== X-Gm-Gg: AeBDieuVkhaon8JUnNsWMCzVsQzHePUty4KPN1G3QwxeM0UGcIc2wKIyG8Ef9kEYG9O bKK7WkiiraMLCYo/hA/w8LYlh+r2+2ZzDbdWEW7ciWb1DWLi2/kiPc2EAZ+q4CjKXAlWgfpa9JB qYw8nNdNc1E2zFlWe+YTY5xB5bW86ajt5KGFCUpNJhf4eschynz7BM3ZZfk2DeCkxi+PPMs9FmS rLzZmPiKObzlsnfa2QzbaQSulCYUvB0/8cIdDShVnVFtGF9G6WN+o4HIri3STLBW0sKf9E+OwlX ReYCBK00JNPT6vQT1kAvhGH1syycMYAwai/eeFjEq3fezfmre7OlrirTTi6bP8WjKYaUrQYLnnV CoT9EayBOg4CwMbHZk2QIUCwjEzlNXg1MuDcV7Dl5FMYJahKLxz3+S8c+1Bzg+FRofF1X0zTE90 seY0Tw/Ti5dvc1Uu7SUp82d4RC8/moAMt9LJ8tWxA+FNOO4/TvX0ZLfq9uZJSBt7od8JVe7j6HH Bgm X-Received: by 2002:a05:6a21:6d8f:b0:39b:d9f1:6d05 with SMTP id adf61e73a8af0-39f2f2b0043mr13468146637.53.1775499998365; Mon, 06 Apr 2026 11:26:38 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , jim.macarthur@linaro.org, Pierrick Bouvier , Paolo Bonzini , philmd@linaro.org, qemu-arm@nongnu.org Subject: [PATCH v8 19/20] target/arm/tcg/translate.c: remove TARGET_AARCH64 Date: Mon, 6 Apr 2026 11:26:08 -0700 Message-ID: <20260406182609.193886-20-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260406182609.193886-1-pierrick.bouvier@linaro.org> References: <20260406182609.193886-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::534; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x534.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: 1775500083792158500 Content-Type: text/plain; charset="utf-8" We extract aarch64_translate_code function, and stub it accordingly. Suggested-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- target/arm/internals.h | 2 ++ target/arm/tcg/stubs32.c | 7 +++++++ target/arm/tcg/translate-a64.c | 8 ++++++++ target/arm/tcg/translate.c | 19 ++++++++----------- 4 files changed, 25 insertions(+), 11 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 ebab9f36f08..db3990576c0 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -10948,3 +10948,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, TCG_TYPE_I64); +} diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index aea38507ef4..9a971325144 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -6906,19 +6906,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); - 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; - } -#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, TCG_TYPE_I32); } -#endif - - translator_loop(cpu, tb, max_insns, pc, host_pc, ops, &dc.base, addr_t= ype); } --=20 2.47.3