mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-03 08:11:08 +00:00
* sysdeps/unix/sysv/linux/powerpc/sysdep.h (ALIGNARG,
ASM_TYPE_DIRECTIVE, ASM_SIZE_DIRECTIVE, CALL_MCOUNT, ENTRY, EALIGN, DO_CALL, JUMPTARGET, PSEUDO, PSEUDO_RET, PSEUDO_END, L, C_TEXT): Move all these assembly-related definitions to ... * sysdeps/powerpc/elf/sysdep.h: ... this new file. * sysdeps/mach/powerpc/machine-lock.h: Assembly code rewritten by Peter Bruin <pjbruin@dds.nl>.
This commit is contained in:
Roland McGrath
parent
ec448f662f
commit
ab0a3efc49
@ -1,5 +1,14 @@
|
|||||||
2001-10-28 Roland McGrath <roland@frob.com>
|
2001-10-28 Roland McGrath <roland@frob.com>
|
||||||
|
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/sysdep.h (ALIGNARG,
|
||||||
|
ASM_TYPE_DIRECTIVE, ASM_SIZE_DIRECTIVE, CALL_MCOUNT, ENTRY, EALIGN,
|
||||||
|
DO_CALL, JUMPTARGET, PSEUDO, PSEUDO_RET, PSEUDO_END, L, C_TEXT):
|
||||||
|
Move all these assembly-related definitions to ...
|
||||||
|
* sysdeps/powerpc/elf/sysdep.h: ... this new file.
|
||||||
|
|
||||||
|
* sysdeps/mach/powerpc/machine-lock.h: Assembly code rewritten
|
||||||
|
by Peter Bruin <pjbruin@dds.nl>.
|
||||||
|
|
||||||
* hurd/hurdselect.c (_hurd_select): Check SELECT_RETURNED bit when
|
* hurd/hurdselect.c (_hurd_select): Check SELECT_RETURNED bit when
|
||||||
packing results for a `poll' call.
|
packing results for a `poll' call.
|
||||||
|
|
||||||
|
|||||||
@ -38,8 +38,12 @@ typedef __volatile long int __spin_lock_t;
|
|||||||
_EXTERN_INLINE void
|
_EXTERN_INLINE void
|
||||||
__spin_unlock (__spin_lock_t *__lock)
|
__spin_unlock (__spin_lock_t *__lock)
|
||||||
{
|
{
|
||||||
__asm__ __volatile__ ("sync ; stwcx. %1,0,%0"
|
long int __locked;
|
||||||
: : "r" (__lock), "r" (0) : "cr0");
|
__asm__ __volatile__ ("\
|
||||||
|
0: lwarx %0,0,%1
|
||||||
|
stwcx. %2,0,%1
|
||||||
|
bne- 0b
|
||||||
|
" : "=&r" (__locked) : "r" (__lock), "r" (0) : "cr0");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Try to lock LOCK; return nonzero if we locked it, zero if another has. */
|
/* Try to lock LOCK; return nonzero if we locked it, zero if another has. */
|
||||||
@ -48,13 +52,12 @@ _EXTERN_INLINE int
|
|||||||
__spin_try_lock (register __spin_lock_t *__lock)
|
__spin_try_lock (register __spin_lock_t *__lock)
|
||||||
{
|
{
|
||||||
long int __rtn;
|
long int __rtn;
|
||||||
|
|
||||||
__asm__ __volatile__ ("\
|
__asm__ __volatile__ ("\
|
||||||
0: lwarx %0,0,%1
|
0: lwarx %0,0,%1
|
||||||
stwcx. %2,0,%1
|
stwcx. %2,0,%1
|
||||||
bne- 0b
|
bne- 0b
|
||||||
" : "=&r"(__rtn) : "r"(__lock), "r"(1) : "cr0");
|
" : "=&r" (__rtn) : "r" (__lock), "r" (1) : "cr0");
|
||||||
return ~__rtn;
|
return !__rtn;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return nonzero if LOCK is locked. */
|
/* Return nonzero if LOCK is locked. */
|
||||||
@ -67,7 +70,7 @@ __spin_lock_locked (__spin_lock_t *__lock)
|
|||||||
0: lwarx %0,0,%1
|
0: lwarx %0,0,%1
|
||||||
stwcx. %0,0,%1
|
stwcx. %0,0,%1
|
||||||
bne- 0b
|
bne- 0b
|
||||||
" : "=&r"(__rtn) : "r"(__lock) : "cr0");
|
" : "=&r" (__rtn) : "r" (__lock) : "cr0");
|
||||||
return __rtn;
|
return __rtn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
137
sysdeps/powerpc/elf/sysdep.h
Normal file
137
sysdeps/powerpc/elf/sysdep.h
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
/* assembly code macros for ELF PowerPC hosts
|
||||||
|
Copyright (C) 1999,2001 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with the GNU C Library; if not, write to the Free
|
||||||
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
|
02111-1307 USA. */
|
||||||
|
|
||||||
|
#include <sysdeps/powerpc/sysdep.h>
|
||||||
|
|
||||||
|
#ifdef __ASSEMBLER__
|
||||||
|
|
||||||
|
/* This seems to always be the case on PPC. */
|
||||||
|
#define ALIGNARG(log2) log2
|
||||||
|
/* For ELF we need the `.type' directive to make shared libs work right. */
|
||||||
|
#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
|
||||||
|
#define ASM_SIZE_DIRECTIVE(name) .size name,.-name
|
||||||
|
|
||||||
|
/* If compiled for profiling, call `_mcount' at the start of each function. */
|
||||||
|
#ifdef PROF
|
||||||
|
/* The mcount code relies on a the return address being on the stack
|
||||||
|
to locate our caller and so it can restore it; so store one just
|
||||||
|
for its benefit. */
|
||||||
|
#ifdef PIC
|
||||||
|
#define CALL_MCOUNT \
|
||||||
|
.pushsection; \
|
||||||
|
.section ".data"; \
|
||||||
|
.align ALIGNARG(2); \
|
||||||
|
0:.long 0; \
|
||||||
|
.previous; \
|
||||||
|
mflr r0; \
|
||||||
|
stw r0,4(r1); \
|
||||||
|
bl _GLOBAL_OFFSET_TABLE_@local-4; \
|
||||||
|
mflr r11; \
|
||||||
|
lwz r0,0b@got(r11); \
|
||||||
|
bl JUMPTARGET(_mcount);
|
||||||
|
#else /* PIC */
|
||||||
|
#define CALL_MCOUNT \
|
||||||
|
.section ".data"; \
|
||||||
|
.align ALIGNARG(2); \
|
||||||
|
0:.long 0; \
|
||||||
|
.previous; \
|
||||||
|
mflr r0; \
|
||||||
|
lis r11,0b@ha; \
|
||||||
|
stw r0,4(r1); \
|
||||||
|
addi r0,r11,0b@l; \
|
||||||
|
bl JUMPTARGET(_mcount);
|
||||||
|
#endif /* PIC */
|
||||||
|
#else /* PROF */
|
||||||
|
#define CALL_MCOUNT /* Do nothing. */
|
||||||
|
#endif /* PROF */
|
||||||
|
|
||||||
|
#define ENTRY(name) \
|
||||||
|
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \
|
||||||
|
ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function) \
|
||||||
|
.align ALIGNARG(2); \
|
||||||
|
C_LABEL(name) \
|
||||||
|
CALL_MCOUNT
|
||||||
|
|
||||||
|
#define EALIGN_W_0 /* No words to insert. */
|
||||||
|
#define EALIGN_W_1 nop
|
||||||
|
#define EALIGN_W_2 nop;nop
|
||||||
|
#define EALIGN_W_3 nop;nop;nop
|
||||||
|
#define EALIGN_W_4 EALIGN_W_3;nop
|
||||||
|
#define EALIGN_W_5 EALIGN_W_4;nop
|
||||||
|
#define EALIGN_W_6 EALIGN_W_5;nop
|
||||||
|
#define EALIGN_W_7 EALIGN_W_6;nop
|
||||||
|
|
||||||
|
/* EALIGN is like ENTRY, but does alignment to 'words'*4 bytes
|
||||||
|
past a 2^align boundary. */
|
||||||
|
#ifdef PROF
|
||||||
|
#define EALIGN(name, alignt, words) \
|
||||||
|
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \
|
||||||
|
ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function) \
|
||||||
|
.align ALIGNARG(2); \
|
||||||
|
C_LABEL(name) \
|
||||||
|
CALL_MCOUNT \
|
||||||
|
b 0f; \
|
||||||
|
.align ALIGNARG(alignt); \
|
||||||
|
EALIGN_W_##words; \
|
||||||
|
0:
|
||||||
|
#else /* PROF */
|
||||||
|
#define EALIGN(name, alignt, words) \
|
||||||
|
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \
|
||||||
|
ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function) \
|
||||||
|
.align ALIGNARG(alignt); \
|
||||||
|
EALIGN_W_##words; \
|
||||||
|
C_LABEL(name)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#undef END
|
||||||
|
#define END(name) \
|
||||||
|
ASM_SIZE_DIRECTIVE(name)
|
||||||
|
|
||||||
|
#define DO_CALL(syscall) \
|
||||||
|
li 0,syscall; \
|
||||||
|
sc
|
||||||
|
|
||||||
|
#ifdef PIC
|
||||||
|
#define JUMPTARGET(name) name##@plt
|
||||||
|
#else
|
||||||
|
#define JUMPTARGET(name) name
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define PSEUDO(name, syscall_name, args) \
|
||||||
|
.section ".text"; \
|
||||||
|
ENTRY (name) \
|
||||||
|
DO_CALL (SYS_ify (syscall_name));
|
||||||
|
|
||||||
|
#define PSEUDO_RET \
|
||||||
|
bnslr; \
|
||||||
|
b JUMPTARGET(__syscall_error)
|
||||||
|
#define ret PSEUDO_RET
|
||||||
|
|
||||||
|
#undef PSEUDO_END
|
||||||
|
#define PSEUDO_END(name) \
|
||||||
|
END (name)
|
||||||
|
|
||||||
|
/* Local labels stripped out by the linker. */
|
||||||
|
#undef L
|
||||||
|
#define L(x) .L##x
|
||||||
|
|
||||||
|
/* Label in text section. */
|
||||||
|
#define C_TEXT(name) name
|
||||||
|
|
||||||
|
#endif /* __ASSEMBLER__ */
|
||||||
@ -20,6 +20,7 @@
|
|||||||
#define _LINUX_POWERPC_SYSDEP_H 1
|
#define _LINUX_POWERPC_SYSDEP_H 1
|
||||||
|
|
||||||
#include <sysdeps/unix/powerpc/sysdep.h>
|
#include <sysdeps/unix/powerpc/sysdep.h>
|
||||||
|
#include <sysdeps/powerpc/elf/sysdep.h>
|
||||||
|
|
||||||
/* For Linux we can use the system call table in the header file
|
/* For Linux we can use the system call table in the header file
|
||||||
/usr/include/asm/unistd.h
|
/usr/include/asm/unistd.h
|
||||||
@ -32,121 +33,4 @@
|
|||||||
# define SYS_ify(syscall_name) __NR_/**/syscall_name
|
# define SYS_ify(syscall_name) __NR_/**/syscall_name
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __ASSEMBLER__
|
|
||||||
|
|
||||||
/* This seems to always be the case on PPC. */
|
|
||||||
#define ALIGNARG(log2) log2
|
|
||||||
/* For ELF we need the `.type' directive to make shared libs work right. */
|
|
||||||
#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
|
|
||||||
#define ASM_SIZE_DIRECTIVE(name) .size name,.-name
|
|
||||||
|
|
||||||
/* If compiled for profiling, call `_mcount' at the start of each function. */
|
|
||||||
#ifdef PROF
|
|
||||||
/* The mcount code relies on a the return address being on the stack
|
|
||||||
to locate our caller and so it can restore it; so store one just
|
|
||||||
for its benefit. */
|
|
||||||
#ifdef PIC
|
|
||||||
#define CALL_MCOUNT \
|
|
||||||
.pushsection; \
|
|
||||||
.section ".data"; \
|
|
||||||
.align ALIGNARG(2); \
|
|
||||||
0:.long 0; \
|
|
||||||
.previous; \
|
|
||||||
mflr r0; \
|
|
||||||
stw r0,4(r1); \
|
|
||||||
bl _GLOBAL_OFFSET_TABLE_@local-4; \
|
|
||||||
mflr r11; \
|
|
||||||
lwz r0,0b@got(r11); \
|
|
||||||
bl JUMPTARGET(_mcount);
|
|
||||||
#else /* PIC */
|
|
||||||
#define CALL_MCOUNT \
|
|
||||||
.section ".data"; \
|
|
||||||
.align ALIGNARG(2); \
|
|
||||||
0:.long 0; \
|
|
||||||
.previous; \
|
|
||||||
mflr r0; \
|
|
||||||
lis r11,0b@ha; \
|
|
||||||
stw r0,4(r1); \
|
|
||||||
addi r0,r11,0b@l; \
|
|
||||||
bl JUMPTARGET(_mcount);
|
|
||||||
#endif /* PIC */
|
|
||||||
#else /* PROF */
|
|
||||||
#define CALL_MCOUNT /* Do nothing. */
|
|
||||||
#endif /* PROF */
|
|
||||||
|
|
||||||
#define ENTRY(name) \
|
|
||||||
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \
|
|
||||||
ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function) \
|
|
||||||
.align ALIGNARG(2); \
|
|
||||||
C_LABEL(name) \
|
|
||||||
CALL_MCOUNT
|
|
||||||
|
|
||||||
#define EALIGN_W_0 /* No words to insert. */
|
|
||||||
#define EALIGN_W_1 nop
|
|
||||||
#define EALIGN_W_2 nop;nop
|
|
||||||
#define EALIGN_W_3 nop;nop;nop
|
|
||||||
#define EALIGN_W_4 EALIGN_W_3;nop
|
|
||||||
#define EALIGN_W_5 EALIGN_W_4;nop
|
|
||||||
#define EALIGN_W_6 EALIGN_W_5;nop
|
|
||||||
#define EALIGN_W_7 EALIGN_W_6;nop
|
|
||||||
|
|
||||||
/* EALIGN is like ENTRY, but does alignment to 'words'*4 bytes
|
|
||||||
past a 2^align boundary. */
|
|
||||||
#ifdef PROF
|
|
||||||
#define EALIGN(name, alignt, words) \
|
|
||||||
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \
|
|
||||||
ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function) \
|
|
||||||
.align ALIGNARG(2); \
|
|
||||||
C_LABEL(name) \
|
|
||||||
CALL_MCOUNT \
|
|
||||||
b 0f; \
|
|
||||||
.align ALIGNARG(alignt); \
|
|
||||||
EALIGN_W_##words; \
|
|
||||||
0:
|
|
||||||
#else /* PROF */
|
|
||||||
#define EALIGN(name, alignt, words) \
|
|
||||||
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \
|
|
||||||
ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function) \
|
|
||||||
.align ALIGNARG(alignt); \
|
|
||||||
EALIGN_W_##words; \
|
|
||||||
C_LABEL(name)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef END
|
|
||||||
#define END(name) \
|
|
||||||
ASM_SIZE_DIRECTIVE(name)
|
|
||||||
|
|
||||||
#define DO_CALL(syscall) \
|
|
||||||
li 0,syscall; \
|
|
||||||
sc
|
|
||||||
|
|
||||||
#ifdef PIC
|
|
||||||
#define JUMPTARGET(name) name##@plt
|
|
||||||
#else
|
|
||||||
#define JUMPTARGET(name) name
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define PSEUDO(name, syscall_name, args) \
|
|
||||||
.section ".text"; \
|
|
||||||
ENTRY (name) \
|
|
||||||
DO_CALL (SYS_ify (syscall_name));
|
|
||||||
|
|
||||||
#define PSEUDO_RET \
|
|
||||||
bnslr; \
|
|
||||||
b JUMPTARGET(__syscall_error)
|
|
||||||
#define ret PSEUDO_RET
|
|
||||||
|
|
||||||
#undef PSEUDO_END
|
|
||||||
#define PSEUDO_END(name) \
|
|
||||||
END (name)
|
|
||||||
|
|
||||||
/* Local labels stripped out by the linker. */
|
|
||||||
#undef L
|
|
||||||
#define L(x) .L##x
|
|
||||||
|
|
||||||
/* Label in text section. */
|
|
||||||
#define C_TEXT(name) name
|
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__ */
|
|
||||||
|
|
||||||
#endif /* linux/powerpc/sysdep.h */
|
#endif /* linux/powerpc/sysdep.h */
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user