diff options
author | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-10-15 23:35:30 +0000 |
---|---|---|
committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-10-15 23:35:30 +0000 |
commit | 67874eb615d7ff9c8ac1f262fa286e41e2e0e32f (patch) | |
tree | a4438f1bc677ce643f078f2bfaef615b6264844d /sys/arch/sparc64 | |
parent | ae0a9206a9212a9f09180c0e6c63b4973377fc50 (diff) |
"TLS-lite": add kernel support for a per-thread userspace pointer,
for pointing to the thread-control-block. Support for mapping this
to the correct hardware register can be added as it's finished;
start with support for amd64, sparc, and sparc64. Includes syscalls
for getting and setting it (for a portable __errno implementation) as
well as creating a new thread with an initial value for it.
discussed with miod@, kettenis@, deraadt@; committing to get the syscalls
in with the impending libc bump and do further refinements in tree
Diffstat (limited to 'sys/arch/sparc64')
-rw-r--r-- | sys/arch/sparc64/include/proc.h | 2 | ||||
-rw-r--r-- | sys/arch/sparc64/include/tcb.h | 75 |
2 files changed, 77 insertions, 0 deletions
diff --git a/sys/arch/sparc64/include/proc.h b/sys/arch/sparc64/include/proc.h index 0559c74bcc9..6ae7daa48d7 100644 --- a/sys/arch/sparc64/include/proc.h +++ b/sys/arch/sparc64/include/proc.h @@ -48,3 +48,5 @@ struct mdproc { struct fpstate64 *md_fpstate; /* fpu state, if any; always resident */ __volatile int md_astpending; }; + +#define __HAVE_MD_TCB diff --git a/sys/arch/sparc64/include/tcb.h b/sys/arch/sparc64/include/tcb.h new file mode 100644 index 00000000000..6dedb858c05 --- /dev/null +++ b/sys/arch/sparc64/include/tcb.h @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2011 Philip Guenther <guenther@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _MACHINE_TCB_H_ +#define _MACHINE_TCB_H_ + +#ifdef _KERNEL + +#include <machine/reg.h> + +/* + * In userspace, register %g7 contains the address of the thread's TCB + */ +#define TCB_GET(p) \ + ((void *)(p)->p_md.md_tf->tf_global[7]) +#define TCB_SET(p, addr) \ + ((p)->p_md.md_tf->tf_global[7] = (int64_t)(addr)) + +#else /* _KERNEL */ + +/* ELF TLS ABI calls for big TCB, with static TLS data at negative offsets */ +#define TLS_VARIANT 2 + +#if 0 /* XXX perhaps use the gcc global register extension? */ +struct thread_control_block; +__register__ struct thread_control_block *__tcb __asm__ ("%g7"); +#define TCB_GET() (__tcb) +#define TCB_GET_MEMBER(member) ((void *)(__tcb->member)) +#define TCB_SET(tcb) ((__tcb) = (tcb)) + +#else + +#include <stddef.h> /* for offsetof */ + +/* Get a pointer to the TCB itself */ +static inline void * +__sparc64_get_tcb(void) +{ + void *val; + __asm__ ("mov %%g7, %0" : "=r" (val)); + return val; +} +#define TCB_GET() __sparc64_get_tcb() + +/* Get the value of a specific member in the TCB */ +static inline void * +__sparc64_get_tcb(int offset) +{ + void *val; + __asm__ ("ldx [%%g7 + %1], %0" : "=r" (val) : "r" (offset)); + return val; +} +#define TCB_GET_MEMBER(member) \ + __sparc64_get_tcb(offsetof(struct thread_control_block, member)) + +#define TCB_SET(tcb) (__asm __volatile("mov %0, %%g7" : : "r" (tcb))) + +#endif /* 0 */ + +#endif /* _KERNEL */ + +#endif /* _MACHINE_TCB_H_ */ |