From nobody Fri Mar 31 15:56:16 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 4Pp4dr6tbCz42vmc; Fri, 31 Mar 2023 15:56:16 +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 4Pp4dr60Nqz4HTh; Fri, 31 Mar 2023 15:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680278176; 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=dwhrkLqHzzXU3En2KFPOVLCLGKnb8IhVAD18ruAX5+I=; b=YdTwZyG1XYGSUF+CY5oRNAofbwS82fgHQkh4mb8xT8bDWa1sUDT4U8OjjcaviY+I36fRnf OZqDjTFEXpATjvtKnvGCPa8ChC7nE9IsaS2h7M0kjjXbsoqXwQn/usGYNnDZygN0C/z3T8 2m+Y9v394vV1EFECtLIrRWIsyagyDMMrz0zeFlgsMTLq1JBQM+qz5SaNCIwI8N6hs9iJXc cftOzi3zvuctIved5dw7TST9YyyidurO4BzDiXtF05ya/SNtUYbmdGauIpp4Lcrzuq9hKH q04Ge9flKibkysw2y5VxY60p9gETV3UHu1+eb0hKuSI+EN6nZ+CdLtHsrbHtRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680278176; 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=dwhrkLqHzzXU3En2KFPOVLCLGKnb8IhVAD18ruAX5+I=; b=qq1c8a6LWd039bTqFcUOE8DNQy9sYj9ckfOCmmkbfC/plwqAnf3gQuxtJnfZlD2pGLQnKv kxEOcM4e1gOZgdzAZhC2y3a2PJJeNbeXM4KvTjqdSrkV8NvWltIkgvprhx5cotVoIEfp0v iFMi0deNo8IZTsE7C0LO9TBGvYyMVg35yeLk3o9g0AUCbmbThX5poC4pTKIWd2k55oyuT4 hjzA8kWjjatN/Rm2Kg9cyU52/OUALYx7s7vu+DM/okiRFSUODxi/YdUfwppeiqwsuh/+VU yoVi3gTU5+rpp9C525PBvH/E4l9Vq3xYljo+JIz6elegqvZg6b+lL4jDzDVc/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680278176; a=rsa-sha256; cv=none; b=DTiQuWUp/7f1QlY1Nhp8U7j2Eq0xURxdsIXY3uPEOx3yo8PQ1lO3ZDpwbe1VxkPwOCvMA+ 9bzyw9HF6JLWmoEwqEZbWXEXPbzfV6kDxxsxzQw1BxF8tZnn8WLTSrjwKtOmVACdVPmrvh s0DAhbBWtZanRMKZZ8i6iRMeDiiRsmtEdk5mE1LzrR+4oT5qiwQ2zVnZlR1unv2A9uWnWU o5D3jTnz+LMG/aMnaUYdWi5XbEYdueOD/AgBblt7nIf4Mhgn6JpQUwdg4gPHOkIV4jtsFW uXuoOWMDnUZtaviA0N298rlSCSEdEDpriMHejTu8fw2gufLyXRQpVYcORMitGQ== 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 4Pp4dr544Gz10VT; Fri, 31 Mar 2023 15:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32VFuGao080990; Fri, 31 Mar 2023 15:56:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VFuGQT080989; Fri, 31 Mar 2023 15:56:16 GMT (envelope-from git) Date: Fri, 31 Mar 2023 15:56:16 GMT Message-Id: <202303311556.32VFuGQT080989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 47ff149afaea - main - 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/main X-Git-Reftype: branch X-Git-Commit: 47ff149afaea6a403b8d044e26673bc3cd605fe4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=47ff149afaea6a403b8d044e26673bc3cd605fe4 commit 47ff149afaea6a403b8d044e26673bc3cd605fe4 Author: Andrew Turner AuthorDate: 2023-03-31 12:34:51 +0000 Commit: Andrew Turner CommitDate: 2023-03-31 15:45:31 +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 --- 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 885af5676159..28ac1d553fbc 100644 --- a/sys/arm64/arm64/support.S +++ b/sys/arm64/arm64/support.S @@ -175,15 +175,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) @@ -218,14 +218,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 */