diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/include/proc.h | 8 | ||||
| -rw-r--r-- | sys/arch/amd64/include/tcb.h | 56 | ||||
| -rw-r--r-- | sys/arch/sparc/include/proc.h | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/include/tcb.h | 75 | ||||
| -rw-r--r-- | sys/arch/sparc64/include/proc.h | 2 | ||||
| -rw-r--r-- | sys/arch/sparc64/include/tcb.h | 75 |
6 files changed, 216 insertions, 4 deletions
diff --git a/sys/arch/amd64/include/proc.h b/sys/arch/amd64/include/proc.h index b56cdb7e50f..733c93ea5cc 100644 --- a/sys/arch/amd64/include/proc.h +++ b/sys/arch/amd64/include/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ +/* $OpenBSD: proc.h,v 1.7 2011/10/15 23:35:29 guenther Exp $ */ /* $NetBSD: proc.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $ */ /* @@ -35,11 +35,10 @@ #ifndef _MACHINE_PROC_H_ #define _MACHINE_PROC_H_ -#include <machine/frame.h> - /* * Machine-dependent part of the proc structure for amd64. */ +struct trapframe; struct mdproc { struct trapframe *md_regs; /* registers on current frame */ int md_flags; @@ -49,5 +48,8 @@ struct mdproc { /* md_flags */ #define MDP_USEDFPU 0x0001 /* has used the FPU */ #define MDP_IRET 0x0002 /* return via iret, not sysret */ + /* (iret can restore r11 and rcx) */ + +#define __HAVE_MD_TCB #endif /* _MACHINE_PROC_H_ */ diff --git a/sys/arch/amd64/include/tcb.h b/sys/arch/amd64/include/tcb.h new file mode 100644 index 00000000000..f6a0ed87a7f --- /dev/null +++ b/sys/arch/amd64/include/tcb.h @@ -0,0 +1,56 @@ +/* + * 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/pcb.h> + +#define TCB_GET(p) \ + ((void *)((struct pcb *)(p)->p_addr)->pcb_fsbase) +#define TCB_SET(p, addr) \ + (((struct pcb *)(p)->p_addr)->pcb_fsbase = (u_int64_t)(addr)) + +#else /* _KERNEL */ + +#include <stddef.h> /* for offsetof */ + +/* ELF TLS ABI calls for big TCB, with static TLS data at negative offsets */ +#define TLS_VARIANT 2 + +/* Read a slot from the TCB */ +static inline void * +__amd64_read_tcb(long offset) +{ + void *val; + __asm__ ("movq %%fs:(%1),%0" : "=r" (val) : "r" (offset)); + return val; +} + +/* Get a pointer to the TCB itself */ +#define TCB_GET() __amd64_read_tcb(0) + +/* Get the value of a specific member in the TCB */ +#define TCB_GET_MEMBER(member) \ + __amd64_read_tcb(offsetof(struct thread_control_block, member)) + +/* Setting the TCB pointer can only be done via syscall, so no TCB_SET() */ + +#endif /* _KERNEL */ + +#endif /* _MACHINE_TCB_H_ */ diff --git a/sys/arch/sparc/include/proc.h b/sys/arch/sparc/include/proc.h index 419d945ac75..d8d5f867904 100644 --- a/sys/arch/sparc/include/proc.h +++ b/sys/arch/sparc/include/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.4 2010/11/27 19:41:45 miod Exp $ */ +/* $OpenBSD: proc.h,v 1.5 2011/10/15 23:35:29 guenther Exp $ */ /* $NetBSD: proc.h,v 1.3 1996/09/26 18:51:17 christos Exp $ */ /* @@ -48,3 +48,5 @@ struct mdproc { struct trapframe *md_tf; /* trap/syscall registers */ struct fpstate *md_fpstate; /* fpu state, if any; always resident */ }; + +#define __HAVE_MD_TCB diff --git a/sys/arch/sparc/include/tcb.h b/sys/arch/sparc/include/tcb.h new file mode 100644 index 00000000000..b445918b925 --- /dev/null +++ b/sys/arch/sparc/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] = (int)(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 * +__sparc_get_tcb(void) +{ + void *val; + __asm__ ("mov %%g7, %0" : "=r" (val)); + return val; +} +#define TCB_GET() __sparc_get_tcb() + +/* Get the value of a specific member in the TCB */ +static inline void * +__sparc_get_tcb(int offset) +{ + void *val; + __asm__ ("ld [%%g7 + %1], %0" : "=r" (val) : "r" (offset)); + return val; +} +#define TCB_GET_MEMBER(member) \ + __sparc_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_ */ 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_ */ |