Index: uspace/lib/c/arch/amd64/include/atomic.h =================================================================== --- uspace/lib/c/arch/amd64/include/atomic.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,122 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 amd64 - * @ingroup lc - * @brief amd64 architecture dependent parts of libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_ATOMIC_H_ -#define LIBC_amd64_ATOMIC_H_ - -#define LIBC_ARCH_ATOMIC_H_ - -#include - -static inline void atomic_inc(atomic_t *val) -{ -#ifdef __PCC__ - asm volatile ( - "lock incq %0\n" - : "+m" (val->count) - ); -#else - asm volatile ( - "lock incq %[count]\n" - : [count] "+m" (val->count) - ); -#endif -} - -static inline void atomic_dec(atomic_t *val) -{ -#ifdef __PCC__ - asm volatile ( - "lock decq %0\n" - : "+m" (val->count) - ); -#else - asm volatile ( - "lock decq %[count]\n" - : [count] "+m" (val->count) - ); -#endif -} - -static inline atomic_count_t atomic_postinc(atomic_t *val) -{ - atomic_count_t r = 1; - -#ifdef __PCC__ - asm volatile ( - "lock xaddq %1, %0\n" - : "+m" (val->count), - "+r" (r) - ); -#else - asm volatile ( - "lock xaddq %[r], %[count]\n" - : [count] "+m" (val->count), - [r] "+r" (r) - ); -#endif - - return r; -} - -static inline atomic_count_t atomic_postdec(atomic_t *val) -{ - atomic_count_t r = -1; - -#ifdef __PCC__ - asm volatile ( - "lock xaddq %1, %0\n" - : "+m" (val->count), - "+r" (r) - ); -#else - asm volatile ( - "lock xaddq %[r], %[count]\n" - : [count] "+m" (val->count), - [r] "+r" (r) - ); -#endif - - return r; -} - -#define atomic_preinc(val) (atomic_postinc(val) + 1) -#define atomic_predec(val) (atomic_postdec(val) - 1) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/barrier.h =================================================================== --- uspace/lib/c/arch/amd64/include/barrier.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/amd64/include/arch/barrier.h Index: uspace/lib/c/arch/amd64/include/config.h =================================================================== --- uspace/lib/c/arch/amd64/include/config.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_CONFIG_H_ -#define LIBC_amd64_CONFIG_H_ - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/context_offset.h =================================================================== --- uspace/lib/c/arch/amd64/include/context_offset.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/amd64/include/arch/context_offset.h Index: uspace/lib/c/arch/amd64/include/ddi.h =================================================================== --- uspace/lib/c/arch/amd64/include/ddi.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../ia32/include/ddi.h Index: uspace/lib/c/arch/amd64/include/elf.h =================================================================== --- uspace/lib/c/arch/amd64/include/elf.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/amd64/include/arch/elf.h Index: uspace/lib/c/arch/amd64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/amd64/include/elf_linux.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,120 +1,0 @@ -/* - * Copyright (c) 2011 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file Definitions needed to write core files in Linux-ELF format. - */ - -#ifndef LIBC_amd64_ELF_LINUX_H_ -#define LBIC_amd64_ELF_LINUX_H_ - -#include -#include - -/** Linux kernel struct pt_regs structure. - * - * We need this to save register state to a core file in Linux format - * (readable by GDB configured for Linux target). - */ -typedef struct { - uint64_t r15; - uint64_t r14; - uint64_t r13; - uint64_t r12; - uint64_t rbp; - uint64_t rbx; - uint64_t r11; - uint64_t r10; - uint64_t r9; - uint64_t r8; - uint64_t rax; - uint64_t rcx; - uint64_t rdx; - uint64_t rsi; - uint64_t rdi; - uint64_t old_rax; - uint64_t rip; - uint64_t cs; - uint64_t rflags; - uint64_t rsp; - uint64_t ss; - - /* - * The following registers need to be part of elf_regs_t. - * Unfortunately, we don't have any information about them in our - * istate_t. - */ - uint64_t unused_fs_base; - uint64_t unused_gs_base; - uint64_t unused_ds; - uint64_t unused_es; - uint64_t unused_fs; - uint64_t unused_gs; -} elf_regs_t; - -/** Convert istate_t to elf_regs_t. */ -static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) -{ - elf_regs->r15 = istate->r15; - elf_regs->r14 = istate->r14; - elf_regs->r13 = istate->r13; - elf_regs->r12 = istate->r12; - elf_regs->rbp = istate->rbp; - elf_regs->rbx = istate->rbx; - elf_regs->r11 = istate->r11; - elf_regs->r10 = istate->r10; - elf_regs->r9 = istate->r9; - elf_regs->r8 = istate->r8; - elf_regs->rax = istate->rax; - elf_regs->rcx = istate->rcx; - elf_regs->rdx = istate->rdx; - elf_regs->rsi = istate->rsi; - elf_regs->rdi = istate->rdi; - elf_regs->rip = istate->rip; - elf_regs->cs = istate->cs; - elf_regs->rflags = istate->rflags; - elf_regs->rsp = istate->rsp; - elf_regs->ss = istate->ss; - - /* - * Reset the registers for which there is not enough info in istate_t. - */ - elf_regs->unused_fs_base = 0; - elf_regs->unused_gs_base = 0; - elf_regs->unused_ds = 0; - elf_regs->unused_es = 0; - elf_regs->unused_fs = 0; - elf_regs->unused_gs = 0; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/faddr.h =================================================================== --- uspace/lib/c/arch/amd64/include/faddr.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2005 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_FADDR_H_ -#define LIBC_amd64_FADDR_H_ - -#include - -#define FADDR(fptr) ((uintptr_t) (fptr)) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/fibril.h =================================================================== --- uspace/lib/c/arch/amd64/include/fibril.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,81 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_FIBRIL_H_ -#define LIBC_amd64_FIBRIL_H_ - -#include - -/* - * According to ABI the stack MUST be aligned on - * 16-byte boundary. If it is not, the va_arg calling will - * panic sooner or later - */ -#define SP_DELTA 16 - -#define context_set(c, _pc, stack, size, ptls) \ - do { \ - (c)->pc = (sysarg_t) (_pc); \ - (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ - (c)->tls = (sysarg_t) (ptls); \ - (c)->rbp = 0; \ - } while (0) - -/* We include only registers that must be preserved - * during function call - */ -typedef struct { - uint64_t sp; - uint64_t pc; - - uint64_t rbx; - uint64_t rbp; - - uint64_t r12; - uint64_t r13; - uint64_t r14; - uint64_t r15; - - uint64_t tls; -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return ctx->rbp; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/amd64/include/inttypes.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2010 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 - * @{ - */ - -#ifndef LIBC_amd64_INTTYPES_H_ -#define LIBC_amd64_INTTYPES_H_ - -#define PRIdn PRId64 /**< Format for native_t. */ -#define PRIun PRIu64 /**< Format for sysarg_t. */ -#define PRIxn PRIx64 /**< Format for hexadecimal sysarg_t. */ -#define PRIua PRIu64 /**< Format for atomic_count_t. */ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/istate.h =================================================================== --- uspace/lib/c/arch/amd64/include/istate.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/amd64/include/arch/istate.h Index: uspace/lib/c/arch/amd64/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/atomic.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/atomic.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2001-2004 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 amd64 + * @ingroup lc + * @brief amd64 architecture dependent parts of libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_ATOMIC_H_ +#define LIBC_amd64_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ + +#include + +static inline void atomic_inc(atomic_t *val) +{ +#ifdef __PCC__ + asm volatile ( + "lock incq %0\n" + : "+m" (val->count) + ); +#else + asm volatile ( + "lock incq %[count]\n" + : [count] "+m" (val->count) + ); +#endif +} + +static inline void atomic_dec(atomic_t *val) +{ +#ifdef __PCC__ + asm volatile ( + "lock decq %0\n" + : "+m" (val->count) + ); +#else + asm volatile ( + "lock decq %[count]\n" + : [count] "+m" (val->count) + ); +#endif +} + +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + atomic_count_t r = 1; + +#ifdef __PCC__ + asm volatile ( + "lock xaddq %1, %0\n" + : "+m" (val->count), + "+r" (r) + ); +#else + asm volatile ( + "lock xaddq %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); +#endif + + return r; +} + +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + atomic_count_t r = -1; + +#ifdef __PCC__ + asm volatile ( + "lock xaddq %1, %0\n" + : "+m" (val->count), + "+r" (r) + ); +#else + asm volatile ( + "lock xaddq %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); +#endif + + return r; +} + +#define atomic_preinc(val) (atomic_postinc(val) + 1) +#define atomic_predec(val) (atomic_postdec(val) - 1) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/barrier.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/barrier.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/amd64/include/arch/barrier.h Index: uspace/lib/c/arch/amd64/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/config.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/config.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_CONFIG_H_ +#define LIBC_amd64_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/context_offset.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/context_offset.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/amd64/include/arch/context_offset.h Index: uspace/lib/c/arch/amd64/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/ddi.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/ddi.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,1 @@ +../../../ia32/include/libarch/ddi.h Index: uspace/lib/c/arch/amd64/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/elf.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/elf.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/amd64/include/arch/elf.h Index: uspace/lib/c/arch/amd64/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/elf_linux.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/elf_linux.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file Definitions needed to write core files in Linux-ELF format. + */ + +#ifndef LIBC_amd64_ELF_LINUX_H_ +#define LBIC_amd64_ELF_LINUX_H_ + +#include +#include + +/** Linux kernel struct pt_regs structure. + * + * We need this to save register state to a core file in Linux format + * (readable by GDB configured for Linux target). + */ +typedef struct { + uint64_t r15; + uint64_t r14; + uint64_t r13; + uint64_t r12; + uint64_t rbp; + uint64_t rbx; + uint64_t r11; + uint64_t r10; + uint64_t r9; + uint64_t r8; + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rsi; + uint64_t rdi; + uint64_t old_rax; + uint64_t rip; + uint64_t cs; + uint64_t rflags; + uint64_t rsp; + uint64_t ss; + + /* + * The following registers need to be part of elf_regs_t. + * Unfortunately, we don't have any information about them in our + * istate_t. + */ + uint64_t unused_fs_base; + uint64_t unused_gs_base; + uint64_t unused_ds; + uint64_t unused_es; + uint64_t unused_fs; + uint64_t unused_gs; +} elf_regs_t; + +/** Convert istate_t to elf_regs_t. */ +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + elf_regs->r15 = istate->r15; + elf_regs->r14 = istate->r14; + elf_regs->r13 = istate->r13; + elf_regs->r12 = istate->r12; + elf_regs->rbp = istate->rbp; + elf_regs->rbx = istate->rbx; + elf_regs->r11 = istate->r11; + elf_regs->r10 = istate->r10; + elf_regs->r9 = istate->r9; + elf_regs->r8 = istate->r8; + elf_regs->rax = istate->rax; + elf_regs->rcx = istate->rcx; + elf_regs->rdx = istate->rdx; + elf_regs->rsi = istate->rsi; + elf_regs->rdi = istate->rdi; + elf_regs->rip = istate->rip; + elf_regs->cs = istate->cs; + elf_regs->rflags = istate->rflags; + elf_regs->rsp = istate->rsp; + elf_regs->ss = istate->ss; + + /* + * Reset the registers for which there is not enough info in istate_t. + */ + elf_regs->unused_fs_base = 0; + elf_regs->unused_gs_base = 0; + elf_regs->unused_ds = 0; + elf_regs->unused_es = 0; + elf_regs->unused_fs = 0; + elf_regs->unused_gs = 0; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/faddr.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/faddr.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_FADDR_H_ +#define LIBC_amd64_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/fibril.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/fibril.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_FIBRIL_H_ +#define LIBC_amd64_FIBRIL_H_ + +#include + +/* + * According to ABI the stack MUST be aligned on + * 16-byte boundary. If it is not, the va_arg calling will + * panic sooner or later + */ +#define SP_DELTA 16 + +#define context_set(c, _pc, stack, size, ptls) \ + do { \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = (sysarg_t) (ptls); \ + (c)->rbp = 0; \ + } while (0) + +/* We include only registers that must be preserved + * during function call + */ +typedef struct { + uint64_t sp; + uint64_t pc; + + uint64_t rbx; + uint64_t rbp; + + uint64_t r12; + uint64_t r13; + uint64_t r14; + uint64_t r15; + + uint64_t tls; +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->rbp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/inttypes.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/inttypes.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 + * @{ + */ + +#ifndef LIBC_amd64_INTTYPES_H_ +#define LIBC_amd64_INTTYPES_H_ + +#define PRIdn PRId64 /**< Format for native_t. */ +#define PRIun PRIu64 /**< Format for sysarg_t. */ +#define PRIxn PRIx64 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu64 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/istate.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/istate.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/amd64/include/arch/istate.h Index: uspace/lib/c/arch/amd64/include/libarch/stackarg.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/stackarg.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/stackarg.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2006 Josef Cejka + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_STACKARG_H_ +#define LIBC_STACKARG_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/syscall.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/syscall.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libc + * @{ + */ +/** + * @file + */ + +#ifndef LIBC_amd64_SYSCALL_H_ +#define LIBC_amd64_SYSCALL_H_ + +#define LIBARCH_SYSCALL_GENERIC + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/thread.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/thread.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_THREAD_H_ +#define LIBC_amd64_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/tls.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/tls.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_TLS_H_ +#define LIBC_amd64_TLS_H_ + +#define CONFIG_TLS_VARIANT_2 + +#include + +typedef struct { + void *self; + void *fibril_data; +} tcb_t; + +static inline void __tcb_set(tcb_t *tcb) +{ + __SYSCALL1(SYS_TLS_SET, (sysarg_t) tcb); +} + +static inline tcb_t * __tcb_get(void) +{ + void * retval; + + asm ("movq %%fs:0, %0" : "=r"(retval)); + return retval; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/types.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) +++ uspace/lib/c/arch/amd64/include/libarch/types.h (revision ea906c296a71e3f2edea0bfac602ee88cf04f607) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_TYPES_H_ +#define LIBC_amd64_TYPES_H_ + +#define __64_BITS__ + +#include + +#define SIZE_MIN UINT64_MIN +#define SIZE_MAX UINT64_MAX + +#define SSIZE_MIN INT64_MIN +#define SSIZE_MAX INT64_MAX + +typedef uint64_t sysarg_t; +typedef int64_t native_t; + +typedef int64_t ssize_t; +typedef uint64_t size_t; + +typedef uint64_t uintptr_t; +typedef int64_t intptr_t; +typedef uint64_t atomic_count_t; +typedef int64_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/stackarg.h =================================================================== --- uspace/lib/c/arch/amd64/include/stackarg.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,41 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_STACKARG_H_ -#define LIBC_STACKARG_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/syscall.h =================================================================== --- uspace/lib/c/arch/amd64/include/syscall.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libc - * @{ - */ -/** - * @file - */ - -#ifndef LIBC_amd64_SYSCALL_H_ -#define LIBC_amd64_SYSCALL_H_ - -#define LIBARCH_SYSCALL_GENERIC - -#include - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/thread.h =================================================================== --- uspace/lib/c/arch/amd64/include/thread.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,41 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_THREAD_H_ -#define LIBC_amd64_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/tls.h =================================================================== --- uspace/lib/c/arch/amd64/include/tls.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,63 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_TLS_H_ -#define LIBC_amd64_TLS_H_ - -#define CONFIG_TLS_VARIANT_2 - -#include - -typedef struct { - void *self; - void *fibril_data; -} tcb_t; - -static inline void __tcb_set(tcb_t *tcb) -{ - __SYSCALL1(SYS_TLS_SET, (sysarg_t) tcb); -} - -static inline tcb_t * __tcb_get(void) -{ - void * retval; - - asm ("movq %%fs:0, %0" : "=r"(retval)); - return retval; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/types.h =================================================================== --- uspace/lib/c/arch/amd64/include/types.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,62 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_TYPES_H_ -#define LIBC_amd64_TYPES_H_ - -#define __64_BITS__ - -#include - -#define SIZE_MIN UINT64_MIN -#define SIZE_MAX UINT64_MAX - -#define SSIZE_MIN INT64_MIN -#define SSIZE_MAX INT64_MAX - -typedef uint64_t sysarg_t; -typedef int64_t native_t; - -typedef int64_t ssize_t; -typedef uint64_t size_t; - -typedef uint64_t uintptr_t; -typedef int64_t intptr_t; -typedef uint64_t atomic_count_t; -typedef int64_t atomic_signed_t; - -#endif - -/** @} - */