Module Name: src
Committed By: matt
Date: Wed Jul 24 15:38:07 UTC 2013
Modified Files:
src/lib/libc/arch/m68k: SYS.h
src/lib/libc/arch/m68k/sys: brk.S ptrace.S sbrk.S syscall.S
Log Message:
Only jump to CERROR if carry is set, not clear.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/arch/m68k/SYS.h
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/arch/m68k/sys/brk.S
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/m68k/sys/ptrace.S
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/m68k/sys/sbrk.S
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/m68k/sys/syscall.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/m68k/SYS.h
diff -u src/lib/libc/arch/m68k/SYS.h:1.17 src/lib/libc/arch/m68k/SYS.h:1.18
--- src/lib/libc/arch/m68k/SYS.h:1.17 Tue Jul 16 22:18:14 2013
+++ src/lib/libc/arch/m68k/SYS.h Wed Jul 24 15:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: SYS.h,v 1.17 2013/07/16 22:18:14 matt Exp $ */
+/* $NetBSD: SYS.h,v 1.18 2013/07/24 15:38:07 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -53,7 +53,7 @@
#define _SYSCALL(x,y) \
_SYSCALL_NOERROR(x,y); \
- jcc CERROR
+ jcs CERROR
#define SYSCALL_NOERROR(x) \
_SYSCALL_NOERROR(x,x)
Index: src/lib/libc/arch/m68k/sys/brk.S
diff -u src/lib/libc/arch/m68k/sys/brk.S:1.17 src/lib/libc/arch/m68k/sys/brk.S:1.18
--- src/lib/libc/arch/m68k/sys/brk.S:1.17 Tue Jul 16 23:00:15 2013
+++ src/lib/libc/arch/m68k/sys/brk.S Wed Jul 24 15:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: brk.S,v 1.17 2013/07/16 23:00:15 matt Exp $ */
+/* $NetBSD: brk.S,v 1.18 2013/07/24 15:38:07 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)brk.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: brk.S,v 1.17 2013/07/16 23:00:15 matt Exp $")
+ RCSID("$NetBSD: brk.S,v 1.18 2013/07/24 15:38:07 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,7 +71,7 @@ ENTRY(_brk)
movl %a1,4(%sp)
ok:
SYSTRAP(break)
- jcc CERROR
+ jcs CERROR
#ifdef PIC
LEA_LCL(_C_LABEL(__curbrk),%a0)
movl %a1,(%a0)
Index: src/lib/libc/arch/m68k/sys/ptrace.S
diff -u src/lib/libc/arch/m68k/sys/ptrace.S:1.13 src/lib/libc/arch/m68k/sys/ptrace.S:1.14
--- src/lib/libc/arch/m68k/sys/ptrace.S:1.13 Tue Jul 16 23:00:15 2013
+++ src/lib/libc/arch/m68k/sys/ptrace.S Wed Jul 24 15:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.S,v 1.13 2013/07/16 23:00:15 matt Exp $ */
+/* $NetBSD: ptrace.S,v 1.14 2013/07/24 15:38:07 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)ptrace.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: ptrace.S,v 1.13 2013/07/16 23:00:15 matt Exp $")
+ RCSID("$NetBSD: ptrace.S,v 1.14 2013/07/24 15:38:07 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -66,6 +66,6 @@ ENTRY(ptrace)
#endif /* PIC */
#endif /* _REENTRANT */
SYSTRAP(ptrace)
- jcc CERROR
+ jcs CERROR
rts
END(ptrace)
Index: src/lib/libc/arch/m68k/sys/sbrk.S
diff -u src/lib/libc/arch/m68k/sys/sbrk.S:1.16 src/lib/libc/arch/m68k/sys/sbrk.S:1.17
--- src/lib/libc/arch/m68k/sys/sbrk.S:1.16 Tue Jul 16 23:00:15 2013
+++ src/lib/libc/arch/m68k/sys/sbrk.S Wed Jul 24 15:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sbrk.S,v 1.16 2013/07/16 23:00:15 matt Exp $ */
+/* $NetBSD: sbrk.S,v 1.17 2013/07/24 15:38:07 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)sbrk.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: sbrk.S,v 1.16 2013/07/16 23:00:15 matt Exp $")
+ RCSID("$NetBSD: sbrk.S,v 1.17 2013/07/24 15:38:07 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,7 +62,7 @@ ENTRY(_sbrk)
movl (%a1),%d0
addl %d0,4(%sp)
SYSTRAP(break)
- jcc CERROR
+ jcs CERROR
movl (%a1),%d0
movl 4(%sp),(%a1)
#ifdef __SVR4_ABI__
Index: src/lib/libc/arch/m68k/sys/syscall.S
diff -u src/lib/libc/arch/m68k/sys/syscall.S:1.8 src/lib/libc/arch/m68k/sys/syscall.S:1.9
--- src/lib/libc/arch/m68k/sys/syscall.S:1.8 Tue Jul 16 22:20:35 2013
+++ src/lib/libc/arch/m68k/sys/syscall.S Wed Jul 24 15:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.S,v 1.8 2013/07/16 22:20:35 matt Exp $ */
+/* $NetBSD: syscall.S,v 1.9 2013/07/24 15:38:07 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,13 +39,13 @@
#if 0
RCSID("from: @(#)syscall.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: syscall.S,v 1.8 2013/07/16 22:20:35 matt Exp $")
+ RCSID("$NetBSD: syscall.S,v 1.9 2013/07/24 15:38:07 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
ENTRY(syscall)
clrl %d0
trap #0
- jcc CERROR
+ jcs CERROR
rts
END(syscall)
