summaryrefslogtreecommitdiff
path: root/lib/libc/arch/m88k
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-01-02 20:25:32 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-01-02 20:25:32 +0000
commite750c316c70105ab226f95c4a016aa4f98776321 (patch)
tree039ead75394aa2509e0b170cc0ecc7ddaad1b4fc /lib/libc/arch/m88k
parentb65354efaeed93200f88e8b7e144b68158fe0e23 (diff)
Rename cerror to __cerror and curbrk to __curbrk, to avoid namespace
pollution. Conforming to art@'s evil plans.
Diffstat (limited to 'lib/libc/arch/m88k')
-rw-r--r--lib/libc/arch/m88k/SYS.h8
-rw-r--r--lib/libc/arch/m88k/sys/brk.S12
-rw-r--r--lib/libc/arch/m88k/sys/cerror.S6
-rw-r--r--lib/libc/arch/m88k/sys/exect.S6
-rw-r--r--lib/libc/arch/m88k/sys/sbrk.S27
-rw-r--r--lib/libc/arch/m88k/sys/sigpending.S6
-rw-r--r--lib/libc/arch/m88k/sys/sigprocmask.S6
-rw-r--r--lib/libc/arch/m88k/sys/sigsuspend.S6
-rw-r--r--lib/libc/arch/m88k/sys/syscall.S6
9 files changed, 42 insertions, 41 deletions
diff --git a/lib/libc/arch/m88k/SYS.h b/lib/libc/arch/m88k/SYS.h
index fecba116b04..a47c2da54c9 100644
--- a/lib/libc/arch/m88k/SYS.h
+++ b/lib/libc/arch/m88k/SYS.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: SYS.h,v 1.5 2002/02/19 22:12:36 millert Exp $*/
+/* * $OpenBSD: SYS.h,v 1.6 2003/01/02 20:25:29 miod Exp $*/
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -50,7 +50,7 @@
ld r12,r31,40; \
or r13,r0, SYS_ ## y; \
tb0 0, r0, 128; \
- br cerror
+ br __cerror
#define SYSCALL(x) _SYSCALL(x,x)
#define RSYSCALL(x) SYSCALL(x) ;\
jmp r1
@@ -69,7 +69,7 @@
ld r12,r31,40; \
or r13,r0, SYS_/**/y; \
tb0 0, r0, 128; \
- br cerror
+ br __cerror
#define SYSCALL(x) _SYSCALL(x,x)
#define RSYSCALL(x) SYSCALL(x); \
jmp r1
@@ -82,4 +82,4 @@
#define ASMSTR .asciz
- .globl cerror
+ .globl __cerror
diff --git a/lib/libc/arch/m88k/sys/brk.S b/lib/libc/arch/m88k/sys/brk.S
index acbf471c368..a5b5e874d87 100644
--- a/lib/libc/arch/m88k/sys/brk.S
+++ b/lib/libc/arch/m88k/sys/brk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: brk.S,v 1.3 2000/03/01 17:31:21 todd Exp $ */
+/* $OpenBSD: brk.S,v 1.4 2003/01/02 20:25:31 miod Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
.data
/*.asciz "from: @(#)brk.s 5.1 (Berkeley) 5/12/90"*/
- .asciz "$OpenBSD: brk.S,v 1.3 2000/03/01 17:31:21 todd Exp $"
+ .asciz "$OpenBSD: brk.S,v 1.4 2003/01/02 20:25:31 miod Exp $"
.text
#endif /* LIBC_SCCS and not lint */
@@ -48,7 +48,7 @@
.globl _end
.globl minbrk
- .globl curbrk
+ .globl __curbrk
.data
.align 8
@@ -65,9 +65,9 @@ ENTRY(brk)
or r4,r2,0
or r13,r0,SYS_break
tb0 0,r0,128
- br cerror
- or.u r5,r0,hi16(curbrk)
- st r4,r5,lo16(curbrk)
+ br __cerror
+ or.u r5,r0,hi16(__curbrk)
+ st r4,r5,lo16(__curbrk)
or r2,r0,0 /* clear r2/r3 to indicate success */
jmp.n r1
or r3,r0,0
diff --git a/lib/libc/arch/m88k/sys/cerror.S b/lib/libc/arch/m88k/sys/cerror.S
index 3c73c2c296d..dc8d30be02e 100644
--- a/lib/libc/arch/m88k/sys/cerror.S
+++ b/lib/libc/arch/m88k/sys/cerror.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: cerror.S,v 1.2 2000/03/01 17:31:21 todd Exp $ */
+/* $OpenBSD: cerror.S,v 1.3 2003/01/02 20:25:31 miod Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
.data
/*.asciz "from: @(#)cerror.s 5.1 (Berkeley) 5/12/90"*/
- .asciz "$OpenBSD: cerror.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
+ .asciz "$OpenBSD: cerror.S,v 1.3 2003/01/02 20:25:31 miod Exp $"
.text
#endif /* LIBC_SCCS and not lint */
@@ -48,7 +48,7 @@
.align 8
.globl _errno
-cerror:
+__cerror:
or.u r4,r0,hi16(_errno)
st r2,r4,lo16(_errno)
sub r2,r0,0x1
diff --git a/lib/libc/arch/m88k/sys/exect.S b/lib/libc/arch/m88k/sys/exect.S
index 4b0241a8d6b..be6a2a04deb 100644
--- a/lib/libc/arch/m88k/sys/exect.S
+++ b/lib/libc/arch/m88k/sys/exect.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: exect.S,v 1.2 2000/03/01 17:31:21 todd Exp $ */
+/* $OpenBSD: exect.S,v 1.3 2003/01/02 20:25:31 miod Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
.data
/*.asciz "from: @(#)exect.s 5.1 (Berkeley) 5/12/90"*/
- .asciz "$OpenBSD: exect.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
+ .asciz "$OpenBSD: exect.S,v 1.3 2003/01/02 20:25:31 miod Exp $"
.text
#endif /* LIBC_SCCS and not lint */
@@ -49,4 +49,4 @@
ENTRY(exect)
or r13,r0,SYS_execve
tb0 0,r0,128 /* exect(file, argv, env) */
- br cerror
+ br __cerror
diff --git a/lib/libc/arch/m88k/sys/sbrk.S b/lib/libc/arch/m88k/sys/sbrk.S
index 65e1e3f0ffc..f912e8648be 100644
--- a/lib/libc/arch/m88k/sys/sbrk.S
+++ b/lib/libc/arch/m88k/sys/sbrk.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbrk.S,v 1.3 2000/03/01 17:31:21 todd Exp $ */
+/* $OpenBSD: sbrk.S,v 1.4 2003/01/02 20:25:31 miod Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,34 +40,35 @@
#if defined(LIBC_SCCS) && !defined(lint)
.data
/*.asciz "from: @(#)sbrk.s 5.1 (Berkeley) 5/12/90"*/
- .asciz "$OpenBSD: sbrk.S,v 1.3 2000/03/01 17:31:21 todd Exp $"
+ .asciz "$OpenBSD: sbrk.S,v 1.4 2003/01/02 20:25:31 miod Exp $"
.text
#endif /* LIBC_SCCS and not lint */
#include "SYS.h"
.globl _end
- .globl curbrk
+ .globl __curbrk
.data
.align 8
-curbrk: .long _end
+__curbrk:
+ .long _end
.text
ENTRY(sbrk)
- or.u r5,r0,hi16(curbrk)
- ld r5,r5,lo16(curbrk)
+ or.u r5,r0,hi16(__curbrk)
+ ld r5,r5,lo16(__curbrk)
add r2,r2,r5
or r4,r2,0
or r13,r0,SYS_break
tb0 0,r0,128
- br cerror
- /* Save old curbrk */
- or.u r5,r0,hi16(curbrk)
- ld r3,r5,lo16(curbrk)
- /* Update curbrk */
- st r4,r5,lo16(curbrk)
- /* and return old curbrk */
+ br __cerror
+ /* Save old __curbrk */
+ or.u r5,r0,hi16(__curbrk)
+ ld r3,r5,lo16(__curbrk)
+ /* Update __curbrk */
+ st r4,r5,lo16(__curbrk)
+ /* and return old __curbrk */
or r2,r3,0
jmp.n r1
or r3,r0,0
diff --git a/lib/libc/arch/m88k/sys/sigpending.S b/lib/libc/arch/m88k/sys/sigpending.S
index e6a51c3a396..76265669f17 100644
--- a/lib/libc/arch/m88k/sys/sigpending.S
+++ b/lib/libc/arch/m88k/sys/sigpending.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigpending.S,v 1.2 2000/03/01 17:31:21 todd Exp $ */
+/* $OpenBSD: sigpending.S,v 1.3 2003/01/02 20:25:31 miod Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
.data
/*.asciz "from: @(#)sigpending.s 5.2 (Berkeley) 8/6/90"*/
- .asciz "$OpenBSD: sigpending.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
+ .asciz "$OpenBSD: sigpending.S,v 1.3 2003/01/02 20:25:31 miod Exp $"
.text
#endif /* LIBC_SCCS and not lint */
@@ -50,7 +50,7 @@ ENTRY(sigpending)
or r4,r2,0 /* save r2 */
or r13,r0,SYS_sigpending
tb0 0,r0,128
- br cerror
+ br __cerror
st r2,r4,0
jmp.n r1
or r2,r0,0
diff --git a/lib/libc/arch/m88k/sys/sigprocmask.S b/lib/libc/arch/m88k/sys/sigprocmask.S
index 67c5bb727f8..65576ac01cd 100644
--- a/lib/libc/arch/m88k/sys/sigprocmask.S
+++ b/lib/libc/arch/m88k/sys/sigprocmask.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigprocmask.S,v 1.2 2000/03/01 17:31:22 todd Exp $ */
+/* $OpenBSD: sigprocmask.S,v 1.3 2003/01/02 20:25:31 miod Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
.data
/*.asciz "from: @(#)sigprocmask.s 5.2 (Berkeley) 6/6/90"*/
- .asciz "$OpenBSD: sigprocmask.S,v 1.2 2000/03/01 17:31:22 todd Exp $"
+ .asciz "$OpenBSD: sigprocmask.S,v 1.3 2003/01/02 20:25:31 miod Exp $"
.text
#endif /* LIBC_SCCS and not lint */
@@ -55,7 +55,7 @@ L1:
L2:
or r13,r0,SYS_sigprocmask
tb0 0,r0,128
- br cerror
+ br __cerror
bcnd eq0,r4,out /* if old mask not requested, done */
st r2,r4,0 /* otherwise, set it */
out:
diff --git a/lib/libc/arch/m88k/sys/sigsuspend.S b/lib/libc/arch/m88k/sys/sigsuspend.S
index 8de6cd8b838..9817729e62b 100644
--- a/lib/libc/arch/m88k/sys/sigsuspend.S
+++ b/lib/libc/arch/m88k/sys/sigsuspend.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigsuspend.S,v 1.2 2000/03/01 17:31:22 todd Exp $ */
+/* $OpenBSD: sigsuspend.S,v 1.3 2003/01/02 20:25:31 miod Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
.data
/*.asciz "from: @(#)sigsuspend.s 5.2 (Berkeley) 6/6/90"*/
- .asciz "$OpenBSD: sigsuspend.S,v 1.2 2000/03/01 17:31:22 todd Exp $"
+ .asciz "$OpenBSD: sigsuspend.S,v 1.3 2003/01/02 20:25:31 miod Exp $"
.text
#endif /* LIBC_SCCS and not lint */
@@ -57,6 +57,6 @@ ENTRY(sigsuspend)
ld r2,r2,0 /* dereference the pointer mask */
or r13,r0,SYS_sigsuspend
tb0 0,r0,128
- br cerror
+ br __cerror
jmp.n r1
or r2,r0,0
diff --git a/lib/libc/arch/m88k/sys/syscall.S b/lib/libc/arch/m88k/sys/syscall.S
index a596e6f0a94..dfbf1119e05 100644
--- a/lib/libc/arch/m88k/sys/syscall.S
+++ b/lib/libc/arch/m88k/sys/syscall.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.S,v 1.2 2000/03/01 17:31:22 todd Exp $ */
+/* $OpenBSD: syscall.S,v 1.3 2003/01/02 20:25:31 miod Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
.data
/*.asciz "from: @(#)syscall.s 5.1 (Berkeley) 5/12/90"*/
- .asciz "$OpenBSD: syscall.S,v 1.2 2000/03/01 17:31:22 todd Exp $"
+ .asciz "$OpenBSD: syscall.S,v 1.3 2003/01/02 20:25:31 miod Exp $"
.text
#endif /* LIBC_SCCS and not lint */
@@ -52,5 +52,5 @@ ENTRY(syscall)
ld r12,r31,40
or r9,r0,0
tb0 0,r0,128
- br cerror
+ br __cerror
jmp r1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 22:39:36 +0000