From owner-p4-projects@FreeBSD.ORG Sat Mar 31 02:46:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C639616A403; Sat, 31 Mar 2007 02:46:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9A5C816A401 for ; Sat, 31 Mar 2007 02:46:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8C60813C44C for ; Sat, 31 Mar 2007 02:46:10 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2V2kA2s082842 for ; Sat, 31 Mar 2007 02:46:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2V2kA9H082839 for perforce@freebsd.org; Sat, 31 Mar 2007 02:46:10 GMT (envelope-from imp@freebsd.org) Date: Sat, 31 Mar 2007 02:46:10 GMT Message-Id: <200703310246.l2V2kA9H082839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 116994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 02:46:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=116994 Change 116994 by imp@imp_paco-paco on 2007/03/31 02:45:43 IFC @116992 Affected files ... .. //depot/projects/arm/src/sys/amd64/amd64/support.S#8 integrate .. //depot/projects/arm/src/sys/i386/i386/support.s#7 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/amd64/support.S#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.125 2007/03/30 23:19:08 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $ */ #include "opt_ddb.h" @@ -671,33 +671,15 @@ incl %eax ret -/* - * Support for BB-profiling (gcc -a). The kernbb program will extract - * the data from the kernel. - */ - - .data - ALIGN_DATA - .globl bbhead -bbhead: - .quad 0 - - .text -NON_GPROF_ENTRY(__bb_init_func) - movq $1,(%rdi) - movq bbhead,%rax - movq %rax,32(%rdi) - movq %rdi,bbhead - NON_GPROF_RET +/*****************************************************************************/ +/* linux_futex support */ +/*****************************************************************************/ - .text - futex_fault: movq $0,PCB_ONFAULT(%rcx) movq $-EFAULT,%rax ret -/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_xchgl) movq PCPU(CURPCB),%rcx movq $futex_fault,PCB_ONFAULT(%rcx) @@ -715,7 +697,6 @@ movq %rax,PCB_ONFAULT(%rcx) ret -/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_addl) movq PCPU(CURPCB),%rcx movq $futex_fault,PCB_ONFAULT(%rcx) @@ -732,3 +713,22 @@ xorl %eax,%eax movq %rax,PCB_ONFAULT(%rcx) ret + +/* + * Support for BB-profiling (gcc -a). The kernbb program will extract + * the data from the kernel. + */ + + .data + ALIGN_DATA + .globl bbhead +bbhead: + .quad 0 + + .text +NON_GPROF_ENTRY(__bb_init_func) + movq $1,(%rdi) + movq bbhead,%rax + movq %rax,32(%rdi) + movq %rdi,bbhead + NON_GPROF_RET ==== //depot/projects/arm/src/sys/i386/i386/support.s#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/support.s,v 1.116 2007/03/30 23:19:08 jkim Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.117 2007/03/31 01:47:37 jkim Exp $ */ #include "opt_npx.h" @@ -1513,35 +1513,15 @@ incl %eax ret -/* - * Support for BB-profiling (gcc -a). The kernbb program will extract - * the data from the kernel. - */ +/*****************************************************************************/ +/* linux_futex support */ +/*****************************************************************************/ - .data - ALIGN_DATA - .globl bbhead -bbhead: - .long 0 - - .text -NON_GPROF_ENTRY(__bb_init_func) - movl 4(%esp),%eax - movl $1,(%eax) - movl bbhead,%edx - movl %edx,16(%eax) - movl %eax,bbhead - NON_GPROF_RET - -/* necessary for linux_futex support */ - .text - futex_fault: movl $0,PCB_ONFAULT(%ecx) movl $-EFAULT,%eax ret -/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_xchgl) movl PCPU(CURPCB),%ecx movl $futex_fault,PCB_ONFAULT(%ecx) @@ -1560,7 +1540,6 @@ movl $0,PCB_ONFAULT(%ecx) ret -/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_addl) movl PCPU(CURPCB),%ecx movl $futex_fault,PCB_ONFAULT(%ecx) @@ -1578,3 +1557,23 @@ xorl %eax,%eax movl $0,PCB_ONFAULT(%ecx) ret + +/* + * Support for BB-profiling (gcc -a). The kernbb program will extract + * the data from the kernel. + */ + + .data + ALIGN_DATA + .globl bbhead +bbhead: + .long 0 + + .text +NON_GPROF_ENTRY(__bb_init_func) + movl 4(%esp),%eax + movl $1,(%eax) + movl bbhead,%edx + movl %edx,16(%eax) + movl %eax,bbhead + NON_GPROF_RET