Kill _NOREGNAMES. Everything should be using %rX now. If it doesn't it

soon will.
2011-01-17 08:23:53 +00:00 · 2011-01-17 08:23:53 +00:00 · 51db1c5cf3
commit 51db1c5cf3
parent a673bf604d
27 changed files with 30 additions and 59 deletions
--- a/lib/libc/arch/powerpc/Makefile.inc
+++ b/lib/libc/arch/powerpc/Makefile.inc
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.12 2011/01/16 02:43:10 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.13 2011/01/17 08:23:53 matt Exp $

 SRCS+=		__sigaction14_sigtramp.c __sigtramp2.S

-CPPFLAGS+=	-I. -D_NOREGNAMES
+CPPFLAGS+=	-I.

 .if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")
 .include <softfloat/Makefile.inc>
--- a/lib/libc/arch/powerpc64/sys/__sigtramp2.S
+++ b/lib/libc/arch/powerpc64/sys/__sigtramp2.S
@ -1,4 +1,4 @@
-/*	$NetBSD: __sigtramp2.S,v 1.2 2008/04/28 20:22:57 martin Exp $	*/
+/*	$NetBSD: __sigtramp2.S,v 1.3 2011/01/17 08:23:54 matt Exp $	*/

 /*-
 * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -29,7 +29,6 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#define _NOREGNAMES
 #include "SYS.h"

 /*
--- a/sys/arch/amigappc/amigappc/locore.S
+++ b/sys/arch/amigappc/amigappc/locore.S
@ -1,4 +1,4 @@
-/*      $NetBSD: locore.S,v 1.21 2010/03/05 17:55:42 phx Exp $   */
+/*      $NetBSD: locore.S,v 1.22 2011/01/17 08:23:54 matt Exp $   */

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -50,7 +50,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>

 #include <powerpc/spr.h>
--- a/sys/arch/bebox/bebox/locore.S
+++ b/sys/arch/bebox/bebox/locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.21 2010/03/03 00:30:15 pooka Exp $	*/
+/*	$NetBSD: locore.S,v 1.22 2011/01/17 08:23:54 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

 /*
@ -48,7 +48,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>

 #include <powerpc/spr.h>
--- a/sys/arch/evbppc/ev64260/ev64260_locore.S
+++ b/sys/arch/evbppc/ev64260/ev64260_locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: ev64260_locore.S,v 1.15 2010/03/03 00:30:15 pooka Exp $	*/
+/*	$NetBSD: ev64260_locore.S,v 1.16 2011/01/17 08:23:54 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

 /*
@ -47,7 +47,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>

 #include <powerpc/spr.h>
--- a/sys/arch/evbppc/explora/explora_start.S
+++ b/sys/arch/evbppc/explora/explora_start.S
@ -1,4 +1,4 @@
-/*	$NetBSD: explora_start.S,v 1.7 2010/02/25 23:33:44 matt Exp $	*/
+/*	$NetBSD: explora_start.S,v 1.8 2011/01/17 08:23:54 matt Exp $	*/

 /*-
 * Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -41,8 +41,6 @@

 #include "assym.h"

-#define _NOREGNAMES
-
 #include <machine/param.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
--- a/sys/arch/evbppc/obs405/obs200_locore.S
+++ b/sys/arch/evbppc/obs405/obs200_locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: obs200_locore.S,v 1.9 2010/03/18 13:47:04 kiyohara Exp $	*/
+/*	$NetBSD: obs200_locore.S,v 1.10 2011/01/17 08:23:54 matt Exp $	*/
 /*	Original Tag: locore.S,v 1.1 2003/09/23 15:21:58 shige Exp	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

@ -69,7 +69,6 @@
 */

 #undef PPC_4XX_NOCACHE
-#define _NOREGNAMES

 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
--- a/sys/arch/evbppc/obs405/obs600_locore.S
+++ b/sys/arch/evbppc/obs405/obs600_locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: obs600_locore.S,v 1.2 2011/01/14 02:06:25 rmind Exp $	*/
+/*	$NetBSD: obs600_locore.S,v 1.3 2011/01/17 08:23:54 matt Exp $	*/

 /*
 * Copyright (c) 2009 KIYOHARA Takashi
@ -27,7 +27,6 @@
 */

 #undef PPC_4XX_NOCACHE
-#define _NOREGNAMES

 #include "opt_ddb.h"
 #include "opt_ppcarch.h"
--- a/sys/arch/evbppc/pmppc/pmppc_locore.S
+++ b/sys/arch/evbppc/pmppc/pmppc_locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: pmppc_locore.S,v 1.8 2010/12/11 17:13:49 matt Exp $	*/
+/*	$NetBSD: pmppc_locore.S,v 1.9 2011/01/17 08:23:55 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

 /*
@ -47,7 +47,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>

 #include <powerpc/spr.h>
--- a/sys/arch/evbppc/virtex/virtex_start.S
+++ b/sys/arch/evbppc/virtex/virtex_start.S
@ -1,4 +1,4 @@
-/*	$NetBSD: virtex_start.S,v 1.6 2010/03/18 14:04:07 kiyohara Exp $ */
+/*	$NetBSD: virtex_start.S,v 1.7 2011/01/17 08:23:55 matt Exp $ */

 /*
 * Copyright (c) 2006 Jachym Holecek
@ -33,8 +33,6 @@
 * This file is based on startup code of Walnut and Explora boards.
 */

-#define _NOREGNAMES
-
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_lockdebug.h"
--- a/sys/arch/evbppc/walnut/walnut_start.S
+++ b/sys/arch/evbppc/walnut/walnut_start.S
@ -1,4 +1,4 @@
-/*	$NetBSD: walnut_start.S,v 1.20 2011/01/17 06:54:57 matt Exp $	*/
+/*	$NetBSD: walnut_start.S,v 1.21 2011/01/17 08:23:55 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

 /*
@ -68,7 +68,6 @@
 */

 #undef PPC_4XX_NOCACHE
-#define _NOREGNAMES

 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
--- a/sys/arch/ibmnws/ibmnws/locore.S
+++ b/sys/arch/ibmnws/ibmnws/locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.8 2010/03/03 00:30:15 pooka Exp $	*/
+/*	$NetBSD: locore.S,v 1.9 2011/01/17 08:23:55 matt Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -31,8 +31,6 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#define _NOREGNAMES
-
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_lockdebug.h"
--- a/sys/arch/macppc/macppc/locore.S
+++ b/sys/arch/macppc/macppc/locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.65 2010/02/25 23:33:45 matt Exp $	*/
+/*	$NetBSD: locore.S,v 1.66 2011/01/17 08:23:55 matt Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -48,7 +48,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>
 #include <machine/vmparam.h>

--- a/sys/arch/mvmeppc/mvmeppc/locore.S
+++ b/sys/arch/mvmeppc/mvmeppc/locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.12 2010/03/03 00:30:15 pooka Exp $	*/
+/*	$NetBSD: locore.S,v 1.13 2011/01/17 08:23:56 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

 /*
@ -47,7 +47,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>

 #include <powerpc/spr.h>
--- a/sys/arch/ofppc/ofppc/locore.S
+++ b/sys/arch/ofppc/ofppc/locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.45 2011/01/17 07:06:10 matt Exp $	*/
+/*	$NetBSD: locore.S,v 1.46 2011/01/17 08:23:56 matt Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -45,7 +45,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>
 #include <machine/vmparam.h>

--- a/sys/arch/powerpc/ibm4xx/openbios/locore.S
+++ b/sys/arch/powerpc/ibm4xx/openbios/locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.8 2010/03/18 13:58:38 kiyohara Exp $	*/
+/*	$NetBSD: locore.S,v 1.9 2011/01/17 08:23:56 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

 /*
@ -68,7 +68,6 @@
 */

 #undef PPC_4XX_NOCACHE
-#define _NOREGNAMES

 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
--- a/sys/arch/powerpc/include/asm.h
+++ b/sys/arch/powerpc/include/asm.h
@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.32 2011/01/16 02:41:55 matt Exp $	*/
+/*	$NetBSD: asm.h,v 1.33 2011/01/17 08:23:56 matt Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -212,7 +212,7 @@ y:	.quad	.y,.TOC.@tocbase,0;	\

 /* Condition Register Bit Fields */

-#if !defined(_NOREGNAMES)
+#if defined(_REGNAMES)
 #if defined(_KERNEL) || defined(_STANDALONE)
 #define cr0     0
 #define cr1     1
@ -297,7 +297,7 @@ y:	.quad	.y,.TOC.@tocbase,0;	\
 #define fr30    30
 #define fr31    31
 #endif
-#endif /* !_NOREGNAMES */
+#endif /* _REGNAMES */

 /*
 * Add some psuedo instructions to made sharing of assembly versions of
--- a/sys/arch/powerpc/powerpc/darwin_commpage_machdep.S
+++ b/sys/arch/powerpc/powerpc/darwin_commpage_machdep.S
@ -1,4 +1,4 @@
-/*	$NetBSD: darwin_commpage_machdep.S,v 1.9 2009/04/13 11:56:35 he Exp $ */
+/*	$NetBSD: darwin_commpage_machdep.S,v 1.10 2011/01/17 08:23:56 matt Exp $ */

 /*
 * Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -29,7 +29,6 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#define _NOREGNAMES
 #include <machine/asm.h>

 #include <compat/mach/mach_syscall.h>
--- a/sys/arch/powerpc/powerpc/lock_stubs.S
+++ b/sys/arch/powerpc/powerpc/lock_stubs.S
@ -1,4 +1,4 @@
-/*	$NetBSD: lock_stubs.S,v 1.6 2008/05/25 15:56:12 chs Exp $	*/
+/*	$NetBSD: lock_stubs.S,v 1.7 2011/01/17 08:23:56 matt Exp $	*/

 /*-
 * Copyright (c) 2007 The NetBSD Foundation, Inc.
@ -32,7 +32,6 @@
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"

-#define _NOREGNAMES
 #include <machine/asm.h>

 #include "assym.h"
--- a/sys/arch/powerpc/powerpc/ofwreal.S
+++ b/sys/arch/powerpc/powerpc/ofwreal.S
@ -1,4 +1,4 @@
-/*	$NetBSD: ofwreal.S,v 1.11 2007/10/17 19:56:47 garbled Exp $	*/
+/*	$NetBSD: ofwreal.S,v 1.12 2011/01/17 08:23:56 matt Exp $	*/

 /*
 * Copyright (C) 1996 Wolfgang Solfrank.
@ -44,7 +44,6 @@
 */
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>

 #define	CACHELINE	32		/* Note that this value is really
--- a/sys/arch/powerpc/powerpc/setfault.S
+++ b/sys/arch/powerpc/powerpc/setfault.S
@ -1,4 +1,4 @@
-/*	$NetBSD: setfault.S,v 1.6 2010/03/20 23:31:30 chs Exp $	*/
+/*	$NetBSD: setfault.S,v 1.7 2011/01/17 08:23:56 matt Exp $	*/

 /*
 * Copyright (c) 2001 Wasabi Systems, Inc.
@ -65,7 +65,6 @@
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#define _NOREGNAMES
 #include "assym.h"
 #include <machine/asm.h>

--- a/sys/arch/powerpc/powerpc/setjmp.S
+++ b/sys/arch/powerpc/powerpc/setjmp.S
@ -1,9 +1,8 @@
-/*	$NetBSD: setjmp.S,v 1.3 2005/12/11 12:18:46 christos Exp $	*/
+/*	$NetBSD: setjmp.S,v 1.4 2011/01/17 08:23:56 matt Exp $	*/
 /*	from:	OpenBSD: setjmp.S,v 1.2 1996/12/28 06:22:18 rahnds Exp 	*/
 /* kernel version of this file, does not have signal goop */
 /* int setjmp(jmp_buf env) */

-#define _NOREGNAMES
 #include <machine/asm.h>

 #define JMP_r1	0x04
--- a/sys/arch/powerpc/powerpc/sigcode.S
+++ b/sys/arch/powerpc/powerpc/sigcode.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sigcode.S,v 1.6 2005/12/11 12:18:46 christos Exp $	*/
+/*	$NetBSD: sigcode.S,v 1.7 2011/01/17 08:23:56 matt Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -31,7 +31,6 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#define _NOREGNAMES
 #include <machine/asm.h>
 #include <machine/signal.h>
 #include <sys/syscall.h>
--- a/sys/arch/prep/prep/locore.S
+++ b/sys/arch/prep/prep/locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.15 2010/03/03 00:30:15 pooka Exp $	*/
+/*	$NetBSD: locore.S,v 1.16 2011/01/17 08:23:56 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

 /*
@ -47,7 +47,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>

 #include <powerpc/spr.h>
--- a/sys/arch/rs6000/rs6000/locore.S
+++ b/sys/arch/rs6000/rs6000/locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.7 2010/03/03 00:30:16 pooka Exp $	*/
+/*	$NetBSD: locore.S,v 1.8 2011/01/17 08:23:57 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

 /*
@ -47,7 +47,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>

 #include <powerpc/spr.h>
--- a/sys/arch/sandpoint/sandpoint/locore.S
+++ b/sys/arch/sandpoint/sandpoint/locore.S
@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.19 2010/03/03 00:30:16 pooka Exp $	*/
+/*	$NetBSD: locore.S,v 1.20 2011/01/17 08:23:57 matt Exp $	*/
 /*	$OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $	*/

 /*
@ -47,7 +47,6 @@
 #include <machine/pmap.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
-#define _NOREGNAMES
 #include <machine/asm.h>

 #include <powerpc/spr.h>
--- a/sys/lib/libkern/arch/powerpc/Makefile.inc
+++ b/sys/lib/libkern/arch/powerpc/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.29 2011/01/16 03:22:19 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.30 2011/01/17 08:23:57 matt Exp $

 SRCS+=	bswap16.c bswap32.c
 SRCS+=	htonl.c htons.c ntohl.c ntohs.c
@ -6,8 +6,6 @@ SRCS+=	syncicache.c

 SRCS+=	ffs.S memset.S strlen.S

-CPPFLAGS+=	-D_NOREGNAMES
-
 # Disable the asm versions on evbppc because they break the Explora
 .if ${MACHINE} == "evbppc"
 memcpy.o: memcpy.c