Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Use END(foo) everywhere.
details: https://anonhg.NetBSD.org/src/rev/dd4c48bab8ba
branches: trunk
changeset: 760874:dd4c48bab8ba
user: matt <matt%NetBSD.org@localhost>
date: Sat Jan 15 07:31:11 2011 +0000
description:
Use END(foo) everywhere.
Make __cerror hidden.
Use non-PLT calls to __cerror.
Use assym.h when appropriate.
Use addi to adjust stack instead of loading it.
Add __RCSIDs
Force -D_NOREGNAMES for all .S files.
[this is all in preperation for secure plt support]
diffstat:
common/lib/libc/arch/powerpc/atomic/atomic_add.S | 7 +-
common/lib/libc/arch/powerpc/atomic/atomic_and.S | 7 +-
common/lib/libc/arch/powerpc/atomic/atomic_cas.S | 6 +-
common/lib/libc/arch/powerpc/atomic/atomic_dec.S | 5 +-
common/lib/libc/arch/powerpc/atomic/atomic_inc.S | 7 +-
common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h | 3 +-
common/lib/libc/arch/powerpc/atomic/atomic_or.S | 7 +-
common/lib/libc/arch/powerpc/atomic/atomic_swap.S | 6 +-
common/lib/libc/arch/powerpc/atomic/membar_ops.S | 7 +-
common/lib/libc/arch/powerpc/string/ffs.S | 9 +-
common/lib/libc/arch/powerpc/string/memcmp.S | 4 +-
common/lib/libc/arch/powerpc/string/memcpy.S | 5 +-
common/lib/libc/arch/powerpc/string/memmove.S | 8 ++-
common/lib/libc/arch/powerpc/string/strlen.S | 8 +-
lib/libc/arch/powerpc/Makefile.inc | 5 +-
lib/libc/arch/powerpc/SYS.h | 10 ++-
lib/libc/arch/powerpc/gen/__setjmp14.S | 26 ++++-----
lib/libc/arch/powerpc/gen/__sigsetjmp14.S | 26 ++++-----
lib/libc/arch/powerpc/gen/_setjmp.S | 7 +-
lib/libc/arch/powerpc/gen/swapcontext.S | 36 +++++++------
lib/libc/arch/powerpc/genassym.cf | 15 +++-
lib/libc/arch/powerpc/string/bzero.S | 10 +++-
lib/libc/arch/powerpc/sys/__clone.S | 12 +++-
lib/libc/arch/powerpc/sys/__sigtramp2.S | 8 ++-
lib/libc/arch/powerpc/sys/__vfork14.S | 3 +-
lib/libc/arch/powerpc/sys/brk.S | 12 +++-
lib/libc/arch/powerpc/sys/cerror.S | 26 ++++++---
lib/libc/arch/powerpc/sys/fork.S | 3 +-
lib/libc/arch/powerpc/sys/getcontext.S | 20 +++---
lib/libc/arch/powerpc/sys/pipe.S | 12 +++-
lib/libc/arch/powerpc/sys/ptrace.S | 43 ++++++++++------
lib/libc/arch/powerpc/sys/sbrk.S | 20 +++---
lib/libc/compat/arch/powerpc/Makefile.inc | 4 +-
lib/libc/compat/arch/powerpc/gen/compat_setjmp.S | 22 +++----
lib/libc/compat/arch/powerpc/gen/compat_sigsetjmp.S | 22 +++----
lib/libc/compat/arch/powerpc/sys/compat_Ovfork.S | 7 ++-
lib/libc/compat/arch/powerpc/sys/compat___sigtramp1.S | 12 +++-
lib/libc/compat/arch/powerpc/sys/compat_sigpending13.S | 12 +++-
lib/libc/compat/arch/powerpc/sys/compat_sigprocmask13.S | 15 +++-
lib/libc/compat/arch/powerpc/sys/compat_sigsuspend13.S | 12 +++-
40 files changed, 294 insertions(+), 195 deletions(-)
diffs (truncated from 1363 to 300 lines):
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/atomic/atomic_add.S
--- a/common/lib/libc/arch/powerpc/atomic/atomic_add.S Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/atomic/atomic_add.S Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_add.S,v 1.6 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: atomic_add.S,v 1.7 2011/01/15 07:31:11 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,14 +31,16 @@
#include "atomic_op_asm.h"
+__RCSID("$NetBSD: atomic_add.S,v 1.7 2011/01/15 07:31:11 matt Exp $")
+
.text
-
ENTRY(_atomic_add_32)
1: lwarx %r10,0,%r3
add %r10,%r10,%r4
stwcx. %r10,0,%r3
bne- 1b
blr
+END(_atomic_add_32)
ATOMIC_OP_ALIAS(atomic_add_32,_atomic_add_32)
ATOMIC_OP_ALIAS(atomic_add_int,_atomic_add_32)
STRONG_ALIAS(_atomic_add_int,_atomic_add_32)
@@ -56,6 +58,7 @@
bne- 1b
mr %r3,%r10
blr
+END(_atomic_add_32_nv)
ATOMIC_OP_ALIAS(atomic_add_32_nv,_atomic_add_32_nv)
ATOMIC_OP_ALIAS(atomic_add_int_nv,_atomic_add_32_nv)
STRONG_ALIAS(_atomic_add_int_nv,_atomic_add_32_nv)
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/atomic/atomic_and.S
--- a/common/lib/libc/arch/powerpc/atomic/atomic_and.S Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/atomic/atomic_and.S Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_and.S,v 1.5 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: atomic_and.S,v 1.6 2011/01/15 07:31:11 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,14 +31,16 @@
#include "atomic_op_asm.h"
+__RCSID("$NetBSD: atomic_and.S,v 1.6 2011/01/15 07:31:11 matt Exp $")
+
.text
-
ENTRY(_atomic_and_32)
1: lwarx %r10,0,%r3
and %r10,%r10,%r4
stwcx. %r10,0,%r3
bne- 1b
blr
+END(_atomic_and_32)
ATOMIC_OP_ALIAS(atomic_and_32,_atomic_and_32)
ATOMIC_OP_ALIAS(atomic_and_uint,_atomic_and_32)
STRONG_ALIAS(_atomic_and_uint,_atomic_and_32)
@@ -54,6 +56,7 @@
bne- 1b
mr %r3,%r10
blr
+END(_atomic_and_32_nv)
ATOMIC_OP_ALIAS(atomic_and_32_nv,_atomic_and_32_nv)
ATOMIC_OP_ALIAS(atomic_and_uint_nv,_atomic_and_32_nv)
STRONG_ALIAS(_atomic_and_uint_nv,_atomic_and_32_nv)
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/atomic/atomic_cas.S
--- a/common/lib/libc/arch/powerpc/atomic/atomic_cas.S Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/atomic/atomic_cas.S Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas.S,v 1.6 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: atomic_cas.S,v 1.7 2011/01/15 07:31:11 matt Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -31,8 +31,9 @@
#include "atomic_op_asm.h"
+__RCSID("$NetBSD: atomic_cas.S,v 1.7 2011/01/15 07:31:11 matt Exp $")
+
.text
-
ENTRY(_atomic_cas_32)
1: lwarx %r10,0,%r3
cmpw %r10,%r4
@@ -41,6 +42,7 @@
bne- 1b
2: mr %r3,%r10
blr
+END(_atomic_cas_32)
ATOMIC_OP_ALIAS(atomic_cas_32,_atomic_cas_32)
ATOMIC_OP_ALIAS(atomic_cas_uint,_atomic_cas_32)
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/atomic/atomic_dec.S
--- a/common/lib/libc/arch/powerpc/atomic/atomic_dec.S Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/atomic/atomic_dec.S Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_dec.S,v 1.5 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: atomic_dec.S,v 1.6 2011/01/15 07:31:11 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,6 +31,7 @@
#include "atomic_op_asm.h"
+__RCSID("$NetBSD: atomic_dec.S,v 1.6 2011/01/15 07:31:11 matt Exp $")
.text
ENTRY(_atomic_dec_32)
@@ -39,6 +40,7 @@
stwcx. %r10,0,%r3
bne- 1b
blr
+END(_atomic_dec_32)
ATOMIC_OP_ALIAS(atomic_dec_32,_atomic_dec_32)
ATOMIC_OP_ALIAS(atomic_dec_uint,_atomic_dec_32)
STRONG_ALIAS(_atomic_dec_uint,_atomic_dec_32)
@@ -56,6 +58,7 @@
bne- 1b
mr %r3,%r10
blr
+END(_atomic_dec_32_nv)
ATOMIC_OP_ALIAS(atomic_dec_32_nv,_atomic_dec_32_nv)
ATOMIC_OP_ALIAS(atomic_dec_uint_nv,_atomic_dec_32_nv)
STRONG_ALIAS(_atomic_dec_uint_nv,_atomic_dec_32_nv)
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/atomic/atomic_inc.S
--- a/common/lib/libc/arch/powerpc/atomic/atomic_inc.S Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/atomic/atomic_inc.S Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_inc.S,v 1.5 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: atomic_inc.S,v 1.6 2011/01/15 07:31:11 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,14 +31,16 @@
#include "atomic_op_asm.h"
+__RCSID("$NetBSD: atomic_inc.S,v 1.6 2011/01/15 07:31:11 matt Exp $")
+
.text
-
ENTRY(_atomic_inc_32)
1: lwarx %r10,0,%r3
addi %r10,%r10,1
stwcx. %r10,0,%r3
bne- 1b
blr
+END(_atomic_inc_32)
ATOMIC_OP_ALIAS(atomic_inc_32,_atomic_inc_32)
ATOMIC_OP_ALIAS(atomic_inc_uint,_atomic_inc_32)
STRONG_ALIAS(_atomic_inc_uint,_atomic_inc_32)
@@ -56,6 +58,7 @@
bne- 1b
mr %r3,%r10
blr
+END(_atomic_inc_32_nv)
ATOMIC_OP_ALIAS(atomic_inc_32_nv,_atomic_inc_32_nv)
ATOMIC_OP_ALIAS(atomic_inc_uint_nv,_atomic_inc_32_nv)
STRONG_ALIAS(_atomic_inc_uint_nv,_atomic_inc_32_nv)
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h
--- a/common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_op_asm.h,v 1.4 2008/04/28 20:22:52 martin Exp $ */
+/* $NetBSD: atomic_op_asm.h,v 1.5 2011/01/15 07:31:11 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -32,7 +32,6 @@
#ifndef _ATOMIC_OP_ASM_H_
#define _ATOMIC_OP_ASM_H_
-#define _NOREGNAMES
#include <machine/asm.h>
#if defined(_KERNEL)
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/atomic/atomic_or.S
--- a/common/lib/libc/arch/powerpc/atomic/atomic_or.S Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/atomic/atomic_or.S Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_or.S,v 1.5 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: atomic_or.S,v 1.6 2011/01/15 07:31:11 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,14 +31,16 @@
#include "atomic_op_asm.h"
+__RCSID("$NetBSD: atomic_or.S,v 1.6 2011/01/15 07:31:11 matt Exp $")
+
.text
-
ENTRY(_atomic_or_32)
1: lwarx %r10,0,%r3
or %r10,%r10,%r4
stwcx. %r10,0,%r3
bne- 1b
blr
+END(_atomic_or_32)
ATOMIC_OP_ALIAS(atomic_or_32,_atomic_or_32)
ATOMIC_OP_ALIAS(atomic_or_uint,_atomic_or_32)
STRONG_ALIAS(_atomic_or_uint,_atomic_or_32)
@@ -54,6 +56,7 @@
bne- 1b
mr %r3,%r10
blr
+END(_atomic_or_32_nv)
ATOMIC_OP_ALIAS(atomic_or_32_nv,_atomic_or_32_nv)
ATOMIC_OP_ALIAS(atomic_or_uint_nv,_atomic_or_32_nv)
STRONG_ALIAS(_atomic_or_uint_nv,_atomic_or_32_nv)
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/atomic/atomic_swap.S
--- a/common/lib/libc/arch/powerpc/atomic/atomic_swap.S Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/atomic/atomic_swap.S Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap.S,v 1.5 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: atomic_swap.S,v 1.6 2011/01/15 07:31:11 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,14 +31,16 @@
#include "atomic_op_asm.h"
+__RCSID("$NetBSD: atomic_swap.S,v 1.6 2011/01/15 07:31:11 matt Exp $")
+
.text
-
ENTRY(_atomic_swap_32)
1: lwarx %r10,0,%r3
stwcx. %r4,0,%r3
bne- 1b
mr %r3,%r10
blr
+END(_atomic_swap_32)
ATOMIC_OP_ALIAS(atomic_swap_32,_atomic_swap_32)
ATOMIC_OP_ALIAS(atomic_swap_uint,_atomic_swap_32)
STRONG_ALIAS(_atomic_swap_uint,_atomic_swap_32)
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/atomic/membar_ops.S
--- a/common/lib/libc/arch/powerpc/atomic/membar_ops.S Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/atomic/membar_ops.S Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: membar_ops.S,v 1.3 2008/05/25 15:56:12 chs Exp $ */
+/* $NetBSD: membar_ops.S,v 1.4 2011/01/15 07:31:11 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,17 +31,20 @@
#include "atomic_op_asm.h"
+__RCSID("$NetBSD: membar_ops.S,v 1.4 2011/01/15 07:31:11 matt Exp $")
+
.text
-
/* These assume Total Store Order (TSO) */
ENTRY(_membar_consumer)
isync
blr
+END(_membar_consumer)
ENTRY(_membar_producer)
sync
blr
+END(_membar_producer)
ATOMIC_OP_ALIAS(membar_producer,_membar_producer)
ATOMIC_OP_ALIAS(membar_consumer,_membar_consumer)
diff -r f378e69d25c2 -r dd4c48bab8ba common/lib/libc/arch/powerpc/string/ffs.S
--- a/common/lib/libc/arch/powerpc/string/ffs.S Sat Jan 15 07:23:49 2011 +0000
+++ b/common/lib/libc/arch/powerpc/string/ffs.S Sat Jan 15 07:31:11 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.S,v 1.4 2006/07/07 07:31:03 ross Exp $ */
+/* $NetBSD: ffs.S,v 1.5 2011/01/15 07:31:12 matt Exp $ */
/*-
* Copyright (C) 2001 Martin J. Laubach <mjl%NetBSD.org@localhost>
@@ -28,11 +28,11 @@
*/
/*----------------------------------------------------------------------*/
-#define _NOREGNAMES
-
#include <machine/asm.h>
-.align 4
+__RCSID("$NetBSD: ffs.S,v 1.5 2011/01/15 07:31:12 matt Exp $")
+
+ .align 4
ENTRY(ffs)
neg %r4, %r3
and %r3, %r4, %r3
Home |
Main Index |
Thread Index |
Old Index