i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some issues in TLS.h (i.e. the inline version of tls_address() accidently

Browse Source 
returned a (void *) instead of a (void **)).
Added TLS_MAX_KEYS macro, and a comment.
Cleanup.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2359 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-01-06 07:57:10 +00:00
parent 954674ddf8
commit 5c339b0237
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/support/TLS.h
+26 -12
View File
@@ -1,28 +1,40 @@
#ifndef _TLS_H #ifndef _TLS_H
#define _TLS_H 1 #define _TLS_H
/*
** Distributed under the terms of the OpenBeOS License.
*/
#include <BeBuild.h> #include <BeBuild.h>
#include <SupportDefs.h> #include <SupportDefs.h>
/* A maximum of 64 keys is allowed to store in TLS - the key is reserved
* process-wide. Note that tls_allocate() will return B_NO_MEMORY if you
* try to exceed this limit.
*/
#define TLS_MAX_KEYS 64
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern _IMPEXP_ROOT int32 tls_allocate(void); extern int32 tls_allocate(void);
#if __INTEL__ #if !_NO_INLINE_ASM && __INTEL__ && __GNUC__
static inline void * tls_get(int32 index) { static inline void *
void *ret; tls_get(int32 index)
{
void *ret;
__asm__ __volatile__ ( __asm__ __volatile__ (
"movl %%fs:(,%%edx, 4), %%eax \n\t" "movl %%fs:(,%%edx, 4), %%eax \n\t"
: "=a"(ret) : "d"(index) ); : "=a"(ret) : "d"(index) );
return ret; return ret;
} }
static inline void * tls_address(int32 index) { static inline void **
void *ret; tls_address(int32 index)
{
void *ret;
__asm__ __volatile__ ( __asm__ __volatile__ (
"movl %%fs:0, %%eax \n\t" "movl %%fs:0, %%eax \n\t"
"leal (%%eax, %%edx, 4), %%eax \n\t" "leal (%%eax, %%edx, 4), %%eax \n\t"
@@ -30,7 +42,9 @@ static inline void * tls_address(int32 index) {
return ret; return ret;
} }
static inline void tls_set(int32 index, void *value) { static inline void
tls_set(int32 index, void *value)
{
__asm__ __volatile__ ( __asm__ __volatile__ (
"movl %%eax, %%fs:(,%%edx, 4) \n\t" "movl %%eax, %%fs:(,%%edx, 4) \n\t"
: : "d"(index), "a"(value) ); : : "d"(index), "a"(value) );
@@ -38,9 +52,9 @@ static inline void tls_set(int32 index, void *value) {
#else #else
extern _IMPEXP_ROOT void * tls_get(int32 index); extern void *tls_get(int32 index);
extern _IMPEXP_ROOT void ** tls_address(int32 index); extern void **tls_address(int32 index);
extern _IMPEXP_ROOT void tls_set(int32 index, void *value); extern void tls_set(int32 index, void *value);
#endif #endif
@@ -48,4 +62,4 @@ extern _IMPEXP_ROOT void tls_set(int32 index, void *value);
} }
#endif #endif
#endif #endif /* _TLS_H */