From owner-dev-commits-src-main@freebsd.org Wed Jan 13 16:42:52 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1C7174E1DCD; Wed, 13 Jan 2021 16:42:52 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGCt40Mnhz4vG2; Wed, 13 Jan 2021 16:42:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F3D1A1AB9F; Wed, 13 Jan 2021 16:42:51 +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 10DGgpPk055420; Wed, 13 Jan 2021 16:42:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10DGgpT6055419; Wed, 13 Jan 2021 16:42:51 GMT (envelope-from git) Date: Wed, 13 Jan 2021 16:42:51 GMT Message-Id: <202101131642.10DGgpT6055419@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: 63c858a04d56 - main - Switch the arm64 pcpu to a global register variable 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: 63c858a04d56529eddbddf85ad04fc8e99e73762 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2021 16:42:52 -0000 The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=63c858a04d56529eddbddf85ad04fc8e99e73762 commit 63c858a04d56529eddbddf85ad04fc8e99e73762 Author: Andrew Turner AuthorDate: 2021-01-11 15:43:39 +0000 Commit: Andrew Turner CommitDate: 2021-01-13 16:36:52 +0000 Switch the arm64 pcpu to a global register variable This removes an unneeded instruction to move the pointer from x18 to a temporary register. Reviewed by: emaste Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D26971 --- sys/arm64/include/pcpu.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/arm64/include/pcpu.h b/sys/arm64/include/pcpu.h index a520cfc7df56..ce4dc46e1609 100644 --- a/sys/arm64/include/pcpu.h +++ b/sys/arm64/include/pcpu.h @@ -56,14 +56,9 @@ struct debug_monitor_state; struct pcb; struct pcpu; -static inline struct pcpu * -get_pcpu(void) -{ - struct pcpu *pcpu; +register struct pcpu *pcpup __asm ("x18"); - __asm __volatile("mov %0, x18" : "=&r"(pcpu)); - return (pcpu); -} +#define get_pcpu() pcpup static inline struct thread * get_curthread(void) @@ -76,11 +71,11 @@ get_curthread(void) #define curthread get_curthread() -#define PCPU_GET(member) (get_pcpu()->pc_ ## member) -#define PCPU_ADD(member, value) (get_pcpu()->pc_ ## member += (value)) +#define PCPU_GET(member) (pcpup->pc_ ## member) +#define PCPU_ADD(member, value) (pcpup->pc_ ## member += (value)) #define PCPU_INC(member) PCPU_ADD(member, 1) -#define PCPU_PTR(member) (&get_pcpu()->pc_ ## member) -#define PCPU_SET(member,value) (get_pcpu()->pc_ ## member = (value)) +#define PCPU_PTR(member) (&pcpup->pc_ ## member) +#define PCPU_SET(member,value) (pcpup->pc_ ## member = (value)) #endif /* _KERNEL */