Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/arch/m68k Make CERROR hidden. Use END() appropriat...



details:   https://anonhg.NetBSD.org/src/rev/5c1f107354d8
branches:  trunk
changeset: 787964:5c1f107354d8
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jul 16 22:18:14 2013 +0000

description:
Make CERROR hidden.  Use END() appropriately.

diffstat:

 lib/libc/arch/m68k/SYS.h |  19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diffs (55 lines):

diff -r c4f5f88d1ad6 -r 5c1f107354d8 lib/libc/arch/m68k/SYS.h
--- a/lib/libc/arch/m68k/SYS.h  Tue Jul 16 22:12:20 2013 +0000
+++ b/lib/libc/arch/m68k/SYS.h  Tue Jul 16 22:18:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: SYS.h,v 1.16 2003/08/07 16:42:09 agc Exp $     */
+/*     $NetBSD: SYS.h,v 1.17 2013/07/16 22:18:14 matt Exp $    */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -45,23 +45,15 @@
 #define SYSTRAP(x)     movl #SYS_/**/x,%d0; trap #0
 #endif
 
-#ifdef __ELF__
 #define CERROR         _C_LABEL(__cerror)
-#define CURBRK         _C_LABEL(__curbrk)
-#else
-#define CERROR         _ASM_LABEL(cerror)
-#define CURBRK         _ASM_LABEL(curbrk)
-#endif
 
 #define _SYSCALL_NOERROR(x,y)                                          \
        ENTRY(x);                                                       \
        SYSTRAP(y)
 
 #define _SYSCALL(x,y)                                                  \
-       .even;                                                          \
-       err: jra PIC_PLT(CERROR);                                       \
        _SYSCALL_NOERROR(x,y);                                          \
-       jcs err
+       jcc CERROR
 
 #define SYSCALL_NOERROR(x)                                             \
        _SYSCALL_NOERROR(x,x)
@@ -71,11 +63,13 @@
 
 #define PSEUDO_NOERROR(x,y)                                            \
        _SYSCALL_NOERROR(x,y);                                          \
-       rts
+       rts;                                                            \
+       END(x)
 
 #define PSEUDO(x,y)                                                    \
        _SYSCALL(x,y);                                                  \
-       rts
+       rts;                                                            \
+       END(x)
 
 #define RSYSCALL_NOERROR(x)                                            \
        PSEUDO_NOERROR(x,x)
@@ -95,3 +89,4 @@
 #define        ASMSTR          .asciz
 
        .globl  CERROR
+       .hidden CERROR



Home | Main Index | Thread Index | Old Index