From nobody Sun Sep 28 17:06:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758568202985713.8765795257451; Mon, 22 Sep 2025 12:10:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v0lcr-0005jo-4T; Mon, 22 Sep 2025 14:51:01 -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 1v0lcT-0005MP-Pc for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:50:42 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v0lc4-0004Td-IH for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:50:36 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-77f38a9de0bso1270830b3a.0 for ; Mon, 22 Sep 2025 11:50:11 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77e5fe6de75sm10583861b3a.19.2025.09.22.11.50.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Sep 2025 11:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758567011; x=1759171811; 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=xDM1aWiuntpb3ZU1rgv8XRUZ2PXq26slIHJuXs5kBF0=; b=OUX2eV4IyTF9yHj/2s0qi0i35zsdrMvf6jiL93lmNy8vAqhTsBBv8VWgX68nNrEMXH A6qQ2ZaabmJAWNVq93qodiaM807ckIlpHu5NAOzkj+qHsIYcvGqChajTeHy9/fvleEWg JCuqWWXPKqnJZXKtEgrAPhNvieOCdy/5gPMb1TIwJ8VrUEYfM3uYQZdSUy+9lMLFpyWM ZDnAn59cl4r5i18GIJiwluXhE+gLT8mJ2VT3qBbAGc3LirBY/gAJyh1wwClfBNIxTgZF K70YA9TW39HeWn5xF8cpAxpvA207rJHbPF7o6JqTiT/Xc1W4rjLkFcrt3YEHIPjKEM+W 58zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758567011; x=1759171811; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xDM1aWiuntpb3ZU1rgv8XRUZ2PXq26slIHJuXs5kBF0=; b=bIEm5vQbJ0HbgPD4CyTZ6Sbd1oNkAOyOA8j1NnKOZx1HRH3cjK0WY5L700vv3mmgTD y73H0x4VknNHLtT23GM+uS8GTI+4FH93HZavHXm8pEf/7GFEpfW93QW+IgrfQzIzMF2m Jxc+xzNYD6COCJqtU8SBpf25GlYIjGhL+G648/Mpf2lOKSBQB0QifpebRrfz0KH3LbP/ l92NetxG6Zt6QYObnK+2E3JDRUkwa8tfQjZupxqPJ6U2AuQ5mFkdmT+5MXCX4SL9yvf0 QYghY3FdvQM//ZWkOcIUJTZU9nOYKdTIOmReqlIEF9g1R/0SYQg4ONoUBINnTrUCVXoz dB6A== X-Gm-Message-State: AOJu0YzvbRTvLPzjswN1dTRyeMQM3OKvbO+h/GFhDmpwVbi/+PWurEiu J9zeCPa56p5uCPxVfVUzcRobNIo5O4PCjbHRKseA0FZMS5kZAlXlJJD42VSmwiQBKKzfo8dTxqP jKJ6e X-Gm-Gg: ASbGncs26Id9pN7+pff1nN9u4HRVJEVE36Ih43SZ2DqrwpnkrvH4OmwtfPglN8TXvns 5BokZ5dgKpeAdrpWhiyw1b/saFFY7uylRgPayOkS2u3VC2GxMniQ3/5Gp4Z44rmMCQXErZtbD0y OEKVVlpDv3FTYTX/6AfPtls56tawpQmqnkE7UhpIy42MCeEZpww1fxz98kNQ0p4DSNLi9/8lLQ0 wzWPxnV4uUJfc06T5pNYkRY8SqePFtuGSWalJeHQEGxjVI/wULQ07DUeS+bWQNGTdktcZEri/E3 F0jIfkOQxZyeXtYO7NosxJ33EakVvsX8HG7igtPMGDSgWC9XSNHodaYeEUsKAacDxKGizKQkaTf fzc0b3mATFf6Wn48Fvy9zuQ4UB6ES X-Google-Smtp-Source: AGHT+IG7G1oX6iI1DdDs2Ay8qkX+3z4V0xpHri1fABrzgvWBTy55bjVVTB7Jmj/JmMTbkY3CvilkGA== X-Received: by 2002:a05:6a00:1945:b0:777:b207:47b2 with SMTP id d2e1a72fcca58-77e4cc3daa6mr16691349b3a.2.1758567010733; Mon, 22 Sep 2025 11:50:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v5 38/76] target/arm: Export cpsr_{read_for, write_from}_spsr_elx Date: Mon, 22 Sep 2025 11:48:46 -0700 Message-ID: <20250922184924.2754205-39-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250922184924.2754205-1-richard.henderson@linaro.org> References: <20250922184924.2754205-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::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.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, T_SPF_TEMPERROR=0.01 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: 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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1758568203390116600 Content-Type: text/plain; charset="utf-8" Move cpsr_write_from_spsr_elx from tcg/helper-a64.c to helper.c, so that it's present with --disable-tcg. Declare both in internals.h. Signed-off-by: Richard Henderson --- target/arm/internals.h | 2 ++ target/arm/helper.c | 20 +++++++++++++++++++- target/arm/tcg/helper-a64.c | 20 -------------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index f72e95a5ba..3766a4ccfe 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1892,6 +1892,8 @@ void vfp_clear_float_status_exc_flags(CPUARMState *en= v); */ void vfp_set_fpcr_to_host(CPUARMState *env, uint32_t val, uint32_t mask); bool arm_pan_enabled(CPUARMState *env); +uint32_t cpsr_read_for_spsr_elx(CPUARMState *env); +void cpsr_write_from_spsr_elx(CPUARMState *env, uint32_t val); =20 /* Compare uint64_t for qsort and bsearch. */ int compare_u64(const void *a, const void *b); diff --git a/target/arm/helper.c b/target/arm/helper.c index 3b9e7a822e..3f32eb7a9d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8882,7 +8882,7 @@ static int aarch64_regnum(CPUARMState *env, int aarch= 32_reg) } } =20 -static uint32_t cpsr_read_for_spsr_elx(CPUARMState *env) +uint32_t cpsr_read_for_spsr_elx(CPUARMState *env) { uint32_t ret =3D cpsr_read(env); =20 @@ -8897,6 +8897,24 @@ static uint32_t cpsr_read_for_spsr_elx(CPUARMState *= env) return ret; } =20 +void cpsr_write_from_spsr_elx(CPUARMState *env, uint32_t val) +{ + uint32_t mask; + + /* Save SPSR_ELx.SS into PSTATE. */ + env->pstate =3D (env->pstate & ~PSTATE_SS) | (val & PSTATE_SS); + val &=3D ~PSTATE_SS; + + /* Move DIT to the correct location for CPSR */ + if (val & PSTATE_DIT) { + val &=3D ~PSTATE_DIT; + val |=3D CPSR_DIT; + } + + mask =3D aarch32_cpsr_valid_mask(env->features, &env_archcpu(env)->isa= r); + cpsr_write(env, val, mask, CPSRWriteRaw); +} + static bool syndrome_is_sync_extabt(uint32_t syndrome) { /* Return true if this syndrome value is a synchronous external abort = */ diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 6d77fd0113..eaea7859d3 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -615,26 +615,6 @@ static int el_from_spsr(uint32_t spsr) } } =20 -static void cpsr_write_from_spsr_elx(CPUARMState *env, - uint32_t val) -{ - uint32_t mask; - - /* Save SPSR_ELx.SS into PSTATE. */ - env->pstate =3D (env->pstate & ~PSTATE_SS) | (val & PSTATE_SS); - val &=3D ~PSTATE_SS; - - /* Move DIT to the correct location for CPSR */ - if (val & PSTATE_DIT) { - val &=3D ~PSTATE_DIT; - val |=3D CPSR_DIT; - } - - mask =3D aarch32_cpsr_valid_mask(env->features, \ - &env_archcpu(env)->isar); - cpsr_write(env, val, mask, CPSRWriteRaw); -} - void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) { ARMCPU *cpu =3D env_archcpu(env); --=20 2.43.0