From owner-svn-src-head@FreeBSD.ORG Thu Jul 29 18:44:10 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB34D106566B; Thu, 29 Jul 2010 18:44:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BFE188FC08; Thu, 29 Jul 2010 18:44:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6TIiAwS023674; Thu, 29 Jul 2010 18:44:10 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6TIiAeB023670; Thu, 29 Jul 2010 18:44:10 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201007291844.o6TIiAeB023670@svn.freebsd.org> From: John Baldwin Date: Thu, 29 Jul 2010 18:44:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210623 - in head/sys: amd64/include i386/include ia64/include X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jul 2010 18:44:11 -0000 Author: jhb Date: Thu Jul 29 18:44:10 2010 New Revision: 210623 URL: http://svn.freebsd.org/changeset/base/210623 Log: Mark the __curthread() functions as __pure2 and remove the volatile keyword from the inline assembly. This allows the compiler to cache invocations of curthread since it's value does not change within a thread context. Submitted by: zec (i386) MFC after: 1 week Modified: head/sys/amd64/include/pcpu.h head/sys/i386/include/pcpu.h head/sys/ia64/include/pcpu.h Modified: head/sys/amd64/include/pcpu.h ============================================================================== --- head/sys/amd64/include/pcpu.h Thu Jul 29 18:02:57 2010 (r210622) +++ head/sys/amd64/include/pcpu.h Thu Jul 29 18:44:10 2010 (r210623) @@ -216,12 +216,12 @@ extern struct pcpu *pcpup; #define PCPU_PTR(member) __PCPU_PTR(pc_ ## member) #define PCPU_SET(member, val) __PCPU_SET(pc_ ## member, val) -static __inline struct thread * +static __inline __pure2 struct thread * __curthread(void) { struct thread *td; - __asm __volatile("movq %%gs:0,%0" : "=r" (td)); + __asm("movq %%gs:0,%0" : "=r" (td)); return (td); } #define curthread (__curthread()) Modified: head/sys/i386/include/pcpu.h ============================================================================== --- head/sys/i386/include/pcpu.h Thu Jul 29 18:02:57 2010 (r210622) +++ head/sys/i386/include/pcpu.h Thu Jul 29 18:44:10 2010 (r210623) @@ -223,12 +223,12 @@ extern struct pcpu *pcpup; #define PCPU_PTR(member) __PCPU_PTR(pc_ ## member) #define PCPU_SET(member, val) __PCPU_SET(pc_ ## member, val) -static __inline struct thread * +static __inline __pure2 struct thread * __curthread(void) { struct thread *td; - __asm __volatile("movl %%fs:0,%0" : "=r" (td)); + __asm("movl %%fs:0,%0" : "=r" (td)); return (td); } #define curthread (__curthread()) Modified: head/sys/ia64/include/pcpu.h ============================================================================== --- head/sys/ia64/include/pcpu.h Thu Jul 29 18:02:57 2010 (r210622) +++ head/sys/ia64/include/pcpu.h Thu Jul 29 18:44:10 2010 (r210623) @@ -70,12 +70,12 @@ struct pcpu; register struct pcpu *pcpup __asm__("r13"); -static __inline struct thread * +static __inline __pure2 struct thread * __curthread(void) { struct thread *td; - __asm __volatile("ld8.acq %0=[r13]" : "=r"(td)); + __asm("ld8.acq %0=[r13]" : "=r"(td)); return (td); } #define curthread (__curthread())