From nobody Mon Jul 15 12:37:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WN1vC4s2Gz5QrG4; Mon, 15 Jul 2024 12:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN1vC2r2rz4Gnn; Mon, 15 Jul 2024 12:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqxG+b5XnWqtLvfnclPm0DR7pfS2OxeqpK7z5m/RA/w=; b=igiJ/kK9WwPnDDipq9cQoAzZEDBw6arvjnfXxfikL1enQ+H0VuiaWNqPVPykg6nEuKPxhC Jse8nbA2A+gQYfbIK6YMAg15WT0cbA+u7ZY+wHwnytkvDoT8O/k39cC87WykhBjhNgiT3f e6k6S1dqMla33HGousNCegzMpLt/P3/domDlHHRrRniJXu7Agqm9M4ym01BLGhePS3rYv9 fAfr3lJbjIutYfvfzTRq0uRPaThqyRN3eFVMCdIlT8QN2SLiORnIKGKQ3dDsRpMKRhpF8A pQ/Ln+of7MFSvn9H5q8wscaR6X7B7hLCpXEKrVKtHtCPj5iq0yd3eQP/417iSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047079; a=rsa-sha256; cv=none; b=gcF7t5+kF8CaFp5j1D6LGQ8pjfocSlo9Ee5VaEiwKAl74LeL2+V/FRWpX9Mf1X3M/VEhOd SXNlQNz7CvThz5+k+Do5cmpyIUl4yQBu1k/mavWBMdJ9795Pg7U2uIP+zBuTCOS7YXOzyZ thLYWr7hrAaUwLwWzxpy3nC63pbjDvROAR36ksJX3/sxYRmEOvEtUBmaU/3tMfAZJQJl60 Om9Wb+VNXeZOsiYmuPdiYWd2b9enzj5zFgwd16tX5LctKlilAEuqTAHbCjoGW7UtuBjR0S MJCvmOxI2amFMRBL7hDwPUUGdM5kHwjhLiyg2TqRv3Ruvj3H16BBhIz2c/iDTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqxG+b5XnWqtLvfnclPm0DR7pfS2OxeqpK7z5m/RA/w=; b=Cs1XFL07lYpGu5RJd7sW+YzSpB0w+7EcRNAEUDOc9Z4DDA4KzocsR40FZ+2JqMEB8nRF/0 uCq5hHQxxKrvEp0igf3G8dq9ur9MsL6yEIO6uXpODQG4rBZe8hGRO65N59se9sjAYQDU3P jdyyTxdXOvFZExS8I/Qwa2G/2QMfktleXy88RKF2z+UHDEePra3++d9LWV84gj18x5j18v lLNOSAO+NfJpHRyuGHVTVCTkB727BZJSQmWRZr7ycDoF4CDnEKsMV2IU3lMXV56GLKZqgw LcYNVSeSvwZGu4KfqbdzU+zZeJvkdDYsrCxzyeXGiW6K1HFFQx0REZKG4Em+vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WN1vC19rpzscc; Mon, 15 Jul 2024 12:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46FCbxCW059040; Mon, 15 Jul 2024 12:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCbxMj059037; Mon, 15 Jul 2024 12:37:59 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:37:59 GMT Message-Id: <202407151237.46FCbxMj059037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: df3e8fcf651e - stable/13 - Mark the arm64 PSR register fields with UL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: df3e8fcf651e8dc6c489ccb94fd777cd4511b1e3 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=df3e8fcf651e8dc6c489ccb94fd777cd4511b1e3 commit df3e8fcf651e8dc6c489ccb94fd777cd4511b1e3 Author: Andrew Turner AuthorDate: 2023-03-22 16:46:25 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:34:28 +0000 Mark the arm64 PSR register fields with UL These are for a 64 bit register. Make them 64 bit values on arm64. Sponsored by: Arm Ltd (cherry picked from commit 6a4f5fdd19d6de8612998eb7c62273fd8b8c3908) --- sys/arm64/include/armreg.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 22bb71dbea51..3feb048b2bc8 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2052,32 +2052,32 @@ * 0: always SP0 * 1: current ELs SP */ -#define PSR_M_EL0t 0x00000000 -#define PSR_M_EL1t 0x00000004 -#define PSR_M_EL1h 0x00000005 -#define PSR_M_EL2t 0x00000008 -#define PSR_M_EL2h 0x00000009 -#define PSR_M_64 0x00000000 -#define PSR_M_32 0x00000010 -#define PSR_M_MASK 0x0000000f - -#define PSR_T 0x00000020 - -#define PSR_AARCH32 0x00000010 -#define PSR_F 0x00000040 -#define PSR_I 0x00000080 -#define PSR_A 0x00000100 -#define PSR_D 0x00000200 +#define PSR_M_EL0t 0x00000000UL +#define PSR_M_EL1t 0x00000004UL +#define PSR_M_EL1h 0x00000005UL +#define PSR_M_EL2t 0x00000008UL +#define PSR_M_EL2h 0x00000009UL +#define PSR_M_64 0x00000000UL +#define PSR_M_32 0x00000010UL +#define PSR_M_MASK 0x0000000fUL + +#define PSR_T 0x00000020UL + +#define PSR_AARCH32 0x00000010UL +#define PSR_F 0x00000040UL +#define PSR_I 0x00000080UL +#define PSR_A 0x00000100UL +#define PSR_D 0x00000200UL #define PSR_DAIF (PSR_D | PSR_A | PSR_I | PSR_F) /* The default DAIF mask. These bits are valid in spsr_el1 and daif */ #define PSR_DAIF_DEFAULT (PSR_F) -#define PSR_IL 0x00100000 -#define PSR_SS 0x00200000 -#define PSR_V 0x10000000 -#define PSR_C 0x20000000 -#define PSR_Z 0x40000000 -#define PSR_N 0x80000000 -#define PSR_FLAGS 0xf0000000 +#define PSR_IL 0x00100000UL +#define PSR_SS 0x00200000UL +#define PSR_V 0x10000000UL +#define PSR_C 0x20000000UL +#define PSR_Z 0x40000000UL +#define PSR_N 0x80000000UL +#define PSR_FLAGS 0xf0000000UL /* PSR fields that can be set from 32-bit and 64-bit processes */ #define PSR_SETTABLE_32 PSR_FLAGS #define PSR_SETTABLE_64 (PSR_FLAGS | PSR_SS)