[src/trunk]: src/lib/libc/arch/vax/sys Fix some bugs and clean up for ELF & a...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dd93ca1ee23c
branches:  trunk
changeset: 494081:dd93ca1ee23c
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jun 30 23:46:36 2000 +0000

description:
Fix some bugs and clean up for ELF & a.out support

diffstat:

 lib/libc/arch/vax/sys/brk.S         |  8 +++++---
 lib/libc/arch/vax/sys/exect.S       |  4 ++--
 lib/libc/arch/vax/sys/ptrace.S      |  4 ++--
 lib/libc/arch/vax/sys/sbrk.S        |  4 ++--
 lib/libc/arch/vax/sys/sigprocmask.S |  4 ++--
 lib/libc/arch/vax/sys/sigsuspend.S  |  4 ++--
 lib/libc/arch/vax/sys/syscall.S     |  4 ++--
 7 files changed, 17 insertions(+), 15 deletions(-)

diffs (143 lines):

diff -r afc976c64855 -r dd93ca1ee23c lib/libc/arch/vax/sys/brk.S
--- a/lib/libc/arch/vax/sys/brk.S       Fri Jun 30 22:58:01 2000 +0000
+++ b/lib/libc/arch/vax/sys/brk.S       Fri Jun 30 23:46:36 2000 +0000
@@ -33,7 +33,7 @@
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
        /* .asciz "@(#)brk.s    8.1 (Berkeley) 6/4/93" */
-       .asciz "$NetBSD: brk.S,v 1.7 2000/06/28 19:20:18 matt Exp $"
+       .asciz "$NetBSD: brk.S,v 1.8 2000/06/30 23:46:36 matt Exp $"
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -44,13 +44,15 @@
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(brk, _brk)
 #endif
+
+ENTRY(_brk, 0)
        cmpl    4(ap),_C_LABEL(__minbrk)
        bgeq    ok
        movl    _C_LABEL(__minbrk),4(ap)
        chmk    $ SYS_break
        jcs     err
        movl    4(ap),CURBRK
-       clrl    r0
+ok:    clrl    r0
        ret
 err:
-       jmp     CERROR
+       jmp     CERROR+2
diff -r afc976c64855 -r dd93ca1ee23c lib/libc/arch/vax/sys/exect.S
--- a/lib/libc/arch/vax/sys/exect.S     Fri Jun 30 22:58:01 2000 +0000
+++ b/lib/libc/arch/vax/sys/exect.S     Fri Jun 30 23:46:36 2000 +0000
@@ -33,7 +33,7 @@
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
        /* .asciz "@(#)exect.s  8.1 (Berkeley) 6/4/93" */
-       .asciz "$NetBSD: exect.S,v 1.3 2000/06/28 19:20:18 matt Exp $"
+       .asciz "$NetBSD: exect.S,v 1.4 2000/06/30 23:46:36 matt Exp $"
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -42,4 +42,4 @@
 ENTRY(exect, 0)
        bispsw  $PSL_T
        chmk    $ SYS_execve
-       jmp     CERROR          # exect(file, argv, env)
+       jmp     CERROR+2                # exect(file, argv, env)
diff -r afc976c64855 -r dd93ca1ee23c lib/libc/arch/vax/sys/ptrace.S
--- a/lib/libc/arch/vax/sys/ptrace.S    Fri Jun 30 22:58:01 2000 +0000
+++ b/lib/libc/arch/vax/sys/ptrace.S    Fri Jun 30 23:46:36 2000 +0000
@@ -33,7 +33,7 @@
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
        /* .asciz "@(#)ptrace.s 8.1 (Berkeley) 6/4/93" */
-       .asciz "$NetBSD: ptrace.S,v 1.4 2000/06/28 19:20:18 matt Exp $"
+       .asciz "$NetBSD: ptrace.S,v 1.5 2000/06/30 23:46:36 matt Exp $"
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -49,4 +49,4 @@
        jcs     err
        ret
 err:
-       jmp     CERROR
+       jmp     CERROR+2
diff -r afc976c64855 -r dd93ca1ee23c lib/libc/arch/vax/sys/sbrk.S
--- a/lib/libc/arch/vax/sys/sbrk.S      Fri Jun 30 22:58:01 2000 +0000
+++ b/lib/libc/arch/vax/sys/sbrk.S      Fri Jun 30 23:46:36 2000 +0000
@@ -33,7 +33,7 @@
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
        /* .asciz "@(#)sbrk.s   8.1 (Berkeley) 6/4/93" */
-       .asciz "$NetBSD: sbrk.S,v 1.6 2000/06/28 19:20:18 matt Exp $"
+       .asciz "$NetBSD: sbrk.S,v 1.7 2000/06/30 23:46:36 matt Exp $"
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -64,4 +64,4 @@
        addl2   4(r3),CURBRK
        ret
 err:
-       jmp     CERROR
+       jmp     CERROR+2
diff -r afc976c64855 -r dd93ca1ee23c lib/libc/arch/vax/sys/sigprocmask.S
--- a/lib/libc/arch/vax/sys/sigprocmask.S       Fri Jun 30 22:58:01 2000 +0000
+++ b/lib/libc/arch/vax/sys/sigprocmask.S       Fri Jun 30 23:46:36 2000 +0000
@@ -33,7 +33,7 @@
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
        /* .asciz "@(#)sigprocmask.s    8.1 (Berkeley) 6/4/93" */
-       .asciz "$NetBSD: sigprocmask.S,v 1.5 2000/06/28 19:20:18 matt Exp $"
+       .asciz "$NetBSD: sigprocmask.S,v 1.6 2000/06/30 23:46:36 matt Exp $"
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -50,7 +50,7 @@
 1:     movl    *8(ap),8(ap)            # indirect to new mask arg
 2:     chmk    $ SYS_compat_13_sigprocmask13
        jcc     3f
-       jmp     CERROR
+       jmp     CERROR+2
 
 3:     tstl    12(ap)                  # test if old mask requested
        beql    out
diff -r afc976c64855 -r dd93ca1ee23c lib/libc/arch/vax/sys/sigsuspend.S
--- a/lib/libc/arch/vax/sys/sigsuspend.S        Fri Jun 30 22:58:01 2000 +0000
+++ b/lib/libc/arch/vax/sys/sigsuspend.S        Fri Jun 30 23:46:36 2000 +0000
@@ -33,7 +33,7 @@
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
        /* .asciz "@(#)sigsuspend.s     8.1 (Berkeley) 6/4/93" */
-       .asciz "$NetBSD: sigsuspend.S,v 1.5 2000/06/28 19:20:18 matt Exp $"
+       .asciz "$NetBSD: sigsuspend.S,v 1.6 2000/06/30 23:46:37 matt Exp $"
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -45,6 +45,6 @@
        movl    *4(ap),4(ap)            # indirect to mask arg
        chmk    $ SYS_compat_13_sigsuspend13
        jcc     1f
-       jmp     CERROR
+       jmp     CERROR+2
 1:     clrl    r0                      # shouldnt happen
        ret
diff -r afc976c64855 -r dd93ca1ee23c lib/libc/arch/vax/sys/syscall.S
--- a/lib/libc/arch/vax/sys/syscall.S   Fri Jun 30 22:58:01 2000 +0000
+++ b/lib/libc/arch/vax/sys/syscall.S   Fri Jun 30 23:46:36 2000 +0000
@@ -38,7 +38,7 @@
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
        /* .asciz "@(#)syscall.s        8.2 (Berkeley) 1/21/94" */
-       .asciz "$NetBSD: syscall.S,v 1.3 2000/06/28 19:20:18 matt Exp $"
+       .asciz "$NetBSD: syscall.S,v 1.4 2000/06/30 23:46:37 matt Exp $"
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
@@ -50,4 +50,4 @@
        jcs     1f
        ret
 1:
-       jmp     CERROR
+       jmp     CERROR+2