Sync with libc: use _ALIGN_TEXT from <machine/asm.h>.
This commit is contained in:
parent
74511f97b1
commit
ed6d5be482
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)SYS.h 5.5 (Berkeley) 5/7/91
|
||||
* $NetBSD: SYS.h,v 1.8 1998/02/22 08:14:57 mycroft Exp $
|
||||
* $NetBSD: SYS.h,v 1.9 1999/08/23 09:07:35 kleink Exp $
|
||||
*/
|
||||
|
||||
#include <machine/asm.h>
|
||||
@ -52,7 +52,7 @@
|
||||
SYSTRAP(y)
|
||||
|
||||
#define _SYSCALL(x,y) \
|
||||
.text; .align 2; \
|
||||
.text; _ALIGN_TEXT; \
|
||||
2: jmp PIC_PLT(cerror); \
|
||||
_SYSCALL_NOERROR(x,y); \
|
||||
jc 2b
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <machine/asm.h>
|
||||
|
||||
#if defined(LIBC_SCCS)
|
||||
RCSID("$NetBSD: ffs.S,v 1.6 1998/02/22 08:14:57 mycroft Exp $")
|
||||
RCSID("$NetBSD: ffs.S,v 1.7 1999/08/23 09:07:35 kleink Exp $")
|
||||
#endif
|
||||
|
||||
ENTRY(ffs)
|
||||
@ -15,6 +15,6 @@ ENTRY(ffs)
|
||||
incl %eax /* bits numbered from 1, not 0 */
|
||||
ret
|
||||
|
||||
.align 2
|
||||
_ALIGN_TEXT
|
||||
L1: xorl %eax,%eax /* clear result */
|
||||
ret
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <machine/asm.h>
|
||||
|
||||
#if defined(LIBC_SCCS)
|
||||
RCSID("$NetBSD: index.S,v 1.1 1998/02/22 07:20:52 mycroft Exp $")
|
||||
RCSID("$NetBSD: index.S,v 1.2 1999/08/23 09:07:35 kleink Exp $")
|
||||
#endif
|
||||
|
||||
#ifdef STRCHR
|
||||
@ -17,7 +17,7 @@ ENTRY(index)
|
||||
pushl %ebx
|
||||
movl 8(%esp),%eax
|
||||
movb 12(%esp),%cl
|
||||
.align 2,0x90
|
||||
_ALIGN_TEXT,0x90
|
||||
L1:
|
||||
movb (%eax),%bl
|
||||
cmpb %bl,%cl /* found char??? */
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <machine/asm.h>
|
||||
|
||||
#if defined(LIBC_SCCS)
|
||||
RCSID("$NetBSD: memchr.S,v 1.3 1998/02/22 08:14:58 mycroft Exp $")
|
||||
RCSID("$NetBSD: memchr.S,v 1.4 1999/08/23 09:07:35 kleink Exp $")
|
||||
#endif
|
||||
|
||||
ENTRY(memchr)
|
||||
@ -23,7 +23,7 @@ ENTRY(memchr)
|
||||
leal -1(%edi),%eax /* adjust result of scan */
|
||||
popl %edi
|
||||
ret
|
||||
.align 2,0x90
|
||||
_ALIGN_TEXT,0x90
|
||||
L1: xorl %eax,%eax
|
||||
popl %edi
|
||||
ret
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <machine/asm.h>
|
||||
|
||||
#if defined(LIBC_SCCS)
|
||||
RCSID("$NetBSD: rindex.S,v 1.1 1998/02/22 07:21:53 mycroft Exp $")
|
||||
RCSID("$NetBSD: rindex.S,v 1.2 1999/08/23 09:07:35 kleink Exp $")
|
||||
#endif
|
||||
|
||||
#ifdef STRRCHR
|
||||
@ -18,7 +18,7 @@ ENTRY(rindex)
|
||||
movl 8(%esp),%edx
|
||||
movb 12(%esp),%cl
|
||||
xorl %eax,%eax /* init pointer to null */
|
||||
.align 2,0x90
|
||||
_ALIGN_TEXT,0x90
|
||||
L1:
|
||||
movb (%edx),%bl
|
||||
cmpb %bl,%cl
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <machine/asm.h>
|
||||
|
||||
#if defined(LIBC_SCCS)
|
||||
RCSID("$NetBSD: strcat.S,v 1.7 1998/02/22 08:14:59 mycroft Exp $")
|
||||
RCSID("$NetBSD: strcat.S,v 1.8 1999/08/23 09:07:35 kleink Exp $")
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -29,7 +29,7 @@ ENTRY(strcat)
|
||||
|
||||
leal -1(%edi),%ecx /* correct dst address */
|
||||
|
||||
.align 2,0x90
|
||||
_ALIGN_TEXT,0x90
|
||||
L1: movb (%edx),%al /* unroll loop, but not too much */
|
||||
movb %al,(%ecx)
|
||||
testb %al,%al
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <machine/asm.h>
|
||||
|
||||
#if defined(LIBC_SCCS)
|
||||
RCSID("$NetBSD: strcmp.S,v 1.7 1998/02/22 08:14:59 mycroft Exp $")
|
||||
RCSID("$NetBSD: strcmp.S,v 1.8 1999/08/23 09:07:35 kleink Exp $")
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -20,7 +20,7 @@ ENTRY(strcmp)
|
||||
movl 0x08(%esp),%edx
|
||||
jmp L2 /* Jump into the loop! */
|
||||
|
||||
.align 2,0x90
|
||||
_ALIGN_TEXT,0x90
|
||||
L1: incl %eax
|
||||
incl %edx
|
||||
L2: movb (%eax),%cl
|
||||
@ -77,7 +77,7 @@ L2: movb (%eax),%cl
|
||||
jz L3
|
||||
cmpb %cl,(%edx)
|
||||
je L1
|
||||
.align 2, 0x90
|
||||
_ALIGN_TEXT,0x90
|
||||
L3: movzbl (%eax),%eax /* unsigned comparison */
|
||||
movzbl (%edx),%edx
|
||||
subl %edx,%eax
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <machine/asm.h>
|
||||
|
||||
#if defined(LIBC_SCCS)
|
||||
RCSID("$NetBSD: strcpy.S,v 1.7 1998/02/22 08:14:59 mycroft Exp $")
|
||||
RCSID("$NetBSD: strcpy.S,v 1.8 1999/08/23 09:07:35 kleink Exp $")
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -20,7 +20,7 @@ ENTRY(strcpy)
|
||||
movl 8(%esp),%edx /* src address */
|
||||
pushl %ecx /* push dst address */
|
||||
|
||||
.align 2,0x90
|
||||
_ALIGN_TEXT,0x90
|
||||
L1: movb (%edx),%al /* unroll loop, but not too much */
|
||||
movb %al,(%ecx)
|
||||
testb %al,%al
|
||||
|
Loading…
Reference in New Issue
Block a user