Index: uspace/lib/c/arch/mips64/include/atomic.h =================================================================== --- uspace/lib/c/arch/mips64/include/atomic.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,86 +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 libcmips64 - * @{ - */ -/** @file - * @ingroup libcmips64 - */ - -#ifndef LIBC_mips64_ATOMIC_H_ -#define LIBC_mips64_ATOMIC_H_ - -#define LIBC_ARCH_ATOMIC_H_ - -#include - -#define atomic_inc(x) ((void) atomic_add(x, 1)) -#define atomic_dec(x) ((void) atomic_add(x, -1)) - -#define atomic_postinc(x) (atomic_add(x, 1) - 1) -#define atomic_postdec(x) (atomic_add(x, -1) + 1) - -#define atomic_preinc(x) atomic_add(x, 1) -#define atomic_predec(x) atomic_add(x, -1) - -/* Atomic addition of immediate value. - * - * @param val Memory location to which will be the immediate value added. - * @param i Signed immediate that will be added to *val. - * - * @return Value after addition. - * - */ -static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i) -{ - atomic_count_t tmp; - atomic_count_t v; - - asm volatile ( - "1:\n" - " lld %0, %1\n" - " daddu %0, %0, %3\n" /* same as add, but never traps on overflow */ - " move %2, %0\n" - " scd %0, %1\n" - " beq %0, %4, 1b\n" /* if the atomic operation failed, try again */ - " nop\n" - : "=&r" (tmp), - "+m" (val->count), - "=&r" (v) - : "r" (i), - "i" (0) - ); - - return v; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips64/include/barrier.h =================================================================== --- uspace/lib/c/arch/mips64/include/barrier.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/arch/barrier.h Index: uspace/lib/c/arch/mips64/include/config.h =================================================================== --- uspace/lib/c/arch/mips64/include/config.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcmips64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_mips64_CONFIG_H_ -#define LIBC_mips64_CONFIG_H_ - -#define PAGE_WIDTH 14 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips64/include/context_offset.h =================================================================== --- uspace/lib/c/arch/mips64/include/context_offset.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/arch/context_offset.h Index: uspace/lib/c/arch/mips64/include/cp0.h =================================================================== --- uspace/lib/c/arch/mips64/include/cp0.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/arch/cp0.h Index: uspace/lib/c/arch/mips64/include/ddi.h =================================================================== --- uspace/lib/c/arch/mips64/include/ddi.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,69 +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 libcmips64 - */ - -#ifndef LIBC_mips64_DDI_H_ -#define LIBC_mips64_DDI_H_ - -#include -#include - -static inline void pio_write_8(ioport8_t *port, uint8_t v) -{ - *port = v; -} - -static inline void pio_write_16(ioport16_t *port, uint16_t v) -{ - *port = v; -} - -static inline void pio_write_32(ioport32_t *port, uint32_t v) -{ - *port = v; -} - -static inline uint8_t pio_read_8(ioport8_t *port) -{ - return *port; -} - -static inline uint16_t pio_read_16(ioport16_t *port) -{ - return *port; -} - -static inline uint32_t pio_read_32(ioport32_t *port) -{ - return *port; -} - -#endif Index: uspace/lib/c/arch/mips64/include/elf.h =================================================================== --- uspace/lib/c/arch/mips64/include/elf.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/arch/elf.h Index: uspace/lib/c/arch/mips64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips64/include/elf_linux.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (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 libcmips64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_mips64_ELF_LINUX_H_ -#define LBIC_mips64_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/mips64/include/faddr.h =================================================================== --- uspace/lib/c/arch/mips64/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 libcmips64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_mips64_FADDR_H_ -#define LIBC_mips64_FADDR_H_ - -#include - -#define FADDR(fptr) ((uintptr_t) (fptr)) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips64/include/fibril.h =================================================================== --- uspace/lib/c/arch/mips64/include/fibril.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,95 +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 libcmips64 - * @{ - */ -/** @file - * @ingroup libcmips64 - */ - -#ifndef LIBC_mips64_FIBRIL_H_ -#define LIBC_mips64_FIBRIL_H_ - -#include -#include -#include - -#define SP_DELTA (ABI_STACK_FRAME + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) - -/* - * We define our own context_set, because we need to set - * the TLS pointer to the tcb + 0x7000 - * - * See tls_set in thread.h - */ -#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)) + 0x7000 + sizeof(tcb_t); \ - } while (0) - -typedef struct { - uint64_t sp; - uint64_t pc; - - uint64_t s0; - uint64_t s1; - uint64_t s2; - uint64_t s3; - uint64_t s4; - uint64_t s5; - uint64_t s6; - uint64_t s7; - uint64_t s8; - uint64_t gp; - uint64_t tls; /* Thread local storage (k1) */ - - uint64_t f20; - uint64_t f21; - uint64_t f22; - uint64_t f23; - uint64_t f24; - uint64_t f25; - uint64_t f26; - uint64_t f27; - uint64_t f28; - uint64_t f29; - uint64_t f30; -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return ctx->sp; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/mips64/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 libcmips64 - * @{ - */ - -#ifndef LIBC_mips64_INTTYPES_H_ -#define LIBC_mips64_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/mips64/include/istate.h =================================================================== --- uspace/lib/c/arch/mips64/include/istate.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/arch/istate.h Index: uspace/lib/c/arch/mips64/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/atomic.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/atomic.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,86 @@ +/* + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +#ifndef LIBC_mips64_ATOMIC_H_ +#define LIBC_mips64_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ + +#include + +#define atomic_inc(x) ((void) atomic_add(x, 1)) +#define atomic_dec(x) ((void) atomic_add(x, -1)) + +#define atomic_postinc(x) (atomic_add(x, 1) - 1) +#define atomic_postdec(x) (atomic_add(x, -1) + 1) + +#define atomic_preinc(x) atomic_add(x, 1) +#define atomic_predec(x) atomic_add(x, -1) + +/* Atomic addition of immediate value. + * + * @param val Memory location to which will be the immediate value added. + * @param i Signed immediate that will be added to *val. + * + * @return Value after addition. + * + */ +static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i) +{ + atomic_count_t tmp; + atomic_count_t v; + + asm volatile ( + "1:\n" + " lld %0, %1\n" + " daddu %0, %0, %3\n" /* same as add, but never traps on overflow */ + " move %2, %0\n" + " scd %0, %1\n" + " beq %0, %4, 1b\n" /* if the atomic operation failed, try again */ + " nop\n" + : "=&r" (tmp), + "+m" (val->count), + "=&r" (v) + : "r" (i), + "i" (0) + ); + + return v; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/barrier.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/barrier.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips64/include/arch/barrier.h Index: uspace/lib/c/arch/mips64/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/config.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/config.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips64_CONFIG_H_ +#define LIBC_mips64_CONFIG_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/context_offset.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/context_offset.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips64/include/arch/context_offset.h Index: uspace/lib/c/arch/mips64/include/libarch/cp0.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/cp0.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/cp0.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips64/include/arch/cp0.h Index: uspace/lib/c/arch/mips64/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/ddi.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/ddi.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,69 @@ +/* + * 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 libcmips64 + */ + +#ifndef LIBC_mips64_DDI_H_ +#define LIBC_mips64_DDI_H_ + +#include +#include + +static inline void pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + return *port; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + return *port; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/mips64/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/elf.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/elf.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips64/include/arch/elf.h Index: uspace/lib/c/arch/mips64/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/elf_linux.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/elf_linux.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -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 libcmips64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips64_ELF_LINUX_H_ +#define LBIC_mips64_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/mips64/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/faddr.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/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 libcmips64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips64_FADDR_H_ +#define LIBC_mips64_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/fibril.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/fibril.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,95 @@ +/* + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +#ifndef LIBC_mips64_FIBRIL_H_ +#define LIBC_mips64_FIBRIL_H_ + +#include +#include +#include + +#define SP_DELTA (ABI_STACK_FRAME + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) + +/* + * We define our own context_set, because we need to set + * the TLS pointer to the tcb + 0x7000 + * + * See tls_set in thread.h + */ +#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)) + 0x7000 + sizeof(tcb_t); \ + } while (0) + +typedef struct { + uint64_t sp; + uint64_t pc; + + uint64_t s0; + uint64_t s1; + uint64_t s2; + uint64_t s3; + uint64_t s4; + uint64_t s5; + uint64_t s6; + uint64_t s7; + uint64_t s8; + uint64_t gp; + uint64_t tls; /* Thread local storage (k1) */ + + uint64_t f20; + uint64_t f21; + uint64_t f22; + uint64_t f23; + uint64_t f24; + uint64_t f25; + uint64_t f26; + uint64_t f27; + uint64_t f28; + uint64_t f29; + uint64_t f30; +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->sp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/inttypes.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/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 libcmips64 + * @{ + */ + +#ifndef LIBC_mips64_INTTYPES_H_ +#define LIBC_mips64_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/mips64/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/istate.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/istate.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips64/include/arch/istate.h Index: uspace/lib/c/arch/mips64/include/libarch/regname.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/regname.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/regname.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips64/include/arch/asm/regname.h Index: uspace/lib/c/arch/mips64/include/libarch/stack.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/stack.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/stack.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips64/include/arch/stack.h Index: uspace/lib/c/arch/mips64/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/syscall.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/syscall.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** + * @file + */ + +#ifndef LIBC_mips64_SYSCALL_H_ +#define LIBC_mips64_SYSCALL_H_ + +#define LIBARCH_SYSCALL_GENERIC + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/thread.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/thread.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,42 @@ +/* + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +#ifndef LIBC_mips64_THREAD_H_ +#define LIBC_mips64_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/tls.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/tls.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,93 @@ +/* + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips64 + */ + +/* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */ + +#ifndef LIBC_mips64_TLS_H_ +#define LIBC_mips64_TLS_H_ + +/* + * FIXME: Note that the use of variant I contradicts the observations made in + * the note below. Nevertheless the scheme we have used for allocating and + * deallocatin TLS corresponds to TLS variant I. + */ +#define CONFIG_TLS_VARIANT_1 + +/* I did not find any specification (neither MIPS nor PowerPC), but + * as I found it + * - it uses Variant II + * - TCB is at Address(First TLS Block)+0x7000. + * - DTV is at Address(First TLS Block)+0x8000 + * - What would happen if the TLS data was larger then 0x7000? + * - The linker never accesses DTV directly, has the second definition any + * sense? + * We will make it this way: + * - TCB is at TP-0x7000-sizeof(tcb) + * - No assumption about DTV etc., but it will not have a fixed address + */ +#define MIPS_TP_OFFSET 0x7000 + +typedef struct { + void *fibril_data; +} tcb_t; + +static inline void __tcb_set(tcb_t *tcb) +{ + void *tp = tcb; + tp += MIPS_TP_OFFSET + sizeof(tcb_t); + + /* Move tls to K1 */ + asm volatile ( + "add $27, %0, $0" + :: "r" (tp) + ); +} + +static inline tcb_t *__tcb_get(void) +{ + void *retval; + + asm volatile ( + "add %0, $27, $0" + : "=r" (retval) + ); + + return (tcb_t *) (retval - MIPS_TP_OFFSET - sizeof(tcb_t)); +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/types.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) +++ uspace/lib/c/arch/mips64/include/libarch/types.h (revision aebcd426582babfeec12c88cbcb68dc1cd23763f) @@ -0,0 +1,63 @@ +/* + * 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 libcmips64 + * @{ + */ +/** @file + * @ingroup libcmips32 + */ + +#ifndef LIBC_mips64_TYPES_H_ +#define LIBC_mips64_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/mips64/include/regname.h =================================================================== --- uspace/lib/c/arch/mips64/include/regname.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/arch/asm/regname.h Index: uspace/lib/c/arch/mips64/include/stack.h =================================================================== --- uspace/lib/c/arch/mips64/include/stack.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/arch/stack.h Index: uspace/lib/c/arch/mips64/include/syscall.h =================================================================== --- uspace/lib/c/arch/mips64/include/syscall.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** - * @file - */ - -#ifndef LIBC_mips64_SYSCALL_H_ -#define LIBC_mips64_SYSCALL_H_ - -#define LIBARCH_SYSCALL_GENERIC - -#include - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips64/include/thread.h =================================================================== --- uspace/lib/c/arch/mips64/include/thread.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,42 +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 libcmips64 - * @{ - */ -/** @file - * @ingroup libcmips64 - */ - -#ifndef LIBC_mips64_THREAD_H_ -#define LIBC_mips64_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips64/include/tls.h =================================================================== --- uspace/lib/c/arch/mips64/include/tls.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,93 +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 libcmips64 - * @{ - */ -/** @file - * @ingroup libcmips64 - */ - -/* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */ - -#ifndef LIBC_mips64_TLS_H_ -#define LIBC_mips64_TLS_H_ - -/* - * FIXME: Note that the use of variant I contradicts the observations made in - * the note below. Nevertheless the scheme we have used for allocating and - * deallocatin TLS corresponds to TLS variant I. - */ -#define CONFIG_TLS_VARIANT_1 - -/* I did not find any specification (neither MIPS nor PowerPC), but - * as I found it - * - it uses Variant II - * - TCB is at Address(First TLS Block)+0x7000. - * - DTV is at Address(First TLS Block)+0x8000 - * - What would happen if the TLS data was larger then 0x7000? - * - The linker never accesses DTV directly, has the second definition any - * sense? - * We will make it this way: - * - TCB is at TP-0x7000-sizeof(tcb) - * - No assumption about DTV etc., but it will not have a fixed address - */ -#define MIPS_TP_OFFSET 0x7000 - -typedef struct { - void *fibril_data; -} tcb_t; - -static inline void __tcb_set(tcb_t *tcb) -{ - void *tp = tcb; - tp += MIPS_TP_OFFSET + sizeof(tcb_t); - - /* Move tls to K1 */ - asm volatile ( - "add $27, %0, $0" - :: "r" (tp) - ); -} - -static inline tcb_t *__tcb_get(void) -{ - void *retval; - - asm volatile ( - "add %0, $27, $0" - : "=r" (retval) - ); - - return (tcb_t *) (retval - MIPS_TP_OFFSET - sizeof(tcb_t)); -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips64/include/types.h =================================================================== --- uspace/lib/c/arch/mips64/include/types.h (revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194) +++ (revision ) @@ -1,63 +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 libcmips64 - * @{ - */ -/** @file - * @ingroup libcmips32 - */ - -#ifndef LIBC_mips64_TYPES_H_ -#define LIBC_mips64_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 - -/** @} - */