From nobody Mon Sep 25 11:00:47 2023 X-Original-To: dev-commits-src-all@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 4RvKfl3YYwz4vNPZ; Mon, 25 Sep 2023 11:00:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RvKfl2zDqz3Lld; Mon, 25 Sep 2023 11:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639647; 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=dWMM62KjwXuOXtXBLGp3dELepN24wQNJ5UW1mQiaTgM=; b=W11DrQDPsmp+Lb2Ea45XSMBumMdow5K/lYvix6O7u1K7yfzmaXue5G6hGp9JLSTO5ckhSW Ku0/Hydob7zMKGx6rNTLlGrbNzgHG8uzusse5QKtVnxbmtSf+LfWmpUMJ1chR2CvwsOHF2 POEbHJoJK69F16RlGsGc2e9r/YO6i2bzytEQmeA+xyvknG4N+pSAzKFBcVXVFCnRVDNgnQ SS6z82KaeE7s3DqigUmUeqm4/9gjXzMPfGICRWF/FrqZGkgkkx1LnVOcvQEXU5H78MIzAr vut44IMNvFzWBu4NNNP+SsR4vnbZet8m5zwWBOBO1AMk4R4GpdRPbU9FI9J37Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639647; a=rsa-sha256; cv=none; b=P4LNjrN83swbgWojywTr2A8U/7ozp1bYPnOMgIiN54NoAet/iB0UuuiPMPSClKp9GLagpl 2srNTFvL9gj6NvEw4xi5R4PrZflNI1hFL9+/ZiDjjm1pPaTb/+Fqzdn0v4A5poFHS77ELS RFhMAYFCnmE1N7SOtThQ8Xu5/nsv3zhUL5JW2tcZ+t96kQ9jart4xTFEyut7q4+Cdo3Uj2 F/pwP2YQ1mXBKdXhqRNZ/uJ5v5qoKCh3RZAUqPKzzYmLgs3QLwZvy0jlIZRXSVtdr9ov3i W/xzkoaKPriEZ1gXGOahZCqgyOwbdP3Nnd69HD+C7TDc0W42eJU+2h5yzLnyFA== 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=1695639647; 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=dWMM62KjwXuOXtXBLGp3dELepN24wQNJ5UW1mQiaTgM=; b=wNY0dKj3VOXjlE5+EoWbGFsha7BWr4FTqToyFCCmPDdZ37g+5V0pigOyh0yT6RlVN56LCZ Sa2th0GtWoix+GvsXWF77R1piN6EtxTcnVkKFJEZH2VhbhIETGgEZbTUWIH395K8D1UQ6j 14SfwW4/KRXO55GtaRA+oP4CJsfmZDyfzNRvthp9BHszqeiK7SyYDUzkWQAvHYe7lcD7eD AYQvnPbu/jnmV5tdATyH+TFcaemKPXwAe9iisa7ICe8sjSwGBrV7p6pWDELNcmIrABb+w7 6f5mSqz7HOFGk8Zxc+baKpDpxVWdeox+ScAEQCecE4sNjzvrviZsrv1D8gujmg== 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 4RvKfl23Sqz1Qd2; Mon, 25 Sep 2023 11:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PB0llr052504; Mon, 25 Sep 2023 11:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB0lwV052501; Mon, 25 Sep 2023 11:00:47 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:00:47 GMT Message-Id: <202309251100.38PB0lwV052501@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: 27ceb260a1c1 - stable/13 - Move arm64 EENTRY uses before ENTRY List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 27ceb260a1c189b0aa0ea59be8ab6b924f7f6a40 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=27ceb260a1c189b0aa0ea59be8ab6b924f7f6a40 commit 27ceb260a1c189b0aa0ea59be8ab6b924f7f6a40 Author: Andrew Turner AuthorDate: 2023-03-31 12:34:51 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 08:41:15 +0000 Move arm64 EENTRY uses before ENTRY The ENTRY macro adds instructions to the start of a function but not EENTRY. To use these instructions in both functions move the EENTRY use before the ENTRY use. Sponsored by: Arm Ltd (cherry picked from commit 47ff149afaea6a403b8d044e26673bc3cd605fe4) --- sys/arm64/arm64/memcpy.S | 4 ++-- sys/arm64/arm64/support.S | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/memcpy.S b/sys/arm64/arm64/memcpy.S index d5fbfa64e0fa..b394d6c1d30a 100644 --- a/sys/arm64/arm64/memcpy.S +++ b/sys/arm64/arm64/memcpy.S @@ -55,8 +55,8 @@ The loop tail is handled by always copying 64 bytes from the end. */ -ENTRY(memcpy) EENTRY(memmove) +ENTRY(memcpy) add srcend, src, count add dstend, dstin, count cmp count, 128 @@ -237,6 +237,6 @@ L(copy64_from_start): stp B_l, B_h, [dstin, 16] stp C_l, C_h, [dstin] ret -EEND(memmove) END(memcpy) +EEND(memmove) diff --git a/sys/arm64/arm64/support.S b/sys/arm64/arm64/support.S index eb2976ee8ce7..805867fd5d17 100644 --- a/sys/arm64/arm64/support.S +++ b/sys/arm64/arm64/support.S @@ -173,15 +173,15 @@ END(fueword32) * long fueword(volatile const void *, int64_t *) * int64_t fueword64(volatile const void *, int64_t *) */ -ENTRY(fueword) EENTRY(fueword64) +ENTRY(fueword) check_user_access 0, (VM_MAXUSER_ADDRESS-7), fsu_fault_nopcb fsudata ldtr, x0, 0 str x0, [x1] /* Save the data in kernel space */ mov x0, #0 /* Success */ ret /* Return */ -EEND(fueword64) END(fueword) +EEND(fueword64) /* * int subyte(volatile void *, int) @@ -216,14 +216,14 @@ END(suword32) /* * int suword(volatile void *, long) */ -ENTRY(suword) EENTRY(suword64) +ENTRY(suword) check_user_access 0, (VM_MAXUSER_ADDRESS-7), fsu_fault_nopcb fsudata sttr, x1, 0 mov x0, #0 /* Success */ ret /* Return */ -EEND(suword64) END(suword) +EEND(suword64) ENTRY(setjmp) /* Store the stack pointer */