From owner-p4-projects@FreeBSD.ORG Sat Sep 2 16:33:29 2006 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 8864716A4E0; Sat, 2 Sep 2006 16:33:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62BB416A4DE for ; Sat, 2 Sep 2006 16:33:29 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24D9643D45 for ; Sat, 2 Sep 2006 16:33:29 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k82GXSRh033881 for ; Sat, 2 Sep 2006 16:33:29 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k82GXSQi033878 for perforce@freebsd.org; Sat, 2 Sep 2006 16:33:28 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 2 Sep 2006 16:33:28 GMT Message-Id: <200609021633.k82GXSQi033878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 105548 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, 02 Sep 2006 16:33:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=105548 Change 105548 by gonzo@gonzo_hideout on 2006/09/02 16:32:42 o Get rid of NetBSD's specific files. o Make all syscalls to be in form __sys_xxx/_xxx/xxx set of symbols. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/sys/__sigaction14_sigtramp.c#2 delete .. //depot/projects/mips2/src/lib/libc/mips/sys/__sigtramp2.S#2 delete .. //depot/projects/mips2/src/lib/libc/mips/sys/__syscall.S#2 delete .. //depot/projects/mips2/src/lib/libc/mips/sys/brk.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/cerror.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/fork.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/getcontext.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/pipe.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#2 edit .. //depot/projects/mips2/src/lib/libc/mips/sys/syscall.S#2 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/mips/sys/brk.S#2 (text+ko) ==== @@ -39,36 +39,36 @@ ASMSTR("$NetBSD: brk.S,v 1.16 2003/08/07 16:42:17 agc Exp $") #endif /* LIBC_SCCS and not lint */ - .globl _C_LABEL(__minbrk) - .globl _C_LABEL(__curbrk) + .globl _C_LABEL(minbrk) + .globl _C_LABEL(curbrk) .globl _C_LABEL(_end) -#ifdef WEAK_ALIAS -WEAK_ALIAS(brk, _brk) -#endif - .data -_C_LABEL(__minbrk): +_C_LABEL(minbrk): + .word _C_LABEL(_end) +_C_LABEL(curbrk): .word _C_LABEL(_end) .text -LEAF(_brk) +LEAF(__sys_brk) + WEAK_ALIAS(brk, __sys_brk) + WEAK_ALIAS(_brk, __sys_brk) #ifdef __ABICALLS__ .set noreorder .cpload t9 .set reorder #endif - lw v0, _C_LABEL(__minbrk) + lw v0, _C_LABEL(minbrk) bgeu a0, v0, 1f move a0, v0 # dont allow break < minbrk 1: li v0, SYS_break syscall bne a3, zero, 2f - sw a0, _C_LABEL(__curbrk) + sw a0, _C_LABEL(curbrk) move v0, zero j ra 2: la t9, _C_LABEL(__cerror) jr t9 -END(_brk) +END(__sys_brk) ==== //depot/projects/mips2/src/lib/libc/mips/sys/cerror.S#2 (text+ko) ==== @@ -41,7 +41,8 @@ #ifdef _REENTRANT .globl _C_LABEL(__errno) -NESTED_NOPROFILE(__cerror, CALLFRAME_SIZ, ra) +LEAF(__cerror) + .frame sp, CALLFRAME_SIZ, ra PIC_PROLOGUE(__cerror, t9) subu sp, sp, CALLFRAME_SIZ .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) @@ -61,7 +62,7 @@ END(__cerror) #else .globl _C_LABEL(errno) -LEAF_NOPROFILE(__cerror) +LEAF(__cerror) .set noreorder #ifdef __ABICALLS__ .cpload t9 ==== //depot/projects/mips2/src/lib/libc/mips/sys/fork.S#2 (text+ko) ==== @@ -39,12 +39,15 @@ ASMSTR("$NetBSD: fork.S,v 1.11 2003/08/07 16:42:17 agc Exp $") #endif /* LIBC_SCCS and not lint */ -LEAF(__fork) +LEAF(__sys_fork) + WEAK_ALIAS(fork, __sys_fork) + WEAK_ALIAS(_fork, __sys_fork) #ifdef __ABICALLS__ .set noreorder .cpload t9 .set reorder #endif + fork = __sys_fork li v0, SYS_fork # pid = fork() syscall bne a3, zero, 2f @@ -55,4 +58,4 @@ 2: la t9, _C_LABEL(__cerror) jr t9 -END(__fork) +END(__sys_fork) ==== //depot/projects/mips2/src/lib/libc/mips/sys/getcontext.S#2 (text+ko) ==== @@ -52,8 +52,8 @@ SYSTRAP(getcontext) bne a3, zero, 1f REG_PROLOGUE - REG_S zero, (_OFFSETOF_UC_GREGS + _REG_V0 * SZREG)(a0) - REG_S ra, (_OFFSETOF_UC_GREGS + _REG_EPC * SZREG)(a0) + sw zero, (_OFFSETOF_UC_GREGS + _REG_V0 * SZREG)(a0) + sw ra, (_OFFSETOF_UC_GREGS + _REG_EPC * SZREG)(a0) REG_EPILOGUE j ra 1: ==== //depot/projects/mips2/src/lib/libc/mips/sys/pipe.S#2 (text+ko) ==== @@ -39,11 +39,9 @@ ASMSTR("$NetBSD: pipe.S,v 1.11 2005/04/22 06:58:01 simonb Exp $") #endif /* LIBC_SCCS and not lint */ -#ifdef WEAK_ALIAS -WEAK_ALIAS(pipe, _pipe) -#endif - -LEAF(_pipe) +LEAF(__sys_pipe) + WEAK_ALIAS(pipe, __sys_pipe) + WEAK_ALIAS(_pipe, __sys_pipe) #ifdef __ABICALLS__ .set noreorder .cpload t9 @@ -59,4 +57,4 @@ 1: la t9, _C_LABEL(__cerror) jr t9 -END(_pipe) +END(__sys_pipe) ==== //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#2 (text+ko) ==== @@ -42,16 +42,14 @@ .globl _C_LABEL(__curbrk) .globl _C_LABEL(_end) -#ifdef WEAK_ALIAS -WEAK_ALIAS(sbrk, _sbrk) -#endif - .data _C_LABEL(__curbrk): .word _C_LABEL(_end) .text -LEAF(_sbrk) +LEAF(__sys_sbrk) + WEAK_ALIAS(sbrk, __sys_sbrk) + WEAK_ALIAS(_sbrk, __sys_sbrk) #ifdef __ABICALLS__ .set noreorder .cpload t9 @@ -68,4 +66,4 @@ 1: la t9, _C_LABEL(__cerror) jr t9 -END(_sbrk) +END(__sys_sbrk) ==== //depot/projects/mips2/src/lib/libc/mips/sys/syscall.S#2 (text+ko) ====