From nobody Sat Apr 11 18:36:45 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=1775706668; cv=none; d=zohomail.com; s=zohoarc; b=oF2YfGdsBqM9YY+49gSJ7FO3WoN1JVDFFnn0cmtNnQ10O3viLWmFSkD+tHmKCWUAEQd4QnKpNSEzPNI5qXk4ecr22cgDPM7PsoNTOqRTN8JfdeCarXior03Ebh5si+LBayF754XQCpKs2nb0Az4xWrYs1WBFp9F0/rz1p+2cAbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775706668; 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=BUCaCRnG5cO0Qr9pSbvI++qV5vg2E3jOIqFKVDItLZk=; b=WaBPy9hb4ZfCldTAf0gXWM88cx+O2GtAk+TzirgpoEi3ZgO2TOKQyefAdP6rGYVn4PrizvBxTgj5f79fHsSP7q1Iks8df/MTJ/QBcjEnAttaJP5nCYmT0+LEQhC4zAP0+t/cD8Dg3MY7NPNE10fqFvm0h/7pnpfvKX+84pFRkbg= 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 (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775706668789131.02883002243254; Wed, 8 Apr 2026 20:51:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAgPY-0000dU-O8; Wed, 08 Apr 2026 23:50:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wAgPY-0000dK-3T for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:32 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAgPW-0003sK-I1 for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:31 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-c76cce85bd9so178247a12.1 for ; Wed, 08 Apr 2026 20:50:30 -0700 (PDT) Received: from stoup.. (124-150-69-109.tpgi.com.au. [124.150.69.109]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2745c480dsm277830605ad.0.2026.04.08.20.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 20:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775706629; x=1776311429; 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=BUCaCRnG5cO0Qr9pSbvI++qV5vg2E3jOIqFKVDItLZk=; b=X07824hQFj9JcH7/V4M2UnBihPQYMbVGo55YAle6lneHwfOcWZghk7CkBEa13QhYP7 whtRIurIcoR0cn3yktSYCUDxOwXQO5i0vGfSVVBbXL0GIDqYTEWXSgsEFYMPSkNedTVd c63LDRoK6LQRG2dtwmpGPhwQFOxgX6ttUFtCl28mETWmcQU/cfANoyj/Hi3DKWUJGL+3 jfJXlkrf/JBs3DIibZppkjbGiwHIDjWXRDPSimaTyhE4w754S/wURPdbWW+Sg5fby1tZ jO3MB/VFcT7fAUz5qpUee7Z116AMOlnNrwFWY8buq/W9fh1r6u3zvuUxDQaoo0TwxEmm AZKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775706629; x=1776311429; 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=BUCaCRnG5cO0Qr9pSbvI++qV5vg2E3jOIqFKVDItLZk=; b=EEuRdS3jZgeIoBbqD8luXEp2AiULFHOrW87vNE4UsbVZkwjtGfhME//VYzEUMk+Tb+ UU6a102ZImq+A/+i6UpD3S+v+XNqLlQXst+BL6sJuROO72gc5d7SfO6xpqbxs1jOiu6z Th+zIjJiat8Ng2oHJZHguUhCky87WoaB514COkzQ3A2rC700Zt67h1L1ggypAu91VEbJ i1ay1Y4rw/4e0V24HPl/07+uXUd2Zvx5SBdGxz0GFian/1ST2J8b72egZQFAyn4XqjoM GzaFErstVdtjN+VKaGSt/vrju4c/yXYuIS5//7sIBlOwz88ZvnTC7x5LvTym1ezP7z0U Oa5g== X-Gm-Message-State: AOJu0YwD3MgkrNiPTrqSox02CrBabUIbdEcCGCoUSv5MmITWD8c3uXeY UvJDhABTUrmFk/a5owh5OjFx5HfSAK2jnbkaPtbthWbky7xtQebXgdtg+kl3vx7mNBsaX36H11b yjnVD2wg= X-Gm-Gg: AeBDievpZHljaYMuJullp0Z0y8sGjQaMINVLJ0scYAUr8Wr5PZ7/coBgGeC9V0GCMg5 xAmJbkXId6lj559MEpAVlaN3cuTFx+pVGT3ciTZCW5PTnrnJd/VvJ3ux7X7OJuZVN87gHaHOGua UnGheNpVNNPAIewfqyuYI6T/cHJd7yO3bcT2po595XZzyUr9WFYFN3sKLQF7Ms1u5K6sA3YKzpU IKilPkjS1eZQrtuYjI/lPr6BuvIuBbVzWaMMyl9ei7nGFjh3l8KxOvYJMgmW+qeJoI8DOgbz/M1 yLvhQfjaCHF8IoiqNqZUYIWShhkz8Nj/9kmkZCI4m3KIv6C42S4YqTwZsLeE3NKcFHzQNJUhKrz 60CtEk9j3zjbXnsW8SohGMViKSQU67bym+3eIlaa1FuK08oBtga+0CJ5qN1ArA1T7JYxaGkX4xZ veUy8kklMbK1AtrlBKueYRz4rXF58icMINsok6DJLsjDna1+l7XVG94veJ X-Received: by 2002:a17:903:3804:b0:2b0:59c4:e9dc with SMTP id d9443c01a7336-2b28170f376mr252658085ad.22.1775706628778; Wed, 08 Apr 2026 20:50:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, pierrick.bouvier@linaro.org, philmd@linaro.org, peter.maydell@linaro.org Subject: [PATCH v2 2/7] target/arm: Only define aarch64_untagged_addr for aarch64 Date: Thu, 9 Apr 2026 13:50:10 +1000 Message-ID: <20260409035015.132370-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260409035015.132370-1-richard.henderson@linaro.org> References: <20260409035015.132370-1-richard.henderson@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::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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: 1775706672238154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpu.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index b62de8addf..35b661904f 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2262,7 +2262,19 @@ static const char *arm_gdb_get_core_xml_file(CPUStat= e *cs) return "arm-core.xml"; } =20 -#ifdef CONFIG_USER_ONLY +#ifndef CONFIG_USER_ONLY +#include "hw/core/sysemu-cpu-ops.h" + +static const struct SysemuCPUOps arm_sysemu_ops =3D { + .has_work =3D arm_cpu_has_work, + .get_phys_page_attrs_debug =3D arm_cpu_get_phys_page_attrs_debug, + .asidx_from_attrs =3D arm_asidx_from_attrs, + .write_elf32_note =3D arm_cpu_write_elf32_note, + .write_elf64_note =3D arm_cpu_write_elf64_note, + .internal_is_big_endian =3D arm_cpu_internal_is_big_endian, + .legacy_vmsd =3D &vmstate_arm_cpu, +}; +#elif defined(TARGET_AARCH64) /** * aarch64_untagged_addr: * @@ -2286,18 +2298,6 @@ static vaddr aarch64_untagged_addr(CPUState *cs, vad= dr x) } return x; } -#else -#include "hw/core/sysemu-cpu-ops.h" - -static const struct SysemuCPUOps arm_sysemu_ops =3D { - .has_work =3D arm_cpu_has_work, - .get_phys_page_attrs_debug =3D arm_cpu_get_phys_page_attrs_debug, - .asidx_from_attrs =3D arm_asidx_from_attrs, - .write_elf32_note =3D arm_cpu_write_elf32_note, - .write_elf64_note =3D arm_cpu_write_elf64_note, - .internal_is_big_endian =3D arm_cpu_internal_is_big_endian, - .legacy_vmsd =3D &vmstate_arm_cpu, -}; #endif =20 #ifdef CONFIG_TCG @@ -2340,7 +2340,9 @@ static const TCGCPUOps arm_tcg_ops =3D { #ifdef CONFIG_USER_ONLY .record_sigsegv =3D arm_cpu_record_sigsegv, .record_sigbus =3D arm_cpu_record_sigbus, +# ifdef TARGET_AARCH64 .untagged_addr =3D aarch64_untagged_addr, +# endif #else .tlb_fill_align =3D arm_cpu_tlb_fill_align, .pointer_wrap =3D aprofile_pointer_wrap, --=20 2.43.0