From owner-p4-projects@FreeBSD.ORG  Wed Aug 30 18:39:26 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5413416A4E7; Wed, 30 Aug 2006 18:39:26 +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 2F82516A4E0
	for <perforce@FreeBSD.org>; Wed, 30 Aug 2006 18:39:26 +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 175A843D62
	for <perforce@FreeBSD.org>; Wed, 30 Aug 2006 18:39:25 +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 k7UIdOLb010817
	for <perforce@FreeBSD.org>; Wed, 30 Aug 2006 18:39:24 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7UIdOO6010811
	for perforce@freebsd.org; Wed, 30 Aug 2006 18:39:24 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 30 Aug 2006 18:39:24 GMT
Message-Id: <200608301839.k7UIdOO6010811@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 105346 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Aug 2006 18:39:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=105346

Change 105346 by gonzo@gonzo_hq on 2006/08/30 18:38:29

	o Reorder defines that is  we will have __sys_xxx as a syscall entry 
	    point and _xxx, xxx as weak aliases for __sys_xxx.

Affected files ...

.. //depot/projects/mips2/src/lib/libc/mips/SYS.h#4 edit

Differences ...

==== //depot/projects/mips2/src/lib/libc/mips/SYS.h#4 (text+ko) ====

@@ -86,43 +86,44 @@
 # define PIC_CALL(l,sr)		j  _C_LABEL(l)
 #endif
 
-# define SYSTRAP(x)	li v0,SYS_ ## x; syscall;
+# define SYSTRAP(x)	li v0, SYS_ ## x; syscall;
 
 /*
  * Do a syscall that cannot fail (sync, get{p,u,g,eu,eg)id)
  */
 #define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x,x)
+	PSEUDO_NOERROR(x)
 
 /*
  * Do a normal syscall.
  */
 #define RSYSCALL(x)							\
-	PSEUDO(x,x)
+	PSEUDO(x)
 
 /*
- * Do a syscall that has an internal name and a weak external alias.
- */
-#define	WSYSCALL(weak,strong)						\
-	WEAK_ALIAS(weak,strong);					\
-	PSEUDO(strong,weak)
-
-/*
  * Do a renamed or pseudo syscall (e.g., _exit()), where the entrypoint
  * and syscall name are not the same.
  */
-#define PSEUDO_NOERROR(x,y)						\
-LEAF(x);								\
-	SYSTRAP(y);							\
+#define PSEUDO_NOERROR(x)						\
+LEAF(__sys_ ## x);							\
+        .weak _C_LABEL(x);						\
+	_C_LABEL(x) = _C_LABEL(__CONCAT(__sys_,x));			\
+	.weak _C_LABEL(__CONCAT(_,x));					\
+	_C_LABEL(__CONCAT(_,x)) = _C_LABEL(__CONCAT(__sys_,x));		\
+	SYSTRAP(x);							\
 	j ra;								\
-	END(x)
+	END(__sys_ ## x)
 
-#define PSEUDO(x,y)							\
-LEAF(x);								\
+#define PSEUDO(x)							\
+LEAF(__sys_ ## x);							\
+        .weak _C_LABEL(x);						\
+	_C_LABEL(x) = _C_LABEL(__CONCAT(__sys_,x));			\
+	.weak _C_LABEL(__CONCAT(_,x));					\
+	_C_LABEL(__CONCAT(_,x)) = _C_LABEL(__CONCAT(__sys_,x));		\
 	PIC_PROLOGUE(x,t9);						\
-	SYSTRAP(y);							\
+	SYSTRAP(x);							\
 	bne a3,zero,err;						\
 	j ra;								\
 err:									\
 	PIC_CALL(__cerror,t9);						\
-	END(x)
+	END(__sys_ ## x)