Index: uspace/lib/c/arch/ia32/include/atomic.h =================================================================== --- uspace/lib/c/arch/ia32/include/atomic.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,120 +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 libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_ATOMIC_H_ -#define LIBC_ia32_ATOMIC_H_ - -#define LIBC_ARCH_ATOMIC_H_ - -#include - -static inline void atomic_inc(atomic_t *val) -{ -#ifdef __PCC__ - asm volatile ( - "lock incl %0\n" - : "+m" (val->count) - ); -#else - asm volatile ( - "lock incl %[count]\n" - : [count] "+m" (val->count) - ); -#endif -} - -static inline void atomic_dec(atomic_t *val) -{ -#ifdef __PCC__ - asm volatile ( - "lock decl %0\n" - : "+m" (val->count) - ); -#else - asm volatile ( - "lock decl %[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 xaddl %1, %0\n" - : "+m" (val->count), - "+r" (r) - ); -#else - asm volatile ( - "lock xaddl %[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 xaddl %1, %0\n" - : "+m" (val->count), - "+r" (r) - ); -#else - asm volatile ( - "lock xaddl %[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/ia32/include/barrier.h =================================================================== --- uspace/lib/c/arch/ia32/include/barrier.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia32/include/arch/barrier.h Index: uspace/lib/c/arch/ia32/include/config.h =================================================================== --- uspace/lib/c/arch/ia32/include/config.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,47 +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 libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_CONFIG_H_ -#define LIBC_ia32_CONFIG_H_ - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#define USER_ADDRESS_SPACE_START_ARCH UINT32_C(0x00000000) -#define USER_ADDRESS_SPACE_END_ARCH UINT32_C(0x7fffffff) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/context_offset.h =================================================================== --- uspace/lib/c/arch/ia32/include/context_offset.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia32/include/arch/context_offset.h Index: uspace/lib/c/arch/ia32/include/ddi.h =================================================================== --- uspace/lib/c/arch/ia32/include/ddi.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,122 +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. - */ - -/** @file - * @ingroup libcia32, libcamd64 - */ - -#ifndef LIBC_ia32_DDI_H_ -#define LIBC_ia32_DDI_H_ - -#include -#include - -#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) - -static inline uint8_t pio_read_8(ioport8_t *port) -{ - if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { - uint8_t val; - - asm volatile ( - "inb %w[port], %b[val]\n" - : [val] "=a" (val) - : [port] "d" (port) - ); - - return val; - } else - return (uint8_t) *port; -} - -static inline uint16_t pio_read_16(ioport16_t *port) -{ - if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { - uint16_t val; - - asm volatile ( - "inw %w[port], %w[val]\n" - : [val] "=a" (val) - : [port] "d" (port) - ); - - return val; - } else - return (uint16_t) *port; -} - -static inline uint32_t pio_read_32(ioport32_t *port) -{ - if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { - uint32_t val; - - asm volatile ( - "inl %w[port], %[val]\n" - : [val] "=a" (val) - : [port] "d" (port) - ); - - return val; - } else - return (uint32_t) *port; -} - -static inline void pio_write_8(ioport8_t *port, uint8_t val) -{ - if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { - asm volatile ( - "outb %b[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) - ); - } else - *port = val; -} - -static inline void pio_write_16(ioport16_t *port, uint16_t val) -{ - if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { - asm volatile ( - "outw %w[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) - ); - } else - *port = val; -} - -static inline void pio_write_32(ioport32_t *port, uint32_t val) -{ - if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { - asm volatile ( - "outl %[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) - ); - } else - *port = val; -} - -#endif Index: uspace/lib/c/arch/ia32/include/elf.h =================================================================== --- uspace/lib/c/arch/ia32/include/elf.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia32/include/arch/elf.h Index: uspace/lib/c/arch/ia32/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/ia32/include/elf_linux.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,93 +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 libcia32 - * @{ - */ -/** @file Definitions needed to write core files in Linux-ELF format. - */ - -#ifndef LIBC_ia32_ELF_LINUX_H_ -#define LBIC_ia32_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 { - uint32_t ebx; - uint32_t ecx; - uint32_t edx; - uint32_t esi; - uint32_t edi; - uint32_t ebp; - uint32_t eax; - uint32_t ds; - uint32_t es; - uint32_t fs; - uint32_t gs; - uint32_t old_eax; - uint32_t eip; - uint32_t cs; - uint32_t eflags; - uint32_t esp; - uint32_t ss; -} 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->ebx = istate->ebx; - elf_regs->ecx = istate->ecx; - elf_regs->edx = istate->edx; - elf_regs->esi = istate->esi; - elf_regs->edi = istate->edi; - elf_regs->ebp = istate->ebp; - elf_regs->eax = istate->eax; - - elf_regs->ds = istate->ds; - elf_regs->es = istate->es; - elf_regs->fs = istate->fs; - elf_regs->gs = istate->gs; - - elf_regs->old_eax = 0; - elf_regs->eip = istate->eip; - elf_regs->cs = istate->cs; - elf_regs->eflags = istate->eflags; - elf_regs->esp = istate->esp; - elf_regs->ss = istate->ss; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/faddr.h =================================================================== --- uspace/lib/c/arch/ia32/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 libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_FADDR_H_ -#define LIBC_ia32_FADDR_H_ - -#include - -#define FADDR(fptr) ((uintptr_t) (fptr)) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/fibril.h =================================================================== --- uspace/lib/c/arch/ia32/include/fibril.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,79 +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 libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_FIBRIL_H_ -#define LIBC_ia32_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 12 - -#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)->ebp = 0; \ - } while (0) - -/* - * We include only registers that must be preserved - * during function call - */ -typedef struct { - uint32_t sp; - uint32_t pc; - - uint32_t ebx; - uint32_t esi; - uint32_t edi; - uint32_t ebp; - - uint32_t tls; -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return ctx->ebp; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ia32/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 libcia32 - * @{ - */ - -#ifndef LIBC_ia32_INTTYPES_H_ -#define LIBC_ia32_INTTYPES_H_ - -#define PRIdn PRId32 /**< Format for native_t. */ -#define PRIun PRIu32 /**< Format for sysarg_t. */ -#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ -#define PRIua PRIu32 /**< Format for atomic_count_t. */ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/istate.h =================================================================== --- uspace/lib/c/arch/ia32/include/istate.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia32/include/arch/istate.h Index: uspace/lib/c/arch/ia32/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/atomic.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/atomic.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,120 @@ +/* + * 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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_ATOMIC_H_ +#define LIBC_ia32_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ + +#include + +static inline void atomic_inc(atomic_t *val) +{ +#ifdef __PCC__ + asm volatile ( + "lock incl %0\n" + : "+m" (val->count) + ); +#else + asm volatile ( + "lock incl %[count]\n" + : [count] "+m" (val->count) + ); +#endif +} + +static inline void atomic_dec(atomic_t *val) +{ +#ifdef __PCC__ + asm volatile ( + "lock decl %0\n" + : "+m" (val->count) + ); +#else + asm volatile ( + "lock decl %[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 xaddl %1, %0\n" + : "+m" (val->count), + "+r" (r) + ); +#else + asm volatile ( + "lock xaddl %[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 xaddl %1, %0\n" + : "+m" (val->count), + "+r" (r) + ); +#else + asm volatile ( + "lock xaddl %[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/ia32/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/barrier.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/barrier.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia32/include/arch/barrier.h Index: uspace/lib/c/arch/ia32/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/config.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/config.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,47 @@ +/* + * 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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_CONFIG_H_ +#define LIBC_ia32_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define USER_ADDRESS_SPACE_START_ARCH UINT32_C(0x00000000) +#define USER_ADDRESS_SPACE_END_ARCH UINT32_C(0x7fffffff) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/context_offset.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/context_offset.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia32/include/arch/context_offset.h Index: uspace/lib/c/arch/ia32/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/ddi.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/ddi.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,122 @@ +/* + * 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. + */ + +/** @file + * @ingroup libcia32, libcamd64 + */ + +#ifndef LIBC_ia32_DDI_H_ +#define LIBC_ia32_DDI_H_ + +#include +#include + +#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + uint8_t val; + + asm volatile ( + "inb %w[port], %b[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + + return val; + } else + return (uint8_t) *port; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + uint16_t val; + + asm volatile ( + "inw %w[port], %w[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + + return val; + } else + return (uint16_t) *port; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { + uint32_t val; + + asm volatile ( + "inl %w[port], %[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + + return val; + } else + return (uint32_t) *port; +} + +static inline void pio_write_8(ioport8_t *port, uint8_t val) +{ + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + asm volatile ( + "outb %b[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); + } else + *port = val; +} + +static inline void pio_write_16(ioport16_t *port, uint16_t val) +{ + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + asm volatile ( + "outw %w[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); + } else + *port = val; +} + +static inline void pio_write_32(ioport32_t *port, uint32_t val) +{ + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { + asm volatile ( + "outl %[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); + } else + *port = val; +} + +#endif Index: uspace/lib/c/arch/ia32/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/elf.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/elf.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia32/include/arch/elf.h Index: uspace/lib/c/arch/ia32/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/elf_linux.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/elf_linux.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,93 @@ +/* + * 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 libcia32 + * @{ + */ +/** @file Definitions needed to write core files in Linux-ELF format. + */ + +#ifndef LIBC_ia32_ELF_LINUX_H_ +#define LBIC_ia32_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 { + uint32_t ebx; + uint32_t ecx; + uint32_t edx; + uint32_t esi; + uint32_t edi; + uint32_t ebp; + uint32_t eax; + uint32_t ds; + uint32_t es; + uint32_t fs; + uint32_t gs; + uint32_t old_eax; + uint32_t eip; + uint32_t cs; + uint32_t eflags; + uint32_t esp; + uint32_t ss; +} 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->ebx = istate->ebx; + elf_regs->ecx = istate->ecx; + elf_regs->edx = istate->edx; + elf_regs->esi = istate->esi; + elf_regs->edi = istate->edi; + elf_regs->ebp = istate->ebp; + elf_regs->eax = istate->eax; + + elf_regs->ds = istate->ds; + elf_regs->es = istate->es; + elf_regs->fs = istate->fs; + elf_regs->gs = istate->gs; + + elf_regs->old_eax = 0; + elf_regs->eip = istate->eip; + elf_regs->cs = istate->cs; + elf_regs->eflags = istate->eflags; + elf_regs->esp = istate->esp; + elf_regs->ss = istate->ss; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/faddr.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/faddr.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_FADDR_H_ +#define LIBC_ia32_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/fibril.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/fibril.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,79 @@ +/* + * 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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_FIBRIL_H_ +#define LIBC_ia32_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 12 + +#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)->ebp = 0; \ + } while (0) + +/* + * We include only registers that must be preserved + * during function call + */ +typedef struct { + uint32_t sp; + uint32_t pc; + + uint32_t ebx; + uint32_t esi; + uint32_t edi; + uint32_t ebp; + + uint32_t tls; +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->ebp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/inttypes.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/inttypes.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -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 libcia32 + * @{ + */ + +#ifndef LIBC_ia32_INTTYPES_H_ +#define LIBC_ia32_INTTYPES_H_ + +#define PRIdn PRId32 /**< Format for native_t. */ +#define PRIun PRIu32 /**< Format for sysarg_t. */ +#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu32 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/istate.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/istate.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia32/include/arch/istate.h Index: uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008 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 generic + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_RTLD_DYNAMIC_H_ +#define LIBC_ia32_RTLD_DYNAMIC_H_ + +#include + +typedef struct { + /* Empty. */ +} dyn_info_arch_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/rtld/elf_dyn.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/rtld/elf_dyn.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/rtld/elf_dyn.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2008 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 generic + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_RTLD_ELF_DYN_H_ +#define LIBC_ia32_RTLD_ELF_DYN_H_ + +/* + * ia32 dynamic relocation types + */ + +#define R_386_32 1 +#define R_386_PC32 2 +#define R_386_COPY 5 +#define R_386_GLOB_DAT 6 +#define R_386_JUMP_SLOT 7 +#define R_386_RELATIVE 8 + +#define R_386_TLS_DTPMOD32 35 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/syscall.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/syscall.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,60 @@ +/* + * 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_ia32_SYSCALL_H_ +#define LIBC_ia32_SYSCALL_H_ + +#include +#include + +#define __syscall0 __syscall_fast_func +#define __syscall1 __syscall_fast_func +#define __syscall2 __syscall_fast_func +#define __syscall3 __syscall_fast_func +#define __syscall4 __syscall_fast_func +#define __syscall5 __syscall_slow +#define __syscall6 __syscall_slow + +extern sysarg_t (* __syscall_fast_func)(const sysarg_t, const sysarg_t, + const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t, + const syscall_t); + +extern sysarg_t __syscall_slow(const sysarg_t, const sysarg_t, const sysarg_t, + const sysarg_t, const sysarg_t, const sysarg_t, const syscall_t); + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/thread.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/thread.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_THREAD_H_ +#define LIBC_ia32_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/tls.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/tls.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,67 @@ +/* + * 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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_TLS_H_ +#define LIBC_ia32_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 ( + "movl %%gs:0, %0" + : "=r" (retval) + ); + + return retval; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/types.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/ia32/include/libarch/types.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,62 @@ +/* + * 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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_TYPES_H_ +#define LIBC_ia32_TYPES_H_ + +#define __32_BITS__ + +#include + +#define SIZE_MIN UINT32_MIN +#define SIZE_MAX UINT32_MAX + +#define SSIZE_MIN INT32_MIN +#define SSIZE_MAX INT32_MAX + +typedef uint32_t sysarg_t; +typedef int32_t native_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef int32_t intptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/rtld/dynamic.h =================================================================== --- uspace/lib/c/arch/ia32/include/rtld/dynamic.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2008 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 generic - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_RTLD_DYNAMIC_H_ -#define LIBC_ia32_RTLD_DYNAMIC_H_ - -#include - -typedef struct { - /* Empty. */ -} dyn_info_arch_t; - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h =================================================================== --- uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,54 +1,0 @@ -/* - * Copyright (c) 2008 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 generic - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_RTLD_ELF_DYN_H_ -#define LIBC_ia32_RTLD_ELF_DYN_H_ - -/* - * ia32 dynamic relocation types - */ - -#define R_386_32 1 -#define R_386_PC32 2 -#define R_386_COPY 5 -#define R_386_GLOB_DAT 6 -#define R_386_JUMP_SLOT 7 -#define R_386_RELATIVE 8 - -#define R_386_TLS_DTPMOD32 35 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/syscall.h =================================================================== --- uspace/lib/c/arch/ia32/include/syscall.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,60 +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_ia32_SYSCALL_H_ -#define LIBC_ia32_SYSCALL_H_ - -#include -#include - -#define __syscall0 __syscall_fast_func -#define __syscall1 __syscall_fast_func -#define __syscall2 __syscall_fast_func -#define __syscall3 __syscall_fast_func -#define __syscall4 __syscall_fast_func -#define __syscall5 __syscall_slow -#define __syscall6 __syscall_slow - -extern sysarg_t (* __syscall_fast_func)(const sysarg_t, const sysarg_t, - const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t, - const syscall_t); - -extern sysarg_t __syscall_slow(const sysarg_t, const sysarg_t, const sysarg_t, - const sysarg_t, const sysarg_t, const sysarg_t, const syscall_t); - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/thread.h =================================================================== --- uspace/lib/c/arch/ia32/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 libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_THREAD_H_ -#define LIBC_ia32_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/tls.h =================================================================== --- uspace/lib/c/arch/ia32/include/tls.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,67 +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 libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_TLS_H_ -#define LIBC_ia32_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 ( - "movl %%gs:0, %0" - : "=r" (retval) - ); - - return retval; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/types.h =================================================================== --- uspace/lib/c/arch/ia32/include/types.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,62 +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 libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_TYPES_H_ -#define LIBC_ia32_TYPES_H_ - -#define __32_BITS__ - -#include - -#define SIZE_MIN UINT32_MIN -#define SIZE_MAX UINT32_MAX - -#define SSIZE_MIN INT32_MIN -#define SSIZE_MAX INT32_MAX - -typedef uint32_t sysarg_t; -typedef int32_t native_t; - -typedef int32_t ssize_t; -typedef uint32_t size_t; - -typedef uint32_t uintptr_t; -typedef int32_t intptr_t; -typedef uint32_t atomic_count_t; -typedef int32_t atomic_signed_t; - -#endif - -/** @} - */