From owner-svn-src-all@FreeBSD.ORG Thu Aug 5 22:04:08 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30AC5106566C; Thu, 5 Aug 2010 22:04:08 +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 04C988FC0C; Thu, 5 Aug 2010 22:04:08 +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 o75M47QG018922; Thu, 5 Aug 2010 22:04:07 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o75M47Kn018919; Thu, 5 Aug 2010 22:04:07 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201008052204.o75M47Kn018919@svn.freebsd.org> From: John Baldwin Date: Thu, 5 Aug 2010 22:04:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210902 - in stable/7/sys: amd64/include i386/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2010 22:04:08 -0000 Author: jhb Date: Thu Aug 5 22:04:07 2010 New Revision: 210902 URL: http://svn.freebsd.org/changeset/base/210902 Log: MFC 210623: 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. Modified: stable/7/sys/amd64/include/pcpu.h stable/7/sys/i386/include/pcpu.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/amd64/include/pcpu.h ============================================================================== --- stable/7/sys/amd64/include/pcpu.h Thu Aug 5 22:01:14 2010 (r210901) +++ stable/7/sys/amd64/include/pcpu.h Thu Aug 5 22:04:07 2010 (r210902) @@ -188,12 +188,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: stable/7/sys/i386/include/pcpu.h ============================================================================== --- stable/7/sys/i386/include/pcpu.h Thu Aug 5 22:01:14 2010 (r210901) +++ stable/7/sys/i386/include/pcpu.h Thu Aug 5 22:04:07 2010 (r210902) @@ -189,12 +189,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())