Index: uspace/lib/c/arch/sparc64/include/atomic.h =================================================================== --- uspace/lib/c/arch/sparc64/include/atomic.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,108 +1,0 @@ -/* - * Copyright (c) 2005 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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_ATOMIC_H_ -#define LIBC_sparc64_ATOMIC_H_ - -#define LIBC_ARCH_ATOMIC_H_ - -#include -#include - -/** Atomic add operation. - * - * Use atomic compare and swap operation to atomically add signed value. - * - * @param val Atomic variable. - * @param i Signed value to be added. - * - * @return Value of the atomic variable as it existed before addition. - * - */ -static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i) -{ - atomic_count_t a; - atomic_count_t b; - - do { - volatile uintptr_t ptr = (uintptr_t) &val->count; - - a = *((atomic_count_t *) ptr); - b = a + i; - - asm volatile ( - "casx %0, %2, %1\n" - : "+m" (*((atomic_count_t *) ptr)), - "+r" (b) - : "r" (a) - ); - } while (a != b); - - return a; -} - -static inline atomic_count_t atomic_preinc(atomic_t *val) -{ - return atomic_add(val, 1) + 1; -} - -static inline atomic_count_t atomic_postinc(atomic_t *val) -{ - return atomic_add(val, 1); -} - -static inline atomic_count_t atomic_predec(atomic_t *val) -{ - return atomic_add(val, -1) - 1; -} - -static inline atomic_count_t atomic_postdec(atomic_t *val) -{ - return atomic_add(val, -1); -} - -static inline void atomic_inc(atomic_t *val) -{ - (void) atomic_add(val, 1); -} - -static inline void atomic_dec(atomic_t *val) -{ - (void) atomic_add(val, -1); -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/barrier.h =================================================================== --- uspace/lib/c/arch/sparc64/include/barrier.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/sparc64/include/barrier.h Index: uspace/lib/c/arch/sparc64/include/config.h =================================================================== --- uspace/lib/c/arch/sparc64/include/config.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,49 +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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_CONFIG_H_ -#define LIBC_sparc64_CONFIG_H_ - -#if defined (SUN4U) -#define PAGE_WIDTH 14 -#elif defined(SUN4V) -#define PAGE_WIDTH 13 -#endif - -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/context_offset.h =================================================================== --- uspace/lib/c/arch/sparc64/include/context_offset.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/sparc64/include/context_offset.h Index: uspace/lib/c/arch/sparc64/include/ddi.h =================================================================== --- uspace/lib/c/arch/sparc64/include/ddi.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,95 +1,0 @@ -/* - * Copyright (c) 2009 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. - */ - -/** @file - * @ingroup libsparc64 - */ - -#ifndef LIBC_sparc64_DDI_H_ -#define LIBC_sparc64_DDI_H_ - -#include -#include - -static inline void memory_barrier(void) -{ - asm volatile ( - "membar #LoadLoad | #StoreStore\n" - ::: "memory" - ); -} - -static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) -{ - *port = v; - memory_barrier(); -} - -static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) -{ - *port = v; - memory_barrier(); -} - -static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) -{ - *port = v; - memory_barrier(); -} - -static inline uint8_t arch_pio_read_8(const ioport8_t *port) -{ - uint8_t rv; - - rv = *port; - memory_barrier(); - - return rv; -} - -static inline uint16_t arch_pio_read_16(const ioport16_t *port) -{ - uint16_t rv; - - rv = *port; - memory_barrier(); - - return rv; -} - -static inline uint32_t arch_pio_read_32(const ioport32_t *port) -{ - uint32_t rv; - - rv = *port; - memory_barrier(); - - return rv; -} - -#endif Index: uspace/lib/c/arch/sparc64/include/elf.h =================================================================== --- uspace/lib/c/arch/sparc64/include/elf.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/sparc64/include/elf.h Index: uspace/lib/c/arch/sparc64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/sparc64/include/elf_linux.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,55 +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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_ELF_LINUX_H_ -#define LBIC_sparc64_ELF_LINUX_H_ - -#include -#include - -typedef struct { - /* TODO */ - uint64_t pad[16]; -} elf_regs_t; - -static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) -{ - /* TODO */ - (void) istate; (void) elf_regs; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/faddr.h =================================================================== --- uspace/lib/c/arch/sparc64/include/faddr.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_FADDR_H_ -#define LIBC_sparc64_FADDR_H_ - -#include - -#define FADDR(fptr) ((uintptr_t) (fptr)) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/fibril.h =================================================================== --- uspace/lib/c/arch/sparc64/include/fibril.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,87 +1,0 @@ -/* - * Copyright (c) 2005 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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_FIBRIL_H_ -#define LIBC_sparc64_FIBRIL_H_ - -#include -#include -#include - -#define SP_DELTA (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE) - -#define context_set(c, _pc, stack, size, ptls) \ - do { \ - (c)->pc = ((uintptr_t) _pc) - 8; \ - (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), \ - STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA); \ - (c)->fp = -STACK_BIAS; \ - (c)->tp = (uint64_t) ptls; \ - } while (0) - -/* - * Save only registers that must be preserved across - * function calls. - */ -typedef struct { - uintptr_t sp; /* %o6 */ - uintptr_t pc; /* %o7 */ - uint64_t i0; - uint64_t i1; - uint64_t i2; - uint64_t i3; - uint64_t i4; - uint64_t i5; - uintptr_t fp; /* %i6 */ - uintptr_t i7; - uint64_t l0; - uint64_t l1; - uint64_t l2; - uint64_t l3; - uint64_t l4; - uint64_t l5; - uint64_t l6; - uint64_t l7; - uint64_t tp; /* %g7 */ -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return ctx->sp + STACK_BIAS; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/sparc64/include/inttypes.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (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 libcsparc64 - * @{ - */ - -#ifndef LIBC_sparc64_INTTYPES_H_ -#define LIBC_sparc64_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/sparc64/include/istate.h =================================================================== --- uspace/lib/c/arch/sparc64/include/istate.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/sparc64/include/istate.h Index: uspace/lib/c/arch/sparc64/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/atomic.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/atomic.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2005 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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_ATOMIC_H_ +#define LIBC_sparc64_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ + +#include +#include + +/** Atomic add operation. + * + * Use atomic compare and swap operation to atomically add signed value. + * + * @param val Atomic variable. + * @param i Signed value to be added. + * + * @return Value of the atomic variable as it existed before addition. + * + */ +static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i) +{ + atomic_count_t a; + atomic_count_t b; + + do { + volatile uintptr_t ptr = (uintptr_t) &val->count; + + a = *((atomic_count_t *) ptr); + b = a + i; + + asm volatile ( + "casx %0, %2, %1\n" + : "+m" (*((atomic_count_t *) ptr)), + "+r" (b) + : "r" (a) + ); + } while (a != b); + + return a; +} + +static inline atomic_count_t atomic_preinc(atomic_t *val) +{ + return atomic_add(val, 1) + 1; +} + +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + return atomic_add(val, 1); +} + +static inline atomic_count_t atomic_predec(atomic_t *val) +{ + return atomic_add(val, -1) - 1; +} + +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + return atomic_add(val, -1); +} + +static inline void atomic_inc(atomic_t *val) +{ + (void) atomic_add(val, 1); +} + +static inline void atomic_dec(atomic_t *val) +{ + (void) atomic_add(val, -1); +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/barrier.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/barrier.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/sparc64/include/arch/barrier.h Index: uspace/lib/c/arch/sparc64/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/config.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/config.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,49 @@ +/* + * 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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_CONFIG_H_ +#define LIBC_sparc64_CONFIG_H_ + +#if defined (SUN4U) +#define PAGE_WIDTH 14 +#elif defined(SUN4V) +#define PAGE_WIDTH 13 +#endif + +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/context_offset.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/context_offset.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/sparc64/include/arch/context_offset.h Index: uspace/lib/c/arch/sparc64/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/ddi.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/ddi.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2009 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. + */ + +/** @file + * @ingroup libsparc64 + */ + +#ifndef LIBC_sparc64_DDI_H_ +#define LIBC_sparc64_DDI_H_ + +#include +#include + +static inline void memory_barrier(void) +{ + asm volatile ( + "membar #LoadLoad | #StoreStore\n" + ::: "memory" + ); +} + +static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; + memory_barrier(); +} + +static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; + memory_barrier(); +} + +static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; + memory_barrier(); +} + +static inline uint8_t arch_pio_read_8(const ioport8_t *port) +{ + uint8_t rv; + + rv = *port; + memory_barrier(); + + return rv; +} + +static inline uint16_t arch_pio_read_16(const ioport16_t *port) +{ + uint16_t rv; + + rv = *port; + memory_barrier(); + + return rv; +} + +static inline uint32_t arch_pio_read_32(const ioport32_t *port) +{ + uint32_t rv; + + rv = *port; + memory_barrier(); + + return rv; +} + +#endif Index: uspace/lib/c/arch/sparc64/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/elf.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/elf.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/sparc64/include/arch/elf.h Index: uspace/lib/c/arch/sparc64/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/elf_linux.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/elf_linux.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,55 @@ +/* + * 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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_ELF_LINUX_H_ +#define LBIC_sparc64_ELF_LINUX_H_ + +#include +#include + +typedef struct { + /* TODO */ + uint64_t pad[16]; +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + /* TODO */ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/faddr.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/faddr.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_FADDR_H_ +#define LIBC_sparc64_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/fibril.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/fibril.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2005 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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_FIBRIL_H_ +#define LIBC_sparc64_FIBRIL_H_ + +#include +#include +#include + +#define SP_DELTA (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE) + +#define context_set(c, _pc, stack, size, ptls) \ + do { \ + (c)->pc = ((uintptr_t) _pc) - 8; \ + (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), \ + STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA); \ + (c)->fp = -STACK_BIAS; \ + (c)->tp = (uint64_t) ptls; \ + } while (0) + +/* + * Save only registers that must be preserved across + * function calls. + */ +typedef struct { + uintptr_t sp; /* %o6 */ + uintptr_t pc; /* %o7 */ + uint64_t i0; + uint64_t i1; + uint64_t i2; + uint64_t i3; + uint64_t i4; + uint64_t i5; + uintptr_t fp; /* %i6 */ + uintptr_t i7; + uint64_t l0; + uint64_t l1; + uint64_t l2; + uint64_t l3; + uint64_t l4; + uint64_t l5; + uint64_t l6; + uint64_t l7; + uint64_t tp; /* %g7 */ +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->sp + STACK_BIAS; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/inttypes.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/inttypes.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -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 libcsparc64 + * @{ + */ + +#ifndef LIBC_sparc64_INTTYPES_H_ +#define LIBC_sparc64_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/sparc64/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/istate.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/istate.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/sparc64/include/arch/istate.h Index: uspace/lib/c/arch/sparc64/include/libarch/regdef.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/regdef.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/regdef.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/sparc64/include/arch/regdef.h Index: uspace/lib/c/arch/sparc64/include/libarch/stack.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/stack.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/stack.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2005 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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_STACK_H_ +#define LIBC_sparc64_STACK_H_ + +#define STACK_ITEM_SIZE 8 + +/** According to SPARC Compliance Definition, every stack frame is 16-byte aligned. */ +#define STACK_ALIGNMENT 16 + +/** + * 16-extended-word save area for %i[0-7] and %l[0-7] registers. + */ +#define STACK_WINDOW_SAVE_AREA_SIZE (16 * STACK_ITEM_SIZE) + +/* + * Six extended words for first six arguments. + */ +#define STACK_ARG_SAVE_AREA_SIZE (6 * STACK_ITEM_SIZE) + +/** + * By convention, the actual top of the stack is %sp + STACK_BIAS. + */ +#define STACK_BIAS 2047 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/stackarg.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/stackarg.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/stackarg.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_STACKARG_H_ +#define LIBC_sparc64_STACKARG_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/syscall.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/syscall.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,74 @@ +/* + * 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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_SYSCALL_H_ +#define LIBC_sparc64_SYSCALL_H_ + +#include +#include + +#define __syscall0 __syscall +#define __syscall1 __syscall +#define __syscall2 __syscall +#define __syscall3 __syscall +#define __syscall4 __syscall +#define __syscall5 __syscall +#define __syscall6 __syscall + +static inline sysarg_t +__syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, + const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id) +{ + register uint64_t a1 asm("o0") = p1; + register uint64_t a2 asm("o1") = p2; + register uint64_t a3 asm("o2") = p3; + register uint64_t a4 asm("o3") = p4; + register uint64_t a5 asm("o4") = p5; + register uint64_t a6 asm("o5") = p6; + + asm volatile ( + "ta %7\n" + : "=r" (a1) + : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6), + "i" (id) + : "memory" + ); + + return a1; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/thread.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/thread.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * 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 libcsparc64 + * @{ + */ + +#ifndef LIBC_sparc64_THREAD_H_ +#define LIBC_sparc64_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/tls.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/tls.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * 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 libcsparc64 + * @{ + */ +/** + * @file + * @brief sparc64 TLS functions. + */ + +#ifndef LIBC_sparc64_TLS_H_ +#define LIBC_sparc64_TLS_H_ + +#define CONFIG_TLS_VARIANT_2 + +typedef struct { + void *self; + void *fibril_data; +} tcb_t; + +static inline void __tcb_set(tcb_t *tcb) +{ + asm volatile ("mov %0, %%g7\n" : : "r" (tcb) : "g7"); +} + +static inline tcb_t * __tcb_get(void) +{ + void *retval; + + asm volatile ("mov %%g7, %0\n" : "=r" (retval)); + + return retval; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/sparc64/include/libarch/types.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) +++ uspace/lib/c/arch/sparc64/include/libarch/types.h (revision d8d7a0d35bbd752aa55636ffce58de262efc3f60) @@ -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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_TYPES_H_ +#define LIBC_sparc64_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/sparc64/include/regdef.h =================================================================== --- uspace/lib/c/arch/sparc64/include/regdef.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/sparc64/include/regdef.h Index: uspace/lib/c/arch/sparc64/include/stack.h =================================================================== --- uspace/lib/c/arch/sparc64/include/stack.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,61 +1,0 @@ -/* - * Copyright (c) 2005 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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_STACK_H_ -#define LIBC_sparc64_STACK_H_ - -#define STACK_ITEM_SIZE 8 - -/** According to SPARC Compliance Definition, every stack frame is 16-byte aligned. */ -#define STACK_ALIGNMENT 16 - -/** - * 16-extended-word save area for %i[0-7] and %l[0-7] registers. - */ -#define STACK_WINDOW_SAVE_AREA_SIZE (16 * STACK_ITEM_SIZE) - -/* - * Six extended words for first six arguments. - */ -#define STACK_ARG_SAVE_AREA_SIZE (6 * STACK_ITEM_SIZE) - -/** - * By convention, the actual top of the stack is %sp + STACK_BIAS. - */ -#define STACK_BIAS 2047 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/stackarg.h =================================================================== --- uspace/lib/c/arch/sparc64/include/stackarg.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_STACKARG_H_ -#define LIBC_sparc64_STACKARG_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/syscall.h =================================================================== --- uspace/lib/c/arch/sparc64/include/syscall.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,74 +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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_SYSCALL_H_ -#define LIBC_sparc64_SYSCALL_H_ - -#include -#include - -#define __syscall0 __syscall -#define __syscall1 __syscall -#define __syscall2 __syscall -#define __syscall3 __syscall -#define __syscall4 __syscall -#define __syscall5 __syscall -#define __syscall6 __syscall - -static inline sysarg_t -__syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, - const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id) -{ - register uint64_t a1 asm("o0") = p1; - register uint64_t a2 asm("o1") = p2; - register uint64_t a3 asm("o2") = p3; - register uint64_t a4 asm("o3") = p4; - register uint64_t a5 asm("o4") = p5; - register uint64_t a6 asm("o5") = p6; - - asm volatile ( - "ta %7\n" - : "=r" (a1) - : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6), - "i" (id) - : "memory" - ); - - return a1; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/thread.h =================================================================== --- uspace/lib/c/arch/sparc64/include/thread.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,40 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * 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 libcsparc64 - * @{ - */ - -#ifndef LIBC_sparc64_THREAD_H_ -#define LIBC_sparc64_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/tls.h =================================================================== --- uspace/lib/c/arch/sparc64/include/tls.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (revision ) @@ -1,65 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * 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 libcsparc64 - * @{ - */ -/** - * @file - * @brief sparc64 TLS functions. - */ - -#ifndef LIBC_sparc64_TLS_H_ -#define LIBC_sparc64_TLS_H_ - -#define CONFIG_TLS_VARIANT_2 - -typedef struct { - void *self; - void *fibril_data; -} tcb_t; - -static inline void __tcb_set(tcb_t *tcb) -{ - asm volatile ("mov %0, %%g7\n" : : "r" (tcb) : "g7"); -} - -static inline tcb_t * __tcb_get(void) -{ - void *retval; - - asm volatile ("mov %%g7, %0\n" : "=r" (retval)); - - return retval; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/sparc64/include/types.h =================================================================== --- uspace/lib/c/arch/sparc64/include/types.h (revision 711a38b37af771adb8914e35f8d91da5b5d2ef07) +++ (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 libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_TYPES_H_ -#define LIBC_sparc64_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 - -/** @} - */