OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

* elf/tst-tls1.c: Move TLS helper macros to...
	* elf/tls-macros.h: ...here.  New file.
	* elf/tst-tls2.c: New file.
	* elf/Makefile (tests): Add tst-tls2.
	(distribute): Add tls-macros.h.
This commit is contained in:
Ulrich Drepper 2002-02-10 18:58:00 +00:00
parent a5176eabfb
commit 2cef4257d0
5 changed files with 163 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2002-02-10 Ulrich Drepper <drepper@redhat.com>
* elf/tst-tls1.c: Move TLS helper macros to...
* elf/tls-macros.h: ...here. New file.
* elf/tst-tls2.c: New file.
* elf/Makefile (tests): Add tst-tls2.
(distribute): Add tls-macros.h.
* po/sv.po: Update from translation team.
* elf/tst-tls1.c (main): Add complete set of tests. Split

5
elf/Makefile
View File

@ -67,7 +67,8 @@ distribute := $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
reldep6mod4.c reldep6mod3.c reldep6mod2.c reldep6mod1.c \
reldep6mod0.c \
unwind-dw2.c unwind-dw2-fde.c unwind.h unwind-pe.h \
unwind-dw2-fde.h dwarf2.h dl-procinfo.c tls.h dl-tls.h
unwind-dw2-fde.h dwarf2.h dl-procinfo.c tls.h dl-tls.h \
tls-macros.h
include ../Makeconfig
@ -117,7 +118,7 @@ tests = loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
reldep reldep2 reldep3 reldep4 $(tests-nodelete-$(have-z-nodelete)) \
$(tests-nodlopen-$(have-z-nodlopen)) neededtest neededtest2 \
neededtest3 neededtest4 unload2 lateglobal initfirst global \
restest2 next dblload dblunload reldep5 reldep6 tst-tls1
restest2 next dblload dblunload reldep5 reldep6 tst-tls1 tst-tls2
test-srcs = tst-pathopt
tests-vis-yes = vismain
tests-nodelete-yes = nodelete

66
elf/tls-macros.h Normal file
View File

@ -0,0 +1,66 @@
/* Macros to support TLS testing in times of missing compiler support. */
#define COMMON_INT_DEF(x) \
asm (".tls_common " #x ",4,4")
/* XXX This definition will probably be machine specific, too. */
#define VAR_INT_DEF(x) \
asm (".section .tdata\n\t" \
".globl " #x "\n" \
#x ":\t.long 0\n\t" \
".previous")
/* XXX Each architecture must have its own asm for now. */
#ifdef __i386__
# define TLS_LE(x) \
({ int *__l; \
asm ("movl %%gs:0,%0\n\t" \
"subl $" #x "@tpoff,%0" \
: "=r" (__l)); \
__l; })
#define TLS_IE(x) \
({ int *__l, __b; \
asm ("call 1f\n\t" \
".subsection 1\n" \
"1:\tmovl (%%esp), %%ebx\n\t" \
"ret\n\t" \
".previous\n\t" \
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
"movl %%gs:0,%0\n\t" \
"subl " #x "@gottpoff(%%ebx),%0" \
: "=r" (__l), "=&b" (__b)); \
__l; })
#define TLS_LD(x) \
({ int *__l, __b; \
asm ("call 1f\n\t" \
".subsection 1\n" \
"1:\tmovl (%%esp), %%ebx\n\t" \
"ret\n\t" \
".previous\n\t" \
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
"leal " #x "@tlsldm(%%ebx),%%eax\n\t" \
"call ___tls_get_addr@plt\n\t" \
"leal " #x "@dtpoff(%%eax), %%eax" \
: "=a" (__l), "=&b" (__b)); \
__l; })
#define TLS_GD(x) \
({ int *__l, __b; \
asm ("call 1f\n\t" \
".subsection 1\n" \
"1:\tmovl (%%esp), %%ebx\n\t" \
"ret\n\t" \
".previous\n\t" \
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
"leal " #x "@tlsgd(%%ebx),%%eax\n\t" \
"call ___tls_get_addr@plt\n\t" \
"nop" \
: "=a" (__l), "=&b" (__b)); \
__l; })
#else
# error "No support for this architecture so far."
#endif

61
elf/tst-tls1.c
View File

@ -2,12 +2,12 @@
#include <stdio.h>
#include <tls.h>
#include "tls-macros.h"
/* XXX Until gcc gets told how to define and use thread-local
variables we will have to resort to use asms. */
asm (".tls_common foo,4,4");
asm (".tls_common bar,4,4");
/* Two common 'int' variables in TLS. */
COMMON_INT_DEF(foo);
COMMON_INT_DEF(bar);
int
@ -17,59 +17,6 @@ main (void)
int result = 0;
int *ap, *bp;
/* XXX Each architecture must have its own asm for now. */
# ifdef __i386__
# define TLS_LE(x) \
({ int *__l; \
asm ("movl %%gs:0,%0\n\t" \
"subl $" #x "@tpoff,%0" \
: "=r" (__l)); \
__l; })
#define TLS_IE(x) \
({ int *__l, __b; \
asm ("call 1f\n\t" \
".subsection 1\n" \
"1:\tmovl (%%esp), %%ebx\n\t" \
"ret\n\t" \
".previous\n\t" \
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
"movl %%gs:0,%0\n\t" \
"subl " #x "@gottpoff(%%ebx),%0" \
: "=r" (__l), "=&b" (__b)); \
__l; })
#define TLS_LD(x) \
({ int *__l, __b; \
asm ("call 1f\n\t" \
".subsection 1\n" \
"1:\tmovl (%%esp), %%ebx\n\t" \
"ret\n\t" \
".previous\n\t" \
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
"leal " #x "@tlsldm(%%ebx),%%eax\n\t" \
"call ___tls_get_addr@plt\n\t" \
"leal " #x "@dtpoff(%%eax), %%eax" \
: "=a" (__l), "=&b" (__b)); \
__l; })
#define TLS_GD(x) \
({ int *__l, __b; \
asm ("call 1f\n\t" \
".subsection 1\n" \
"1:\tmovl (%%esp), %%ebx\n\t" \
"ret\n\t" \
".previous\n\t" \
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
"leal " #x "@tlsgd(%%ebx),%%eax\n\t" \
"call ___tls_get_addr@plt\n\t" \
"nop" \
: "=a" (__l), "=&b" (__b)); \
__l; })
# else
# error "No support for this architecture so far."
# endif
/* Set the variable using the local exec model. */
puts ("set bar to 1 (LE)");

84
elf/tst-tls2.c Normal file
View File

@ -0,0 +1,84 @@
/* glibc test for TLS in ld.so. */
#include <stdio.h>
#include <tls.h>
#include "tls-macros.h"
/* Two 'int' variables in TLS. */
VAR_INT_DEF(foo);
VAR_INT_DEF(bar);
int
main (void)
{
#ifdef USE_TLS
int result = 0;
int *ap, *bp;
/* Set the variable using the local exec model. */
puts ("set bar to 1 (LE)");
ap = TLS_LE (bar);
*ap = 1;
/* Get variables using initial exec model. */
fputs ("get sum of foo and bar (IE)", stdout);
ap = TLS_IE (foo);
bp = TLS_IE (bar);
printf (" = %d\n", *ap + *bp);
result |= *ap + *bp != 1;
if (*ap != 0)
{
printf ("foo = %d\n", *ap);
result = 1;
}
if (*bp != 1)
{
printf ("bar = %d\n", *bp);
result = 1;
}
/* Get variables using local dynamic model. */
fputs ("get sum of foo and bar (LD)", stdout);
ap = TLS_LD (foo);
bp = TLS_LD (bar);
printf (" = %d\n", *ap + *bp);
result |= *ap + *bp != 1;
if (*ap != 0)
{
printf ("foo = %d\n", *ap);
result = 1;
}
if (*bp != 1)
{
printf ("bar = %d\n", *bp);
result = 1;
}
/* Get variables using generic dynamic model. */
fputs ("get sum of foo and bar (GD)", stdout);
ap = TLS_GD (foo);
bp = TLS_GD (bar);
printf (" = %d\n", *ap + *bp);
result |= *ap + *bp != 1;
if (*ap != 0)
{
printf ("foo = %d\n", *ap);
result = 1;
}
if (*bp != 1)
{
printf ("bar = %d\n", *bp);
result = 1;
}
return result;
#else
return 0;
#endif
}