From nobody Sat Apr 11 17:11:15 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=1775706730; cv=none; d=zohomail.com; s=zohoarc; b=D7EyynW4kz5Q0JuOEa4YHpaD4VMaJk6d9uQTDuXvK3rmyZ/5m6WEsFE9ahGbG98zhQ1nDA0senk0+0hFrpInpNKIqR8id0kCQhZQWFqUqd9l4ibt2aC3tC5y0NrWG+5jyOpiuWHyqj8gB8pYZWtRZxIrhLiKv7LksYv5fGAPLkI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775706730; 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=55UsHfoXIZJX5HDmSBm+VBjP3s+ERxMT5nq/26CP9kU=; b=nzdgVxayCGlibAjKaHjjJoCcm04QSIGdk1zGu1wyPx4eOw9HOb9h05m/j4ico/AGYfIF/YbX4c2ttoCYFZF7XhHVzYaNMRoM7uVxCRJcoHTPUSCQnK2EwrsjoMgS7W/TaTyl31gYcn/YSIs7i4VrRxtN2a/yfW149fns40tzW3s= 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 177570673079374.2245041679754; Wed, 8 Apr 2026 20:52:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAgPW-0000ce-4e; Wed, 08 Apr 2026 23:50:30 -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 1wAgPU-0000cA-SA for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:28 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAgPT-0003rm-6g for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:28 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2aaf43014d0so3094695ad.2 for ; Wed, 08 Apr 2026 20:50:26 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 20:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775706625; x=1776311425; 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=55UsHfoXIZJX5HDmSBm+VBjP3s+ERxMT5nq/26CP9kU=; b=RD99PV9g0LzthUwLwTpqqi+Edb8AMRZGCc445XLKwAqC5Z6hi3gI4CD8ZEByUNBdMM XJd+Mz2+LqOcNGjwHAdEkOynlbx1qkS8lvzLwICTIHwwpHovV/lK7iSeLhW8vXiPK5Ye Y+I+gdgv/kHFb3iZCm2sON9a2QkZHLs0qthqcY5vBXD7NTupzSsLMSAPKQ9ZnS3Zq+/f TiuKxAJ8Mlg9VRjK1leWgJoUMf4fMwc67Or4ScJhFZiTWQGz3y4yFfvq7gJCW3cMpnaN 2ofLmT6ClGSCmo+pqqS6XPYIksGElE9qQcHRTNJxjdcmPtllgUiwP2MQi891+O4x3YKD OdDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775706625; x=1776311425; 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=55UsHfoXIZJX5HDmSBm+VBjP3s+ERxMT5nq/26CP9kU=; b=o8f2CT7FXhMHa1+6kOLlmwtmehm29USA9JXvQrIj0Uh4Ph/BBxVMTxLWhv0Hy+h8di e1HXmSKW9RkgwGWLoRfSVsj4I0fHjGACpCqzAv4q0nyUH0ID9gMq6bRW8IWiFjMahDCr s54aqZnQZ48gCRG4vHX/2hYWaCONSGeYKIJwP2tNGWUf/SyELI1Q4G5x1799fLb2IHak J5s6pwXwN4qpPHqGWlvwgYYzF2MX6v0Mh1ojtMH6dkygDE1E7xNAUcp12tg/nmwAeWg/ FLVwYHZK5gKTYAj5rVBkLbbuOWDgTzfCP4mwYKUroeHNCgABp34gkSWQbZDzo2fWJ8Cp ItEg== X-Gm-Message-State: AOJu0YwyS8+IVzUssjefGmnaHZETqPssm7FDrWp0EmQz1ULh6ANDzoTD nhAh4iu9zkCMg2kxTkT4VeYZvC9KgHaGYB+IUzvnLpYzzgC3i0gxNuC0OhYSzWq4w5E5ujS1BHV JcpMjfsg= X-Gm-Gg: AeBDiesWnQ3czYtkIuZTdBEvF5aYFRh9DiU0z71mr3NwRyD3cxTZ13ukwCy0hjtqL37 11AwT4Pu8cVzDDeg4cKjcv/qEZKuIjgO4T2c1Tpz5GY05SAF6L0SrUtvWr3fFh7/Bsfvxd63HIR 58ceF506+RX3SldBryDKwcIMdLudmc93SToIHqxOTRV/m/KJplBMsWrZqlCDcx0UyfIxoKS32Lc nRyGIC/K0axhsmbMRFvsSRPUAga2/yHAUxKU8G4F1movTMwJ+lfIN3/jk3ZINZn2ibhWI17BgHv Dr0P5MH82U2u5BFeSg9ne0Izxc/rBUgUc8YTBIbEnBnAhtOoKOWAUYK8fdh72BFwP973OSAVDem sjPIeW1vhxyQGHnv1fqij14/YEcoBdp/fiSnz9nUm2QbtQBKRI5w+0PyrHu5jHiP6+MStVP3sh7 ODGAv0S1a7UoJ+EuHdn3MANoEvB2UbgIUdN2qdiTHKy0bPsxONVHQEynIr X-Received: by 2002:a17:903:4b28:b0:2b0:52b7:e82 with SMTP id d9443c01a7336-2b281867dc8mr217618225ad.16.1775706625521; Wed, 08 Apr 2026 20:50:25 -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 1/7] linux-user/arm: Restrict regpairs_aligned Date: Thu, 9 Apr 2026 13:50:09 +1000 Message-ID: <20260409035015.132370-2-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::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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: 1775706733194154100 Content-Type: text/plain; charset="utf-8" The function regpairs_aligned is for extracting a 64-bit quantity from a pair of 32-bit registers and does not apply to AArch64. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/user-internals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h index 24d35998f0..e65373b204 100644 --- a/linux-user/user-internals.h +++ b/linux-user/user-internals.h @@ -136,7 +136,7 @@ void print_termios2(void *arg); #endif =20 /* ARM EABI and MIPS expect 64bit types aligned even on pairs or registers= */ -#ifdef TARGET_ARM +#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) static inline int regpairs_aligned(CPUArchState *cpu_env, int num) { return cpu_env->eabi; --=20 2.43.0 From nobody Sat Apr 11 17:11:15 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 From nobody Sat Apr 11 17:11:15 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=1775706696; cv=none; d=zohomail.com; s=zohoarc; b=MPQ3EWTf/KHxRSj7+c049LMVf5tSyfHBWhisLA/LJKsIrvriUEqBG7j+AgcJgsblclC933E3kbA3OYJKazET0RKCkswSpVfCDrPB9ulQLcFnqg5OESGYZYZsO+4/8s7Nrfz7Xr2mKUBhE++vxQUn212RxzTrmiixe0N94GPJBZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775706696; 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=skSN8swTI7EkG7MjAECKBkEvBElR0vgImQ1L9hy0ps4=; b=RaPC1vpeti40fzpjZJIQBgUcP3Hpx4WJsN2xtQcHOSq6UoSUFXXsqgNLNi4o+Qx0XYswQ1QAY9ZUSdPn9dQmmkokddCYuUKcBnutvBYJ0/eYOqw98b7MVpBVUneIMeO1H4YGrqBm0qUZ7TwrFXt2i69fXdzagXtMJrGPU2u78KE= 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 1775706696722286.4928697236626; Wed, 8 Apr 2026 20:51:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAgPc-0000ea-40; Wed, 08 Apr 2026 23:50:36 -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 1wAgPa-0000eJ-Qe for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:34 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAgPZ-0003sf-DF for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:34 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2b2ae8a0103so3024235ad.0 for ; Wed, 08 Apr 2026 20:50:33 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 20:50:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775706632; x=1776311432; 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=skSN8swTI7EkG7MjAECKBkEvBElR0vgImQ1L9hy0ps4=; b=I3HjK2Y+j8jlLwvol61wGCpZya+FPLFckil8EoO8TbfdhPbVGxq4queqmTYtljYOGX blPdCsCw01/QmqImMQ3oDTv3GtNCbol8zSKURTCI/yPxeIoVDxBQnZTrTbqg4aSfe8Pm 80eSyjmxNb2Zg2g7+PhqbGAyatfUXOW/TeqweooCB0vgNi3IyRQTqqnn2YjiPJuzlBpa AgHNGfu5d3p0rdv7BCTWtf1iqRUveumH62/XrTadm1taBSb1cvjXykmnIBARK0KJjRm3 sXpbb32UhZi0xuxeGp5zqeoWqXEFwiybi8A1CKbfJNh4YbxayM3SxS0d4xX/nHDagLn8 Ly+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775706632; x=1776311432; 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=skSN8swTI7EkG7MjAECKBkEvBElR0vgImQ1L9hy0ps4=; b=DKqh0GTspmKKgZnp6pMEDmsLOwr0gkFqmhO5gO6LI5+l0E97U9yXmnXFALvhsz9Vnm mdws2Dk+lUFf9g2eusmKw+7wEY89EZn73KYw7EioqsvXETUsF0iN6JYf/CtO1RMA5CYJ oCUWW44y94Yb1JhqBh7z+LZA6DyrLwgHSn2v5R33Cj6lO2Z64KV60isZ/HJxEI5F4bd2 mq/ctUPP+eAIhJzQskDUEktbSNVjV7MAEj8ROOyV9sh2/J+Iu4fDi73ZmrtiGpFYJ7zG 4ULw/5eyW2XKQ1Lu282SY50V8lYfUhf1POSHIL2ICoByYCuVfTlU574KqQ4mkhszz6dl HKtQ== X-Gm-Message-State: AOJu0Yx+s4zgvmCvX7IwKQpRBCIedhlM/XJ8b2dB/DhWgcwIOKKMveMy Kv6M6GEgbKYo+qmAyQGRtYKp31KgsAlF6RYh1EpKES50jixJq/NmaMS3SfI0hwEYKBCEdWIKEL6 1E3SOyic= X-Gm-Gg: AeBDievVpVV9pGI1krbCPhX+TsV+1kIJgQwOwhOh0KpIej4BXGfwBnKbgCxx+lriZQq CUD6ZrY+AiRP/LLRCcTv9Gf+7jFCJrkYXxzOihSei6bTFo065WOFHfD86RgbpL1QSRlUAbhiWFm /DvqQw33O/us4ZoS7nNtp8P6OT6B4oqBJ8lIacLhVsMrpXG/DFs1FstItUI+nzTqxuoiF3ZuDaJ rTYFH0X2643ZD3mFuaytLlREtQhX/hLWTOsCrUyAOml9boNVilr1yd5VZP4iOsqpCONcXA+fpAX L4NIoqZG+UNhV30WjBfg2TgjBya5Jl7OdpMhpssckBzotGvHIiuDPOwxvpR62M5qqcGmUGveBOW Ngx/6LdtwnwQ3DZKToUutO5+vWbLUt7hFwx1e7RCvXyNiQi/kO+QIRq+WPFArSm5ooZZBeJMYGD F88pzmFFh3qXaY9Cn4oByrpe+4Ov1CLMfxDbdLd0kGD1avisGQbEy/NvCW X-Received: by 2002:a17:902:cf10:b0:2ad:9b86:ddc2 with SMTP id d9443c01a7336-2b2c73acaeamr20502745ad.22.1775706631956; Wed, 08 Apr 2026 20:50:31 -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 3/7] target/arm: Segregate target-specific user-only fields Date: Thu, 9 Apr 2026 13:50:11 +1000 Message-ID: <20260409035015.132370-4-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::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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: 1775706698940158500 Content-Type: text/plain; charset="utf-8" In CPUARMState, we have one field that is only used for AArch32 and one that is only used for AArch64. Use one more ifdef to avoid adding both at the same time. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpu.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 657ff4ab20..b11a31c807 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -812,12 +812,13 @@ typedef struct CPUArchState { const struct arm_boot_info *boot_info; /* Store GICv3CPUState to access from this struct */ void *gicv3state; -#else /* CONFIG_USER_ONLY */ - /* For usermode syscall translation. */ - bool eabi; +#elif defined(TARGET_AARCH64) /* Linux syscall tagged address support */ bool tagged_addr_enable; -#endif /* CONFIG_USER_ONLY */ +#else + /* For usermode syscall translation. */ + bool eabi; +#endif /* !CONFIG_USER_ONLY */ } CPUARMState; =20 static inline void set_feature(CPUARMState *env, int feature) --=20 2.43.0 From nobody Sat Apr 11 17:11:15 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=1775706724; cv=none; d=zohomail.com; s=zohoarc; b=IcdKlzDvoZppMNbDRoGNpw8sj+v2kAOFHqEh33EK6nNvhthWOt+18/147Crvpxiuvl2QOjGossgPEma6vbw+FwIV5Wurtz8k6XrkZCWB2oLku521Of9wV4dwl06tuIHmAb1PTk9mueplMWt7DgG4TH6znRcfcWNicT8A7CAWGvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775706724; 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=YZgQTS24GRUW9F9mDekJ69gAxd73kOMLRaKq2o0x7oE=; b=N/iJ9rh/ShifB6Y6w1VDg6AkhTtLazQDojurmSrsXmFjai/tTYKDuqzMX5v6lAaenZjTckB4l7d4LQsXQD8sqzQ8ToCkppHTVFSns9xendPh+jPL/l/asLNHUuFuucYoFuz1Bqq9vXjMlnb4/gw2rI5KhFBQh3O7rydYnBDcNoo= 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 1775706724416688.6113025878112; Wed, 8 Apr 2026 20:52:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAgPf-0000fX-Hk; Wed, 08 Apr 2026 23:50:39 -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 1wAgPe-0000f7-Cz for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:38 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAgPc-0003t1-Uu for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:38 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-2ab232cc803so2604975ad.3 for ; Wed, 08 Apr 2026 20:50:36 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 20:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775706635; x=1776311435; 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=YZgQTS24GRUW9F9mDekJ69gAxd73kOMLRaKq2o0x7oE=; b=Qe2DRoaTv8zIUbqRUx8XGpQnUUfqBLf48SGdMKOdWJvxmgpJvYAaXM85rfWI53ue+0 I09bhNIq5+a078mV0jXQirc3J/JmeTgaezS4CdIpIO33sMmeTSTKANV4b5JzfjdGnEFl mkKVJ1CEPZhUEWdocTvPlvU3F3ARb9N0iOxsbOoYKc7LAZoooilMYkWCA+JaRAhTAiVK R+ZPyc2MHjc0w/SByoFwiguLBS1H1ZFWKX9LRxEBdsOYatgEChxvWxQGBvkrRWrVRniT bkUGw6hGLSTcTLTTmF3cLt4XNH6ONOhruuybXHeJoQoxJHi2PFuEpEynxhgTBhrv/DMU U0IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775706635; x=1776311435; 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=YZgQTS24GRUW9F9mDekJ69gAxd73kOMLRaKq2o0x7oE=; b=VlcCjChIt2FQ09MSVOwDawU6t2QfccYrEf1u00jeEmJDFgy4dmwmKmp0oeUm3rqDKv eGZXRYIdNY7SzSpMW/3KdlLLR9+568mYhy2IOiWxjveenytyjJu25ib2FGn80srHgZkO NtPQPCJd+rzL+E0y+WegWkemaFI6o2/M/3e2MFlL+WcBoKElrGE+gSat75Cg82nebIG/ lVpUEDJVZIkDrCkfhcQxQbpc5QMnQITZAxfmveXDm4AMmyOYSEz+8r2hBZ9tOGEKiI1r Lj1jtfWqD1msNyXOkhbUxXgKCDvh8CUGpdoxDK6dWI5z09XLLj5WetqzbS5dsMHiBYpH 8Eeg== X-Gm-Message-State: AOJu0Yw8jvwzsZz5naBz07hrSp+1n5q5YftiACwdK1BkPncSLM8kt5ZJ gL7LPUAjz2EXFloqvkjQrQbIGi8Rs2+CGASUWkwwSofQUbNEfE4ceVGpIHQDbAIJzqNmnxaRjpg 9vMB297M= X-Gm-Gg: AeBDievt07onRrANRElWlNJAxg0drKHBO2GZ0EsuYtXE730WerJTdCQuVESXpTIZQsZ jkdWmSyygDedKxA5Dd0MLeFiSPO+KR6t7ZjNHUCJHO1GDgSnkg9rtet1rBARjpBZ0gUtkjYpRs2 FsMtKoE9WYHx0kEW8Blq5104Ap5LQdaglZpacQfXCkSM6t2UIpZB1KEMeam6+f0CP1gLC22WLUv /x2u9KPQFGoF7HYn0w0Z73Z7pI0hmrpuWpN4z/o1SQtm5OI8VPjCUTe6S3qwNjrMN614U165YUx K7bvoa24/xjmNKI806DCfHZlbZ3K/KpK+CXIgrHctSRKmVu6oszjJIoy/O6Ym4spUkg6jJmOzV+ 39QBT6inU6xnnwV0wA2csQe1beLEUXyaPiSHTnX3c9yWXXshH1F8cn6aEbpGF1+EJbmTyj/y/uD oFpl8GDwiBKBIe/H2QxHxDU7pqK4OmPE5QKOXoit96Omyxxkr4NUJB7Mos X-Received: by 2002:a17:903:3904:b0:2b0:5ae9:ee4 with SMTP id d9443c01a7336-2b2c73021e9mr20265515ad.5.1775706635409; Wed, 08 Apr 2026 20:50:35 -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 4/7] target/arm: Store SVC immediate for user-only Date: Thu, 9 Apr 2026 13:50:12 +1000 Message-ID: <20260409035015.132370-5-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::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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: 1775706726902154100 Content-Type: text/plain; charset="utf-8" Rather than re-reading the insn during syscall processing to find the immediate, store it in CPUARMState during translate. Signed-off-by: Richard Henderson --- target/arm/cpu.h | 1 + linux-user/arm/cpu_loop.c | 13 ++++--------- target/arm/tcg/translate.c | 19 +++++++++++++++++-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index b11a31c807..5b564c7113 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -817,6 +817,7 @@ typedef struct CPUArchState { bool tagged_addr_enable; #else /* For usermode syscall translation. */ + uint32_t syscall_info; bool eabi; #endif /* !CONFIG_USER_ONLY */ } CPUARMState; diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c index 19874f4c72..86f13ad83a 100644 --- a/linux-user/arm/cpu_loop.c +++ b/linux-user/arm/cpu_loop.c @@ -271,7 +271,6 @@ void cpu_loop(CPUARMState *env) { CPUState *cs =3D env_cpu(env); int trapnr, si_signo, si_code; - unsigned int n, insn; abi_ulong ret; =20 for(;;) { @@ -312,20 +311,16 @@ void cpu_loop(CPUARMState *env) break; case EXCP_SWI: { + unsigned int n; + env->eabi =3D true; /* system call */ if (env->thumb) { /* Thumb is always EABI style with syscall number in r= 7 */ n =3D env->regs[7]; } else { - /* - * Equivalent of kernel CONFIG_OABI_COMPAT: read the - * Arm SVC insn to extract the immediate, which is the - * syscall number in OABI. - */ - /* FIXME - what to do if get_user() fails? */ - get_user_code_u32(insn, env->regs[15] - 4, env); - n =3D insn & 0xffffff; + /* The 24-bit SVC immediate is stored during translate= . */ + n =3D env->syscall_info; if (n =3D=3D 0) { /* zero immediate: EABI, syscall number in r7 */ n =3D env->regs[7]; diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index ce427c5a3c..ec21e33a06 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -1158,6 +1158,21 @@ void unallocated_encoding(DisasContext *s) gen_exception_insn(s, 0, EXCP_UDEF, syn_uncategorized()); } =20 +static void gen_exception_swi(DisasContext *s) +{ +#ifdef CONFIG_USER_ONLY +# ifndef TARGET_AARCH64 + /* + * Only 16-bits of the immediate are recorded in the syndrome, + * so store the entire 24-bit immediate for cpu_loop(). + */ + tcg_gen_st_i32(tcg_constant_i32(s->svc_imm), tcg_env, + offsetof(CPUARMState, syscall_info)); +# endif +#endif + gen_exception(EXCP_SWI, syn_aa32_svc(s->svc_imm, s->thumb)); +} + /* Force a TB lookup after an instruction that changes the CPU state. */ void gen_lookup_tb(DisasContext *s) { @@ -6781,7 +6796,7 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, = CPUState *cpu) switch (dc->base.is_jmp) { case DISAS_SWI: gen_ss_advance(dc); - gen_exception(EXCP_SWI, syn_aa32_svc(dc->svc_imm, dc->thumb)); + gen_exception_swi(dc); break; case DISAS_HVC: gen_ss_advance(dc); @@ -6854,7 +6869,7 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, = CPUState *cpu) gen_helper_yield(tcg_env); break; case DISAS_SWI: - gen_exception(EXCP_SWI, syn_aa32_svc(dc->svc_imm, dc->thumb)); + gen_exception_swi(dc); break; case DISAS_HVC: gen_exception_el(EXCP_HVC, syn_aa32_hvc(dc->svc_imm), 2); --=20 2.43.0 From nobody Sat Apr 11 17:11:15 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=1775706705; cv=none; d=zohomail.com; s=zohoarc; b=WFifyhmJxdyPLyMOPRzF7ZzZbo+R5LyUsCs7Hb01A4H0V93D+PXVIur7T94GK147jw2iS7/DJ/xD+TfHxIvpP/I/6aPkh1UKbeD+Y9U09O01b5y+75pgt/L4sRwv24R2bYZEUZ6O2lfe9J7RQGzXbxxlTSCYPpqlbgtnY4QJDQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775706705; 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=kcgoIr708tkn1serDSc8foai5KtjEdBhFQtOKk6QjDo=; b=XyoR8ZtNdaunMlSPPjNe2g3VZP7i+v5V2yV0TlxprDM78jh+80NpXdlOKVSFg1/X+Z12wsD79SBFX/OldNFCzsfddt3cyIvO1Zxrh+AE80EVfElzjN85J0sw3HQc9fX7UeJS+0WrjOgv314rg2KTF/TmO+xL/zuex1Wo9jY95qU= 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 1775706705505497.5623916618873; Wed, 8 Apr 2026 20:51:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAgPj-0000hY-Mu; Wed, 08 Apr 2026 23:50:43 -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 1wAgPi-0000gQ-4n for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:42 -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 1wAgPg-0003tM-DN for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:41 -0400 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-c6e2355739dso197756a12.2 for ; Wed, 08 Apr 2026 20:50:39 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 20:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775706639; x=1776311439; 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=kcgoIr708tkn1serDSc8foai5KtjEdBhFQtOKk6QjDo=; b=Hhepclhr4MQKnRd+yhPqCFhg2j4WNQQgOYE4H0BeGYkCoTLESTpnXxCxP0NV2gGD4F 9JR5oHpRVYR22C4ACf83q9wyya8B+AGgWBPttAuA7dwQ1Z0sluCKGW18bXI8p4Asn6UX zqmcZFC4I3uqrgeYjOSeXuPLa7dqfYLQ8FcUSzJ+uu4nUDo1pwMR889Vm6AhrQ3hI1SL T/8tTBIYyGADxkKP9aQ0Q07ZLBJ6TnjA2V6Zl3CrZlADtUtw5XgZw0oPjElXuvqQzkRx u+QHMIar4/mrTCBHQSmREIL+fBwf6ed+5KzUXsu6SLjRVxuHrdOEQDzZAnd+zXj/IUmH TNbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775706639; x=1776311439; 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=kcgoIr708tkn1serDSc8foai5KtjEdBhFQtOKk6QjDo=; b=Eu4R4ANj0HvCdcX1qfh/J1UJqpLPLg2p0QtgFxYFFOaBpSvOHXnUoJAGxiKNmBhSE6 7v4YUxqnWR+dzLwxiVAG967at3/25W94qUK/s+AIURtRyXNBzJ+TiGBOhF1hgvIIxBNu OAjPiLY+vlWKYx19nE31hBjqwabZe+5HSvPKjv4iTZex47E5LaFPTxkRRBDCB93xdneU G3pn3xpL8OU5HY5eA27EDoAgjZA/lRAjh+S8xSCdQRi8uSgugOegmTP6v45t4m8Me21x +lNuswW+YIgBTv+WpaPNjNSN5zmTEra/yJS26PEWhNWxOHttvCVvyg/Qj5x2i1TJnzPj xggQ== X-Gm-Message-State: AOJu0YwZAa1lAxdaIQERcZ156ZVNzJtYzAgF/yjwPa8VTiBT1uepMPbQ G0b5X2wDiMFXHsslD+NH1+5+3Utz5XxSo7i2mw39KNgThwbYTpUnGjZrXfbXhFem3sweeFRYZli IdZ0pc4w= X-Gm-Gg: AeBDiesvIhOxKd8Df03DX4tQPt9ieodQ8vKwnUHdcFphS1R3BiT1xX3qOeTobfBrMk0 P/cUREEXdM7OxLdv6iTJIN15/celFPs/YefQ43nLOARzGzINsnvKPq3fnJgalXdeHr1+4VIx0/w 24j7mqP4B+fUvDBjsorAyQeW1edAHFs3KQ83gPp9TLsJE0SzJ4YRk/fmYwNmqFynybaFF930uPN acRrqn6eEsm/pDDH81MzRqidmO3J3do20VofMv415xRoqjgsHB58Sv5+Jaqwwl/yONt9wZ1Ko94 te8BBTXU8XvBTnpwg1Q1G/ZWj2ucaGB2kYjT4MRu9D4sUxwUPDMH8Vm2GF2B327g7t+oCEblFTG rYnYDcI58xxftLp2/m/661PLtpiZC2yC0DSOz8hORfrnLwMAOVkOzxIxCw0GjBMnKzMI0SvV1e5 jjK6sIvgb6wrgvKGlLq/a/PhNcdb39ewyKIl5vREQHMXLYKMzsgiKM0dtx X-Received: by 2002:a17:902:ccc9:b0:2b2:539b:d2b1 with SMTP id d9443c01a7336-2b2816cfd51mr247559615ad.16.1775706638838; Wed, 08 Apr 2026 20:50:38 -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 5/7] target/arm: Recognize linux faux BPKT Date: Thu, 9 Apr 2026 13:50:13 +1000 Message-ID: <20260409035015.132370-6-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::535; envelope-from=richard.henderson@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: 1775706706734154100 Content-Type: text/plain; charset="utf-8" It is easier to recognize the insn from decodetree than it is from cpu_loop. In particular, there is a BE32 bug in how we rebuild thumb2 insns in get_user_code_u32. Signed-off-by: Richard Henderson --- linux-user/arm/cpu_loop.c | 28 ---------------------------- target/arm/tcg/translate.c | 17 +++++++++++++++++ target/arm/tcg/a32.decode | 5 ++++- target/arm/tcg/t16.decode | 1 + target/arm/tcg/t32.decode | 5 ++++- 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c index 86f13ad83a..4f7c5dab9c 100644 --- a/linux-user/arm/cpu_loop.c +++ b/linux-user/arm/cpu_loop.c @@ -194,24 +194,6 @@ do_kernel_trap(CPUARMState *env) return 0; } =20 -static bool insn_is_linux_bkpt(uint32_t opcode, bool is_thumb) -{ - /* - * Return true if this insn is one of the three magic UDF insns - * which the kernel treats as breakpoint insns. - */ - if (!is_thumb) { - return (opcode & 0x0fffffff) =3D=3D 0x07f001f0; - } else { - /* - * Note that we get the two halves of the 32-bit T32 insn - * in the opposite order to the value the kernel uses in - * its undef_hook struct. - */ - return ((opcode & 0xffff) =3D=3D 0xde01) || (opcode =3D=3D 0xa000f= 7f0); - } -} - static bool emulate_arm_fpa11(CPUARMState *env, uint32_t opcode) { TaskState *ts =3D get_task_state(env_cpu(env)); @@ -291,16 +273,6 @@ void cpu_loop(CPUARMState *env) /* FIXME - what to do if get_user() fails? */ get_user_code_u32(opcode, env->regs[15], env); =20 - /* - * The Linux kernel treats some UDF patterns specially - * to use as breakpoints (instead of the architectural - * bkpt insn). These should trigger a SIGTRAP rather - * than SIGILL. - */ - if (insn_is_linux_bkpt(opcode, env->thumb)) { - goto excp_debug; - } - if (!env->thumb && emulate_arm_fpa11(env, opcode)) { break; } diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index ec21e33a06..0447be0907 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -4508,6 +4508,23 @@ static bool trans_BFCI(DisasContext *s, arg_BFCI *a) return true; } =20 +static bool trans_LINUX_BKPT(DisasContext *s, arg_LINUX_BKPT *a) +{ +#ifdef CONFIG_USER_ONLY +# ifdef CONFIG_LINUX + /* + * The Linux kernel recognizes 3 UDF patterns as breakpoints. + * Recognizing these during translate is much less error prone + * than deferring to cpu_loop. + */ + gen_exception_bkpt_insn(s, 0); + return true; +# endif +#endif + /* Fall through to UDF. */ + return false; +} + static bool trans_UDF(DisasContext *s, arg_UDF *a) { unallocated_encoding(s); diff --git a/target/arm/tcg/a32.decode b/target/arm/tcg/a32.decode index f2ca480949..c7e8e9803e 100644 --- a/target/arm/tcg/a32.decode +++ b/target/arm/tcg/a32.decode @@ -425,7 +425,10 @@ BFCI ---- 0111 110 msb:5 rd:4 lsb:5 001 rn= :4 &bfi =20 # While we could get UDEF by not including this, add the pattern for # documentation and to conflict with any other typos in this file. -UDF 1110 0111 1111 ---- ---- ---- 1111 ---- +{ + LINUX_BKPT 1110 0111 1111 0000 0000 0001 1111 0000 + UDF 1110 0111 1111 ---- ---- ---- 1111 ---- +} =20 # Parallel addition and subtraction =20 diff --git a/target/arm/tcg/t16.decode b/target/arm/tcg/t16.decode index 778fbf1627..836e929684 100644 --- a/target/arm/tcg/t16.decode +++ b/target/arm/tcg/t16.decode @@ -263,6 +263,7 @@ LDM_t16 1011 110 ......... \ %imm8_0x2 0:s8 !function=3Dtimes_2 =20 { + LINUX_BKPT 1101 1110 0000 0001 UDF 1101 1110 ---- ---- SVC 1101 1111 imm:8 &i B_cond_thumb 1101 cond:4 ........ &ci imm=3D%imm8_0x2 diff --git a/target/arm/tcg/t32.decode b/target/arm/tcg/t32.decode index 49b8d0037e..05217da8b3 100644 --- a/target/arm/tcg/t32.decode +++ b/target/arm/tcg/t32.decode @@ -418,7 +418,10 @@ CLZ 1111 1010 1011 ---- 1111 .... 1000 ..= .. @rdm SMC 1111 0111 1111 imm:4 1000 0000 0000 0000 &i HVC 1111 0111 1110 .... 1000 .... .... .... \ &i imm=3D%imm16_16_0 - UDF 1111 0111 1111 ---- 1010 ---- ---- ---- + { + LINUX_BKPT 1111 0111 1111 0000 1010 0000 0000 0000 + UDF 1111 0111 1111 ---- 1010 ---- ---- ---- + } ] B_cond_thumb 1111 0. cond:4 ...... 10.0 ............ &ci imm=3D%i= mm21 } --=20 2.43.0 From nobody Sat Apr 11 17:11:15 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=1775706685; cv=none; d=zohomail.com; s=zohoarc; b=mj9LtUePfvzLc2P67HSBEy8DvL8TOUMJLvG8RHHavzn4e8ab+yQT+cc6PSc3ZHzIDx1jwal7+eQBt18g3rrrzAb/0jmg4Z+J3+2v4FyTtoLfTbXHvMytEQkosA/aUZTky640GlWzeZLBeaeVQy4nlpcXWjVTZJUmB1J8+888BDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775706685; 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=deKxnJ9KTUlUyf+gjXytl44RGJOeX3f90U/OxiKn/OU=; b=S3Er4drsFXkVH6vu75L37FtR42o8hzdM/IOYbJ+avoVIZMaRFeYk86g3teC2vf5Ubk4b3ZsfMlCt+dytcv48Afvyso+tBAnl9fwiab6+xNc2wUH43iWlKneXShZw2ey9m+6a5N3blXl+knXjEpKNEW7wxxbeiLar5abmlPMOJIg= 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 1775706685775298.0265476876642; Wed, 8 Apr 2026 20:51:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAgPm-0000ib-Hw; Wed, 08 Apr 2026 23:50:46 -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 1wAgPl-0000hm-48 for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:45 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAgPj-0003tf-FK for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:44 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2ad21f437eeso2111585ad.0 for ; Wed, 08 Apr 2026 20:50:43 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 20:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775706642; x=1776311442; 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=deKxnJ9KTUlUyf+gjXytl44RGJOeX3f90U/OxiKn/OU=; b=ZPPqX3Mb8uWU+IbqC6Sh97FveSUjkGEx4kn5hsDp6cVBda7FYofz+6aCqczXfCIenX 9V6Okt3iG+SnV2lsz+lxboZ5NMp7uuRt66IiNB2vSrV/seXVKxwIilv+NU6YTwqKhXs7 FaFQUHMasrfU+nRyBEJFoNSq6xH809F+d0q/S2dmfo7J64ar4BBO2Hus2hxQ1cKDJXFe lJUXmQhddJnNl/2WH3oQbvSJZRtqNfkkDbSKkCjWZT9qrAnIWpBRlM12dfHXzQJN1BZ0 QVpnEBLBAI/o5bqq4rvI653P3z5kgWmRt4Xb94918MjYc5oY6aMQ3nE/gyxSrSBdyk8H YBFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775706642; x=1776311442; 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=deKxnJ9KTUlUyf+gjXytl44RGJOeX3f90U/OxiKn/OU=; b=lRncwmtf/h+X2HDz8iBdm8jYL/vqeXC2VUTLiXt3lG73KkiQprgEoMc9vU1xjz76Q4 Zd3cuGe+YvdxKdBH3uaXo1dJy2FDGC0UWENDCRCci5G8orxlTUyqeEAVLxefZuNfFjd5 cyNut/oPz6OndRimsWS5jn1MX5joiJYgfvU8B3sq+RpfQKBMUqsgzhWiP5oLlig+ETtx /uQVGhGqd7zYRg4n8ie1/EqvruKKGj8zW1mWRYpXjZgD/pmMhhL59OYZ04sWxE2kb0xS OheAz9yyAhWe3rdau3bNqR5h/Ay/Rp+2pA614egu/1idUoZrGV2AmKUMmeAVRlyZ1OLK P7lg== X-Gm-Message-State: AOJu0YxKdH8I15Zt452NNJdxBe9caXYxk1Sqt+Nno0YxA1uTV42ZbkN4 WC5i/SxAyIYu/DI4RSXqUdl+bUmciRhh4l8AjOxwRD2vbtNT1yMucIvfb2Vgmk4XXPqUkscqPB/ SRO+Y7K0= X-Gm-Gg: AeBDiesQc9+T57+nUfaI3coulAdtXHE37AumVdFy6U5ln9zTnuTKhlJZrLMfScYX2GT HLF6a5rEJwabzY1S0BCBafpEuEhkuwDcP3Lb/9r7LSHhhkAPzP3cz6vECah+JU2ExBRlIcvpClT v+R7RQqhigOA1qP8VlstGec5DFSvsKfNs7n52TM66S091gJJnjITOFSo2NOTLrXMHNQBT5pTl41 Pgxztl38iqgANO7A5M3sRW0gYx4zgV3WoFIxrVu6wk9TKiCQgOpMHoQixKaMZf4Pw5sWfR3dCX7 ued1MstPLW2FVUidxUjHr1QV1OefvyXq9rn/kdqSEf5peUH8W+fRh9JJOt7c9Ou3pOqEtQlpvhN m5KLM4A3ApVlMTTF3Kf8c5+tM4eQUOcrF61nfaQqgD7wkZePaJHjAAIR1NiPpneOs5dz/bBoUeD 5XYcR1drJ2cKvycSTi435xiKg6EqfjQtm0o7nM/CirgZwBAwA7YVc8Icwr X-Received: by 2002:a17:902:cf12:b0:2ae:5ab4:f4c0 with SMTP id d9443c01a7336-2b2c73040a3mr16951275ad.13.1775706642016; Wed, 08 Apr 2026 20:50:42 -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 6/7] target/arm: Introduce EXCP_NWFPE Date: Thu, 9 Apr 2026 13:50:14 +1000 Message-ID: <20260409035015.132370-7-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::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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: 1775706686880158500 Content-Type: text/plain; charset="utf-8" We don't normally emulate any coprocessor {1,2} insns, but linux-user would like to emulate these fpa11 insns. Filter these, raise a special exception, and store the instruction in CPUARMState.syscall_info rather than reload the instruction in the linux-user cpu_loop. Signed-off-by: Richard Henderson --- target/arm/cpu.h | 1 + linux-user/arm/cpu_loop.c | 34 ++++++---------------------------- target/arm/tcg/translate.c | 27 +++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 5b564c7113..8f1afca2ae 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -64,6 +64,7 @@ #define EXCP_VINMI 27 #define EXCP_VFNMI 28 #define EXCP_MON_TRAP 29 /* AArch32 trap to Monitor mode */ +#define EXCP_NWFPE 30 /* linux-user fpa11 emulation */ /* NB: add new EXCP_ defines to the array in arm_log_exception() too */ =20 #define ARMV7M_EXCP_RESET 1 diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c index 4f7c5dab9c..ae941ba9af 100644 --- a/linux-user/arm/cpu_loop.c +++ b/linux-user/arm/cpu_loop.c @@ -29,19 +29,6 @@ #include "user/page-protection.h" #include "target/arm/syndrome.h" =20 -#define get_user_code_u32(x, gaddr, env) \ - ({ abi_long __r =3D get_user_u32((x), (gaddr)); \ - if (!__r && bswap_code(arm_sctlr_b(env))) { \ - (x) =3D bswap32(x); \ - } \ - __r; \ - }) - -/* - * Note that if we need to do data accesses here, they should do a - * bswap if arm_cpu_bswap_data() returns true. - */ - /* * Similar to code in accel/tcg/user-exec.c, but outside the execution loo= p. * Must be called with mmap_lock. @@ -262,24 +249,15 @@ void cpu_loop(CPUARMState *env) qemu_process_cpu_events(cs); =20 switch(trapnr) { + case EXCP_NWFPE: + if (emulate_arm_fpa11(env, env->syscall_info)) { + break; + } + /* fall through */ case EXCP_UDEF: case EXCP_NOCP: case EXCP_INVSTATE: - { - uint32_t opcode; - - /* we handle the FPU emulation here, as Linux */ - /* we get the opcode */ - /* FIXME - what to do if get_user() fails? */ - get_user_code_u32(opcode, env->regs[15], env); - - if (!env->thumb && emulate_arm_fpa11(env, opcode)) { - break; - } - - force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, - env->regs[15]); - } + force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->regs[15= ]); break; case EXCP_SWI: { diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 0447be0907..d910a007db 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -2358,8 +2358,26 @@ static bool valid_cp(DisasContext *s, int cp) return cp < 8 || cp >=3D 14; } =20 +static bool maybe_nwfpe(DisasContext *s, int cp) +{ +#ifdef CONFIG_USER_ONLY +# if defined(CONFIG_LINUX) && !defined(TARGET_AARCH64) + if (!s->thumb && (cp =3D=3D 1 || cp =3D=3D 2)) { + tcg_gen_st_i32(tcg_constant_i32(s->insn), tcg_env, + offsetof(CPUARMState, syscall_info)); + gen_exception_insn(s, 0, EXCP_NWFPE, syn_uncategorized()); + return true; + } +# endif +#endif + return false; +} + static bool trans_MCR(DisasContext *s, arg_MCR *a) { + if (maybe_nwfpe(s, a->cp)) { + return true; + } if (!valid_cp(s, a->cp)) { return false; } @@ -2370,6 +2388,9 @@ static bool trans_MCR(DisasContext *s, arg_MCR *a) =20 static bool trans_MRC(DisasContext *s, arg_MRC *a) { + if (maybe_nwfpe(s, a->cp)) { + return true; + } if (!valid_cp(s, a->cp)) { return false; } @@ -2380,6 +2401,9 @@ static bool trans_MRC(DisasContext *s, arg_MRC *a) =20 static bool trans_MCRR(DisasContext *s, arg_MCRR *a) { + if (maybe_nwfpe(s, a->cp)) { + return true; + } if (!valid_cp(s, a->cp)) { return false; } @@ -2390,6 +2414,9 @@ static bool trans_MCRR(DisasContext *s, arg_MCRR *a) =20 static bool trans_MRRC(DisasContext *s, arg_MRRC *a) { + if (maybe_nwfpe(s, a->cp)) { + return true; + } if (!valid_cp(s, a->cp)) { return false; } --=20 2.43.0 From nobody Sat Apr 11 17:11:15 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=1775706705; cv=none; d=zohomail.com; s=zohoarc; b=CVHuKML4WBoyh+/N8tRRZpd5rPUQP2FFMJZkEOx8va12a408n+Nu6qc9bW2KFuPxNJziYWC9PWDbShQGByQ9ccapRYdL9e+88cBjxS+vQi2/7eLtvO38cG/EH7P6W8lkytMibszbIdsgROjBIZMKScmUYYmpSzc+JmeuG+ylY3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775706705; h=Content-Type: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=yXUUcgWi2+vh0MyaTf6jDQP+dep+qMh1XfSIKvMmAto=; b=Tmbu2vlSBRjLGdS6QhNnrzaa/Fv++bTPpL4fNrrutw27DWK56CCZQGk3tEIXInHhuBk7HwZsAOS7MFPn+DYX55PJOpTFveGkpPsNgG9BamCL91Lbd4vapt8vYIJ03akau62qLtJogMIOAa5nvHcSMZ4AqeYh9zxjMJz/5bntwc4= 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 1775706705492945.099835575936; Wed, 8 Apr 2026 20:51:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAgPp-0000lR-7y; Wed, 08 Apr 2026 23:50:49 -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 1wAgPo-0000km-0Y for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:48 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAgPm-0003u1-Js for qemu-devel@nongnu.org; Wed, 08 Apr 2026 23:50:47 -0400 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-c70f91776fcso189453a12.0 for ; Wed, 08 Apr 2026 20:50:46 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 20:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775706645; x=1776311445; 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=yXUUcgWi2+vh0MyaTf6jDQP+dep+qMh1XfSIKvMmAto=; b=YtD+hoRajgxVE9uddSH4miJs7Pyw2+5vvHNsuPeHPHlPT3XRmYLzB6OqygEh0CvfJn CyN0vx0TsZJrhzXWhgI+cZa4OQmWkbVUjlfi2VhW/1+zKbfK2VSF2+xy+BbPy5OOhXwi Ez1rf8ceu95UjDT6yRNOJ4WZO+FBEekIpiO/ZEckw4aZGGl5RgA0sw+McPijPiU3lYb6 U9JfAJhXh/85RI3Ea58rp7H1+JZSCDcSctdaF/h0/u99eHg1YmGmJBjasR4KSokKtQBc MtqssGGpBTJp6j4sKtJkoyMIKWNFtC9WKID3Q9gkDg2m20SYL74yRAv+Ry1PaPO8hquC PtLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775706645; x=1776311445; 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=yXUUcgWi2+vh0MyaTf6jDQP+dep+qMh1XfSIKvMmAto=; b=T9hClQfwtpU6+fFezzIQmL/bkcQyV7UAFyu/WNqDzILD8BDGvMQMouEjX0hpVbuAor wjpmE2MofkLgN+3UIuCH/8TWaWGBTY6JxJZHFysyyFSqUmliD0vpag8ru/oaDsW9IaFo Mw6pdgfRZifuEP6eP7qiibhqBH8a4evHWh1oBVmYhNvN26OD3oYWtIU790hdGRILWh3U GE9feNR37IAKnQwzV70WPvsuFVdMoIBU7aEAhev/5QO08dR3AwQWOZohQoCM70HQiAX7 ufHCZUEiTSQfqx4yuqu1Az+3vocbPTla6goZm0C5WNmjTXPDENxYC8ZbFAvTOzVYXppP EqkQ== X-Gm-Message-State: AOJu0YyGYARIf655xXIUuWOU49LLEe9X+FvZakDmrrAyJw5cMxtbsm8o FlrsWz+jMvzqJy08HauWsBhHc3n2mT1u3MLgFlASwNKZ64ynSBr8pNRGoQgtnS/BBH2oY9mpEmn SyMxpEeE= X-Gm-Gg: AeBDievbOerW5WSUCM2LNJePeP7dYm+OQOZGgkwaHBAu5e4IrAHNXDwi230KFdwHOsF Ylj2peVx4aGvo3F3F47KsoUQlwJqmYc17HXe4lbot+j3WKnu4ZsMY3HUxgQIpw8GyI3WQPW98JE fugWaDMIWjKen7mQQuUmTeL5F0T7M+LvA8WRpUjDTqhPspAIl8p1mBHtYsWYwzxqkRMMMk1csWY 4AvT/6qHJYGtf9+/FfW9FvrZK+PzdqBrLIgO3i7SGzIsIkDXiohh9SiipZuSvOkwHW9D+iqhyBv OiT/eVL7Jzp6F7wukx2786V4kiceMsFoL7iFjrP4Mn82hiXxu/razkXrrGBqKprUnLSW+gmG4hd VR+9TK+guNqfpB5+IUsYoiRC9E7NtLrrCSh87F23HdGTkinu+93LV9pLEZ2IND9wMOVjCh0K8EG QG565nRyNAu5b4aUjFwNBHgXHS8qgcO4uIPKn/4OGB7yqsMEL6Ze5wnZWt X-Received: by 2002:a17:902:db09:b0:2ad:da28:98d with SMTP id d9443c01a7336-2b2817be680mr260851115ad.37.1775706645176; Wed, 08 Apr 2026 20:50:45 -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 7/7] target/arm: Remove bswap_code Date: Thu, 9 Apr 2026 13:50:15 +1000 Message-ID: <20260409035015.132370-8-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-Type: text/plain; charset="utf-8" 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::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.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: 1775706706623154100 This function is no longer used. Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/arm/cpu.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 8f1afca2ae..e735357395 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2571,22 +2571,6 @@ static inline int sme_vq(CPUARMState *env) return EX_TBFLAG_A64(env->hflags, SVL) + 1; } =20 -static inline bool bswap_code(bool sctlr_b) -{ -#ifdef CONFIG_USER_ONLY - /* BE8 (SCTLR.B =3D 0, TARGET_BIG_ENDIAN =3D 1) is mixed endian. - * The invalid combination SCTLR.B=3D1/CPSR.E=3D1/TARGET_BIG_ENDIAN=3D0 - * would also end up as a mixed-endian mode with BE code, LE data. - */ - return TARGET_BIG_ENDIAN ^ sctlr_b; -#else - /* All code access in ARM is little endian, and there are no loaders - * doing swaps that need to be reversed - */ - return 0; -#endif -} - enum { QEMU_PSCI_CONDUIT_DISABLED =3D 0, QEMU_PSCI_CONDUIT_SMC =3D 1, --=20 2.43.0