From nobody Sun Sep 28 16:34:13 2025 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=1756401375; cv=none; d=zohomail.com; s=zohoarc; b=IJyd1lS8XfstwaoM4DPDOTrwtb35ljTe1wy3uADzXVxZUQW4uOJRwO9X7mtqrgRFunHJLq++w6siWUs0ohspOJKc+q2co3VfZzYXx6ThTcuoLNY+9nJ7I94gJ+qSAk1fAlFAVqDwwkim6c8LJU9IpQM22D6eu/9sLgwo8FmbW3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756401375; h=Content-Transfer-Encoding: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:Cc; bh=6mb2pIzaDFDV/cuuHoxH84dLN2RLBxFwE/L5iLlVFCI=; b=Z7QWYZxLcaDNNrYz/I58phZLVOWrZIjdS0cr1uDNXooV0J2tK2pgPJnYAyzVfdKCg5xd78plK93I6yu8vsEPdIJpHMdnMPbGw7CKAosVdao0aArvO2ssnNs3nKqhJ6QGY1QI8JLbdhmEiI4vHeLbN688YJ3BqPLz7hMPqFChI/0= 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 1756401375277536.7739462050218; Thu, 28 Aug 2025 10:16:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urgBW-0002UU-Na; Thu, 28 Aug 2025 13:13:16 -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 1urdF0-0003rQ-9M for qemu-devel@nongnu.org; Thu, 28 Aug 2025 10:04:38 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urdEv-0002ty-Nh for qemu-devel@nongnu.org; Thu, 28 Aug 2025 10:04:38 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-45b618b7d33so8403465e9.1 for ; Thu, 28 Aug 2025 07:04:33 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cce1724939sm6947712f8f.26.2025.08.28.07.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 07:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756389872; x=1756994672; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6mb2pIzaDFDV/cuuHoxH84dLN2RLBxFwE/L5iLlVFCI=; b=v0VbfPUxpdgk5//WPDOLrcJrKMvm4UWmRS1EPiTt4Co3yS7BnUYn6cEtjpHhfYFBqA EVkg+vu6F7XruaHchFHO2D1+kD+/hWwdfjM6fV2DU8okesuuXs8jySLfHl8/dklS7Cds ImbhUZ+CKryk51TqSSPumg8STjZSm3wn7qk0aDSxLEYxfASw0fSHWyc5zWFmXHTFdIxl W1v1VgYDRZgshNa1XLUiTyZxABXvpXV8PGHg+qzVe+Tf5WMWdtFeOalPHKgZscxM2LYv AYSDGgQaZSliz8JOz8xKr/SUwibxg052fz4bCZfV9VND1RJGtIYsQz9YAUsc1Y4VYOj3 Epnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756389872; x=1756994672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6mb2pIzaDFDV/cuuHoxH84dLN2RLBxFwE/L5iLlVFCI=; b=GXuE0eItbWq03bJh6tthOY16gtOWLJ9p2ugSXghGm4qvA13HBXysj8RWRr9qAYz9Nw IjwsSU1Fp+5Ngs7QKJQMHlSxMbC2cxfC9t63t86R1XuB8gc+LJPw3dCo+9IbKx6EhOxp KLZqJmGp+GuFy5cKRcdL7myepgaUIi0i4cGdeRx7gZAkDNw38/3NmW22+XZiylrdqL/9 UY4ZZuEVOykON9i8wwLpJNarExGw3J7oUVONxhAhMqYQrvLoRaoeAxBFI7dX3w1v6nYx JHh9VPJyWCnT4nShPeazPKW8MCtHmSiGzCgQwsGNtqzzdtvNWKxyg5QJiJxbw40gasIb gRXw== X-Forwarded-Encrypted: i=1; AJvYcCUGQ2ylekz2jJCuOEAvxS1VZWYxhifxJNygCI90yXhN20mt0e9Qi7RAD+pPR2XuNS6zyo6c1C1JoCJb@nongnu.org X-Gm-Message-State: AOJu0YzBrVGYlZwwQh+rvnm0QomAACc0aumpy25Op7+l64kGdJaT0aCI qnH1+W9ZTZdHWN8364oi9daR+ZG7GLeXyDWsmgLbu/NZeJtxU0yNqtv1UmJ+6BZX1WdZNTVnKie 8k53i X-Gm-Gg: ASbGncv91Nmn9CjZauuwUNPO6GBmlyANDzGYIYkGSFvHnsIGM6Bc7MD9HSjE3/caSa/ gdIocNP+JQ0Juk9mdUVr6oggykrx7B69v6trysdf5lodu3qdAqBwvPFWCe7xQvAVCSFmeQKO0c/ 9/cIuGQnmd7wOi83dM/Vqcq6N9HGxuT9AkIzwZsoUYrbARqW1dfyag2jRwyL/Kf4n9cuoO1kgMt hZcc6msMC+R6Iu7S129NFUx5jgqbIHT+ibQHSSUx3AUpmdlQDMdoDt52+ul48HL76S7NQxBTodJ XA/PWU8UK47yHoxcGQYZLMaqAMVjLutkjGzeNiLHT+j9Dy720rVsFKtAOQP9qiZPhSBbBeGNzgX RneHEADANoFvdhchwsHCBiObQ0wBO X-Google-Smtp-Source: AGHT+IGQJK737hihmtAvUoBKLGYG7lUQUHf96z9M1qVbCqxS8UKsAyzRslSOQzy/tLg+2yCWEfqy8g== X-Received: by 2002:a05:600c:4fc7:b0:456:25aa:e9b0 with SMTP id 5b1f17b1804b1-45b517ad57emr299091305e9.16.1756389871605; Thu, 28 Aug 2025 07:04:31 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 5/5] target/arm: Drop ARM_FEATURE_IWMMXT handling Date: Thu, 28 Aug 2025 15:04:22 +0100 Message-ID: <20250828140422.3271703-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250828140422.3271703-1-peter.maydell@linaro.org> References: <20250828140422.3271703-1-peter.maydell@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=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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: 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: 1756401377339124100 Content-Type: text/plain; charset="utf-8" We have now removed all the CPU types which had the Intel XScale extensions indicated via ARM_FEATURE_IWMMXT, so this feature bit is never set. Remove all the code that can only be reached when using this flag. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- bsd-user/arm/target_arch_elf.h | 1 - target/arm/cpu.h | 19 ---------- linux-user/arm/elfload.c | 1 - linux-user/arm/signal.c | 67 ---------------------------------- target/arm/cpu.c | 8 ---- target/arm/machine.c | 21 ----------- 6 files changed, 117 deletions(-) diff --git a/bsd-user/arm/target_arch_elf.h b/bsd-user/arm/target_arch_elf.h index b1c0fd2b320..b54bf5fbc69 100644 --- a/bsd-user/arm/target_arch_elf.h +++ b/bsd-user/arm/target_arch_elf.h @@ -86,7 +86,6 @@ static uint32_t get_elf_hwcap(void) /* probe for the extra features */ /* EDSP is in v5TE and above */ GET_FEATURE(ARM_FEATURE_V5, ARM_HWCAP_ARM_EDSP); - GET_FEATURE(ARM_FEATURE_IWMMXT, ARM_HWCAP_ARM_IWMMXT); GET_FEATURE(ARM_FEATURE_THUMB2EE, ARM_HWCAP_ARM_THUMBEE); GET_FEATURE(ARM_FEATURE_NEON, ARM_HWCAP_ARM_NEON); GET_FEATURE(ARM_FEATURE_V6K, ARM_HWCAP_ARM_TLS); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 0cfe23c1238..391b29ef3c0 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -695,14 +695,6 @@ typedef struct CPUArchState { */ uint64_t exclusive_high; =20 - /* iwMMXt coprocessor state. */ - struct { - uint64_t regs[16]; - uint64_t val; - - uint32_t cregs[16]; - } iwmmxt; - struct { ARMPACKey apia; ARMPACKey apib; @@ -1846,16 +1838,6 @@ enum arm_cpu_mode { /* QEMU-internal value meaning "FPSCR, but we care only about NZCV" */ #define QEMU_VFP_FPSCR_NZCV 0xffff =20 -/* iwMMXt coprocessor control registers. */ -#define ARM_IWMMXT_wCID 0 -#define ARM_IWMMXT_wCon 1 -#define ARM_IWMMXT_wCSSF 2 -#define ARM_IWMMXT_wCASF 3 -#define ARM_IWMMXT_wCGR0 8 -#define ARM_IWMMXT_wCGR1 9 -#define ARM_IWMMXT_wCGR2 10 -#define ARM_IWMMXT_wCGR3 11 - /* V7M CCR bits */ FIELD(V7M_CCR, NONBASETHRDENA, 0, 1) FIELD(V7M_CCR, USERSETMPEND, 1, 1) @@ -2425,7 +2407,6 @@ QEMU_BUILD_BUG_ON(ARRAY_SIZE(((ARMCPU *)0)->ccsidr) <= =3D R_V7M_CSSELR_INDEX_MASK); */ enum arm_features { ARM_FEATURE_AUXCR, /* ARM1026 Auxiliary control register. */ - ARM_FEATURE_IWMMXT, /* Intel iwMMXt extension. */ ARM_FEATURE_V6, ARM_FEATURE_V6K, ARM_FEATURE_V7, diff --git a/linux-user/arm/elfload.c b/linux-user/arm/elfload.c index 7de1f13f4be..f0be9d4232f 100644 --- a/linux-user/arm/elfload.c +++ b/linux-user/arm/elfload.c @@ -72,7 +72,6 @@ abi_ulong get_elf_hwcap(CPUState *cs) =20 /* EDSP is in v5TE and above, but all our v5 CPUs are v5TE */ GET_FEATURE(ARM_FEATURE_V5, ARM_HWCAP_ARM_EDSP); - GET_FEATURE(ARM_FEATURE_IWMMXT, ARM_HWCAP_ARM_IWMMXT); GET_FEATURE(ARM_FEATURE_THUMB2EE, ARM_HWCAP_ARM_THUMBEE); GET_FEATURE(ARM_FEATURE_NEON, ARM_HWCAP_ARM_NEON); GET_FEATURE(ARM_FEATURE_V6K, ARM_HWCAP_ARM_TLS); diff --git a/linux-user/arm/signal.c b/linux-user/arm/signal.c index 8db1c4b2338..3b387cd6d78 100644 --- a/linux-user/arm/signal.c +++ b/linux-user/arm/signal.c @@ -76,21 +76,7 @@ struct target_vfp_sigframe { struct target_user_vfp_exc ufp_exc; } __attribute__((__aligned__(8))); =20 -struct target_iwmmxt_sigframe { - abi_ulong magic; - abi_ulong size; - uint64_t regs[16]; - /* Note that not all the coprocessor control registers are stored here= */ - uint32_t wcssf; - uint32_t wcasf; - uint32_t wcgr0; - uint32_t wcgr1; - uint32_t wcgr2; - uint32_t wcgr3; -} __attribute__((__aligned__(8))); - #define TARGET_VFP_MAGIC 0x56465001 -#define TARGET_IWMMXT_MAGIC 0x12ef842a =20 struct sigframe { @@ -267,25 +253,6 @@ static abi_ulong *setup_sigframe_vfp(abi_ulong *regspa= ce, CPUARMState *env) return (abi_ulong*)(vfpframe+1); } =20 -static abi_ulong *setup_sigframe_iwmmxt(abi_ulong *regspace, CPUARMState *= env) -{ - int i; - struct target_iwmmxt_sigframe *iwmmxtframe; - iwmmxtframe =3D (struct target_iwmmxt_sigframe *)regspace; - __put_user(TARGET_IWMMXT_MAGIC, &iwmmxtframe->magic); - __put_user(sizeof(*iwmmxtframe), &iwmmxtframe->size); - for (i =3D 0; i < 16; i++) { - __put_user(env->iwmmxt.regs[i], &iwmmxtframe->regs[i]); - } - __put_user(env->vfp.xregs[ARM_IWMMXT_wCSSF], &iwmmxtframe->wcssf); - __put_user(env->vfp.xregs[ARM_IWMMXT_wCASF], &iwmmxtframe->wcssf); - __put_user(env->vfp.xregs[ARM_IWMMXT_wCGR0], &iwmmxtframe->wcgr0); - __put_user(env->vfp.xregs[ARM_IWMMXT_wCGR1], &iwmmxtframe->wcgr1); - __put_user(env->vfp.xregs[ARM_IWMMXT_wCGR2], &iwmmxtframe->wcgr2); - __put_user(env->vfp.xregs[ARM_IWMMXT_wCGR3], &iwmmxtframe->wcgr3); - return (abi_ulong*)(iwmmxtframe+1); -} - static void setup_sigframe(struct target_ucontext *uc, target_sigset_t *set, CPUARMState *env) { @@ -306,9 +273,6 @@ static void setup_sigframe(struct target_ucontext *uc, if (cpu_isar_feature(aa32_vfp_simd, env_archcpu(env))) { regspace =3D setup_sigframe_vfp(regspace, env); } - if (arm_feature(env, ARM_FEATURE_IWMMXT)) { - regspace =3D setup_sigframe_iwmmxt(regspace, env); - } =20 /* Write terminating magic word */ __put_user(0, regspace); @@ -435,31 +399,6 @@ static abi_ulong *restore_sigframe_vfp(CPUARMState *en= v, abi_ulong *regspace) return (abi_ulong*)(vfpframe + 1); } =20 -static abi_ulong *restore_sigframe_iwmmxt(CPUARMState *env, - abi_ulong *regspace) -{ - int i; - abi_ulong magic, sz; - struct target_iwmmxt_sigframe *iwmmxtframe; - iwmmxtframe =3D (struct target_iwmmxt_sigframe *)regspace; - - __get_user(magic, &iwmmxtframe->magic); - __get_user(sz, &iwmmxtframe->size); - if (magic !=3D TARGET_IWMMXT_MAGIC || sz !=3D sizeof(*iwmmxtframe)) { - return 0; - } - for (i =3D 0; i < 16; i++) { - __get_user(env->iwmmxt.regs[i], &iwmmxtframe->regs[i]); - } - __get_user(env->vfp.xregs[ARM_IWMMXT_wCSSF], &iwmmxtframe->wcssf); - __get_user(env->vfp.xregs[ARM_IWMMXT_wCASF], &iwmmxtframe->wcssf); - __get_user(env->vfp.xregs[ARM_IWMMXT_wCGR0], &iwmmxtframe->wcgr0); - __get_user(env->vfp.xregs[ARM_IWMMXT_wCGR1], &iwmmxtframe->wcgr1); - __get_user(env->vfp.xregs[ARM_IWMMXT_wCGR2], &iwmmxtframe->wcgr2); - __get_user(env->vfp.xregs[ARM_IWMMXT_wCGR3], &iwmmxtframe->wcgr3); - return (abi_ulong*)(iwmmxtframe + 1); -} - static int do_sigframe_return(CPUARMState *env, target_ulong context_addr, struct target_ucontext *uc) @@ -482,12 +421,6 @@ static int do_sigframe_return(CPUARMState *env, return 1; } } - if (arm_feature(env, ARM_FEATURE_IWMMXT)) { - regspace =3D restore_sigframe_iwmmxt(env, regspace); - if (!regspace) { - return 1; - } - } =20 target_restore_altstack(&uc->tuc_stack, env); =20 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index ad39b216a44..457bde07abb 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -247,10 +247,6 @@ static void arm_cpu_reset_hold(Object *obj, ResetType = type) =20 cpu->power_state =3D cs->start_powered_off ? PSCI_OFF : PSCI_ON; =20 - if (arm_feature(env, ARM_FEATURE_IWMMXT)) { - env->iwmmxt.cregs[ARM_IWMMXT_wCID] =3D 0x69051000 | 'Q'; - } - if (arm_feature(env, ARM_FEATURE_AARCH64)) { /* 64 bit CPUs always start in 64 bit mode */ env->aarch64 =3D true; @@ -2604,14 +2600,10 @@ static const Property arm_cpu_properties[] =3D { static const gchar *arm_gdb_arch_name(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); - CPUARMState *env =3D &cpu->env; =20 if (arm_gdbstub_is_aarch64(cpu)) { return "aarch64"; } - if (arm_feature(env, ARM_FEATURE_IWMMXT)) { - return "iwmmxt"; - } return "arm"; } =20 diff --git a/target/arm/machine.c b/target/arm/machine.c index 6986915bee8..6666a0c50c4 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -221,26 +221,6 @@ static const VMStateDescription vmstate_vfp =3D { } }; =20 -static bool iwmmxt_needed(void *opaque) -{ - ARMCPU *cpu =3D opaque; - CPUARMState *env =3D &cpu->env; - - return arm_feature(env, ARM_FEATURE_IWMMXT); -} - -static const VMStateDescription vmstate_iwmmxt =3D { - .name =3D "cpu/iwmmxt", - .version_id =3D 1, - .minimum_version_id =3D 1, - .needed =3D iwmmxt_needed, - .fields =3D (const VMStateField[]) { - VMSTATE_UINT64_ARRAY(env.iwmmxt.regs, ARMCPU, 16), - VMSTATE_UINT32_ARRAY(env.iwmmxt.cregs, ARMCPU, 16), - VMSTATE_END_OF_LIST() - } -}; - /* The expression ARM_MAX_VQ - 2 is 0 for pure AArch32 build, * and ARMPredicateReg is actively empty. This triggers errors * in the expansion of the VMSTATE macros. @@ -1102,7 +1082,6 @@ const VMStateDescription vmstate_arm_cpu =3D { }, .subsections =3D (const VMStateDescription * const []) { &vmstate_vfp, - &vmstate_iwmmxt, &vmstate_m, &vmstate_thumb2ee, /* pmsav7_rnr must come before pmsav7 so that we have the --=20 2.43.0