lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

(DO_SET_THREAD_AREA): Don't use INLINE_SYSCALL for set_thread_area syscall.

Browse Source
This commit is contained in:
Ulrich Drepper
2002-09-29 18:12:30 +00:00
parent f2672dddd1
commit 3ae5121b7f
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
linuxthreads/sysdeps/i386/useldt.h
View File

@ -22,7 +22,6 @@
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
#include <stddef.h> /* For offsetof. */ #include <stddef.h> /* For offsetof. */
#include <stdlib.h> /* For abort(). */ #include <stdlib.h> /* For abort(). */
#include <sysdep.h> /* For INLINE_SYSCALL. */
/* We don't want to include the kernel header. So duplicate the /* We don't want to include the kernel header. So duplicate the
@ -75,17 +74,25 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
asm ("movw %w0, %%gs" : : "q" (nr * 8 + 7)); \ asm ("movw %w0, %%gs" : : "q" (nr * 8 + 7)); \
}) })
#ifdef __PIC__
# define USETLS_EBX_ARG "r"
# define USETLS_LOAD_EBX "xchgl %3, %%ebx\n\t"
#else
# define USETLS_EBX_ARG "b"
# define USETLS_LOAD_EBX
#endif
/* When using the new set_thread_area call, we don't need to change %gs /* When using the new set_thread_area call, we don't need to change %gs
because we inherited the value set up in the main thread by TLS setup. because we inherited the value set up in the main thread by TLS setup.
We need to extract that value and set up the same segment in this We need to extract that value and set up the same segment in this
thread. */ thread. */
# if USE_TLS #if USE_TLS
# define DO_SET_THREAD_AREA_REUSE(nr) 1 # define DO_SET_THREAD_AREA_REUSE(nr) 1
# else #else
/* Without TLS, we do the initialization of the main thread, where NR == 0. */ /* Without TLS, we do the initialization of the main thread, where NR == 0. */
# define DO_SET_THREAD_AREA_REUSE(nr) (!__builtin_constant_p (nr) || (nr)) # define DO_SET_THREAD_AREA_REUSE(nr) (!__builtin_constant_p (nr) || (nr))
# endif #endif
# define DO_SET_THREAD_AREA(descr, nr) \ #define DO_SET_THREAD_AREA(descr, nr) \
({ \ ({ \
int __gs; \ int __gs; \
if (DO_SET_THREAD_AREA_REUSE (nr)) \ if (DO_SET_THREAD_AREA_REUSE (nr)) \
@ -95,8 +102,15 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
{ (__gs & 0xffff) >> 3, \ { (__gs & 0xffff) >> 3, \
(unsigned long int) (descr), 0xfffff /* 4GB in pages */, \ (unsigned long int) (descr), 0xfffff /* 4GB in pages */, \
1, 0, 0, 1, 0, 1, 0 }; \ 1, 0, 0, 1, 0, 1, 0 }; \
if (__builtin_expect (INLINE_SYSCALL (set_thread_area, 1, &ldt_entry), \ \
0) == 0) \ int __result; \
__asm (USETLS_LOAD_EBX \
"movl %2, %%eax\n\t" \
"int $0x80\n\t" \
USETLS_LOAD_EBX \
: "&a" (__result) \
: USETLS_EBX_ARG (&ldt_entry), "i" (__NR_set_thread_area)); \
if (__result == 0) \
asm ("movw %w0, %%gs" :: "q" (__gs)); \ asm ("movw %w0, %%gs" :: "q" (__gs)); \
else \ else \
__gs = -1; \ __gs = -1; \
@ -107,8 +121,14 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
{ -1, \ { -1, \
(unsigned long int) (descr), 0xfffff /* 4GB in pages */, \ (unsigned long int) (descr), 0xfffff /* 4GB in pages */, \
1, 0, 0, 1, 0, 1, 0 }; \ 1, 0, 0, 1, 0, 1, 0 }; \
if (__builtin_expect (INLINE_SYSCALL (set_thread_area, 1, &ldt_entry), \ int __result; \
0) == 0) \ __asm (USETLS_LOAD_EBX \
"movl %2, %%eax\n\t" \
"int $0x80\n\t" \
USETLS_LOAD_EBX \
: "&a" (__result) \
: USETLS_EBX_ARG (&ldt_entry), "i" (__NR_set_thread_area)); \
if (__result == 0) \
{ \ { \
__gs = (ldt_entry.entry_number << 3) + 3; \ __gs = (ldt_entry.entry_number << 3) + 3; \
asm ("movw %w0, %%gs" : : "q" (__gs)); \ asm ("movw %w0, %%gs" : : "q" (__gs)); \