20fe2c9465
The amd64, i386, and sparc64 versions were identical, with the one difference where the former two used inline asm instead of _tcb_get. I have compared the function before and after replacing the asm with _tcb_get and found the object files to be identical. The arm, mips, and powerpc versions were almost identical. The only difference was the powerpc version used an alignment of 1 where arm and mips used 16. As this is an increase in alignment is will be safe. Along with this arm, mips, and powerpc all passed, when initial was true, the value returned from _tcb_get as the first argument to _rtld_allocate_tls. This would then return this pointer back to the caller. We can remove these extra calls by checking if initial is set and setting the thread control block directly. As this is what the sparc64 code does we can use it directly. As after these observations all the architectures can now have identical code we can merge them into a common file. Differential Revision: https://reviews.freebsd.org/D1556 Reviewed by: kib Sponsored by: The FreeBSD Foundation
103 lines
2.9 KiB
C
103 lines
2.9 KiB
C
/*-
|
|
* Copyright (c) 2002 Daniel Eischen <deischen@freebsd.org>.
|
|
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
/*
|
|
* Machine-dependent thread prototypes/definitions.
|
|
*/
|
|
#ifndef _PTHREAD_MD_H_
|
|
#define _PTHREAD_MD_H_
|
|
|
|
#include <stddef.h>
|
|
#include <sys/types.h>
|
|
#include <machine/sysarch.h>
|
|
|
|
#define CPU_SPINWAIT __asm __volatile("pause")
|
|
|
|
#define DTV_OFFSET offsetof(struct tcb, tcb_dtv)
|
|
|
|
/*
|
|
* Variant II tcb, first two members are required by rtld,
|
|
* %gs points to the structure.
|
|
*/
|
|
struct tcb {
|
|
struct tcb *tcb_self; /* required by rtld */
|
|
void *tcb_dtv; /* required by rtld */
|
|
struct pthread *tcb_thread;
|
|
};
|
|
|
|
/*
|
|
* Evaluates to the byte offset of the per-tcb variable name.
|
|
*/
|
|
#define __tcb_offset(name) __offsetof(struct tcb, name)
|
|
|
|
/*
|
|
* Evaluates to the type of the per-tcb variable name.
|
|
*/
|
|
#define __tcb_type(name) __typeof(((struct tcb *)0)->name)
|
|
|
|
/*
|
|
* Evaluates to the value of the per-tcb variable name.
|
|
*/
|
|
#define TCB_GET32(name) ({ \
|
|
__tcb_type(name) __result; \
|
|
\
|
|
u_int __i; \
|
|
__asm __volatile("movl %%gs:%1, %0" \
|
|
: "=r" (__i) \
|
|
: "m" (*(volatile u_int *)(__tcb_offset(name)))); \
|
|
__result = (__tcb_type(name))__i; \
|
|
\
|
|
__result; \
|
|
})
|
|
|
|
/* Called from the thread to set its private data. */
|
|
static __inline void
|
|
_tcb_set(struct tcb *tcb)
|
|
{
|
|
i386_set_gsbase(tcb);
|
|
}
|
|
|
|
/* Get the current kcb. */
|
|
static __inline struct tcb *
|
|
_tcb_get(void)
|
|
{
|
|
return (TCB_GET32(tcb_self));
|
|
}
|
|
|
|
/* Get the current thread. */
|
|
static __inline struct pthread *
|
|
_get_curthread(void)
|
|
{
|
|
return (TCB_GET32(tcb_thread));
|
|
}
|
|
|
|
#define HAS__UMTX_OP_ERR 1
|
|
|
|
#endif
|