Index: uspace/Makefile.common =================================================================== --- uspace/Makefile.common (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ uspace/Makefile.common (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -103,4 +103,8 @@ LIBC_PREFIX = $(LIB_PREFIX)/c +LIBC_INCLUDES_FLAGS = \ + -I$(LIBC_PREFIX)/include \ + -I$(LIBC_PREFIX)/arch/$(UARCH)/include \ + -I$(ROOT_PATH)/abi/include LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint @@ -180,5 +184,5 @@ find . -name '*.lo' -follow -exec rm \{\} \; -GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ +GCC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ @@ -187,5 +191,5 @@ -pipe -g -D__$(ENDIANESS)__ -ICC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ +ICC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ @@ -194,5 +198,5 @@ -pipe -g -D__$(ENDIANESS)__ -CLANG_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ +CLANG_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ uspace/lib/c/Makefile (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -31,10 +31,7 @@ ROOT_PATH = $(USPACE_PREFIX)/.. -INCLUDE_ABI = include/abi -INCLUDE_LIBARCH = include/libarch - COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common COMMON_HEADER = $(ROOT_PATH)/common.h -COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h +COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config @@ -46,7 +43,7 @@ $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld -PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) +PRE_DEPEND = $(COMMON_HEADER_ARCH) EXTRA_OUTPUT = $(LINKER_SCRIPTS) -EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS) +EXTRA_CLEAN = $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS) LIBRARY = libc SLIBRARY = libc.so.0.0 @@ -162,9 +159,4 @@ include $(USPACE_PREFIX)/Makefile.common -$(INCLUDE_LIBARCH): arch/$(UARCH)/include - ln -sfn ../$< $@ - -$(INCLUDE_ABI): ../../../abi/include/ - ln -sfn ../$< $@ $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in @@ -181,3 +173,3 @@ $(COMMON_HEADER_ARCH): $(COMMON_HEADER) - ln -sfn ../../../$< $@ + ln -sfn ../../../../$< $@ Index: uspace/lib/c/arch/abs32le/include/atomic.h =================================================================== --- uspace/lib/c/arch/abs32le/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,99 +1,0 @@ -/* - * Copyright (c) 2010 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 libcabs32le - * @{ - */ -/** @file - */ - -#ifndef LIBC_abs32le_ATOMIC_H_ -#define LIBC_abs32le_ATOMIC_H_ - -#include - -#define LIBC_ARCH_ATOMIC_H_ -#define CAS - -#include - -static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv) -{ - if (val->count == ov) { - val->count = nv; - return true; - } - - return false; -} - -static inline void atomic_inc(atomic_t *val) { - /* On real hardware the increment has to be done - as an atomic action. */ - - val->count++; -} - -static inline void atomic_dec(atomic_t *val) { - /* On real hardware the decrement has to be done - as an atomic action. */ - - val->count++; -} - -static inline atomic_count_t atomic_postinc(atomic_t *val) -{ - /* On real hardware both the storing of the previous - value and the increment have to be done as a single - atomic action. */ - - atomic_count_t prev = val->count; - - val->count++; - return prev; -} - -static inline atomic_count_t atomic_postdec(atomic_t *val) -{ - /* On real hardware both the storing of the previous - value and the decrement have to be done as a single - atomic action. */ - - atomic_count_t prev = val->count; - - val->count--; - return prev; -} - -#define atomic_preinc(val) (atomic_postinc(val) + 1) -#define atomic_predec(val) (atomic_postdec(val) - 1) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/barrier.h =================================================================== --- uspace/lib/c/arch/abs32le/include/barrier.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/abs32le/include/barrier.h Index: uspace/lib/c/arch/abs32le/include/config.h =================================================================== --- uspace/lib/c/arch/abs32le/include/config.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2010 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 libcabs32le - * @{ - */ -/** @file - */ - -#ifndef LIBC_abs32le_CONFIG_H_ -#define LIBC_abs32le_CONFIG_H_ - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/context_offset.h =================================================================== --- uspace/lib/c/arch/abs32le/include/context_offset.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/abs32le/include/context_offset.h Index: uspace/lib/c/arch/abs32le/include/ddi.h =================================================================== --- uspace/lib/c/arch/abs32le/include/ddi.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,68 +1,0 @@ -/* - * Copyright (c) 2010 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. - */ - -/** @file - */ - -#ifndef LIBC_abs32le_DDI_H_ -#define LIBC_abs32le_DDI_H_ - -#include -#include - -static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) -{ - *port = v; -} - -static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) -{ - *port = v; -} - -static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) -{ - *port = v; -} - -static inline uint8_t arch_pio_read_8(const ioport8_t *port) -{ - return *port; -} - -static inline uint16_t arch_pio_read_16(const ioport16_t *port) -{ - return *port; -} - -static inline uint32_t arch_pio_read_32(const ioport32_t *port) -{ - return *port; -} - -#endif Index: uspace/lib/c/arch/abs32le/include/elf.h =================================================================== --- uspace/lib/c/arch/abs32le/include/elf.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/abs32le/include/elf.h Index: uspace/lib/c/arch/abs32le/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/abs32le/include/elf_linux.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,52 +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 libcabs32le - * @{ - */ -/** @file - */ - -#ifndef LIBC_abs32le_ELF_LINUX_H_ -#define LBIC_abs32le_ELF_LINUX_H_ - -#include -#include - -typedef struct { -} elf_regs_t; - -static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) -{ - (void) istate; (void) elf_regs; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/entry.h =================================================================== --- uspace/lib/c/arch/abs32le/include/entry.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2010 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_abs32le_ENTRY_H_ -#define LIBC_abs32le_ENTRY_H_ - -extern void __entry(void); - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/faddr.h =================================================================== --- uspace/lib/c/arch/abs32le/include/faddr.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2010 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 libabs32le - * @{ - */ -/** @file - */ - -#ifndef LIBC_abs32le_FADDR_H_ -#define LIBC_abs32le_FADDR_H_ - -#include - -#define FADDR(fptr) ((uintptr_t) (fptr)) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/fibril.h =================================================================== --- uspace/lib/c/arch/abs32le/include/fibril.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,70 +1,0 @@ -/* - * Copyright (c) 2010 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 libcabs32le - * @{ - */ -/** @file - */ - -#ifndef LIBC_abs32le_FIBRIL_H_ -#define LIBC_abs32le_FIBRIL_H_ - -#include - -#define SP_DELTA 0 - -#define context_set(ctx, _pc, stack, size, ptls) \ - do { \ - (ctx)->pc = (uintptr_t) (_pc); \ - (ctx)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \ - (ctx)->fp = 0; \ - (ctx)->tls = ((uintptr_t) (ptls)) + sizeof(tcb_t); \ - } while (0) - -/* - * On real hardware this stores the registers which - * need to be preserved across function calls. - */ -typedef struct { - uintptr_t sp; - uintptr_t fp; - uintptr_t pc; - uintptr_t tls; -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - /* On real hardware, this function returns the frame pointer. */ - return ctx->fp; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/inttypes.h =================================================================== --- uspace/lib/c/arch/abs32le/include/inttypes.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2010 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 libcabs32le - * @{ - */ - -#ifndef LIBC_abs32le_INTTYPES_H_ -#define LIBC_abs32le_INTTYPES_H_ - -#define PRIdn PRId32 /**< Format for native_t. */ -#define PRIun PRIu32 /**< Format for sysarg_t. */ -#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ -#define PRIua PRIu32 /**< Format for atomic_count_t. */ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/istate.h =================================================================== --- uspace/lib/c/arch/abs32le/include/istate.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/abs32le/include/istate.h Index: uspace/lib/c/arch/abs32le/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2010 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 libcabs32le + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le_ATOMIC_H_ +#define LIBC_abs32le_ATOMIC_H_ + +#include + +#define LIBC_ARCH_ATOMIC_H_ +#define CAS + +#include + +static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv) +{ + if (val->count == ov) { + val->count = nv; + return true; + } + + return false; +} + +static inline void atomic_inc(atomic_t *val) { + /* On real hardware the increment has to be done + as an atomic action. */ + + val->count++; +} + +static inline void atomic_dec(atomic_t *val) { + /* On real hardware the decrement has to be done + as an atomic action. */ + + val->count++; +} + +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + /* On real hardware both the storing of the previous + value and the increment have to be done as a single + atomic action. */ + + atomic_count_t prev = val->count; + + val->count++; + return prev; +} + +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + /* On real hardware both the storing of the previous + value and the decrement have to be done as a single + atomic action. */ + + atomic_count_t prev = val->count; + + val->count--; + return prev; +} + +#define atomic_preinc(val) (atomic_postinc(val) + 1) +#define atomic_predec(val) (atomic_postdec(val) - 1) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/abs32le/include/arch/barrier.h Index: uspace/lib/c/arch/abs32le/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 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 libcabs32le + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le_CONFIG_H_ +#define LIBC_abs32le_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/abs32le/include/arch/context_offset.h Index: uspace/lib/c/arch/abs32le/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2010 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. + */ + +/** @file + */ + +#ifndef LIBC_abs32le_DDI_H_ +#define LIBC_abs32le_DDI_H_ + +#include +#include + +static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t arch_pio_read_8(const ioport8_t *port) +{ + return *port; +} + +static inline uint16_t arch_pio_read_16(const ioport16_t *port) +{ + return *port; +} + +static inline uint32_t arch_pio_read_32(const ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/abs32le/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/abs32le/include/arch/elf.h Index: uspace/lib/c/arch/abs32le/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,52 @@ +/* + * 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 libcabs32le + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le_ELF_LINUX_H_ +#define LBIC_abs32le_ELF_LINUX_H_ + +#include +#include + +typedef struct { +} elf_regs_t; + +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + (void) istate; (void) elf_regs; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/entry.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/entry.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/entry.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 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_abs32le_ENTRY_H_ +#define LIBC_abs32le_ENTRY_H_ + +extern void __entry(void); + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2010 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 libabs32le + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le_FADDR_H_ +#define LIBC_abs32le_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2010 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 libcabs32le + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le_FIBRIL_H_ +#define LIBC_abs32le_FIBRIL_H_ + +#include + +#define SP_DELTA 0 + +#define context_set(ctx, _pc, stack, size, ptls) \ + do { \ + (ctx)->pc = (uintptr_t) (_pc); \ + (ctx)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \ + (ctx)->fp = 0; \ + (ctx)->tls = ((uintptr_t) (ptls)) + sizeof(tcb_t); \ + } while (0) + +/* + * On real hardware this stores the registers which + * need to be preserved across function calls. + */ +typedef struct { + uintptr_t sp; + uintptr_t fp; + uintptr_t pc; + uintptr_t tls; +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + /* On real hardware, this function returns the frame pointer. */ + return ctx->fp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 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 libcabs32le + * @{ + */ + +#ifndef LIBC_abs32le_INTTYPES_H_ +#define LIBC_abs32le_INTTYPES_H_ + +#define PRIdn PRId32 /**< Format for native_t. */ +#define PRIun PRIu32 /**< Format for sysarg_t. */ +#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu32 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/abs32le/include/arch/istate.h Index: uspace/lib/c/arch/abs32le/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2010 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_abs32le_SYSCALL_H_ +#define LIBC_abs32le_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 + +extern sysarg_t __syscall(const sysarg_t, const sysarg_t, const sysarg_t, + const sysarg_t, const sysarg_t, const sysarg_t, const syscall_t); + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2010 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 libcabs32le + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le_THREAD_H_ +#define LIBC_abs32le_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 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 libcabs32le + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le_TLS_H_ +#define LIBC_abs32le_TLS_H_ + +#define CONFIG_TLS_VARIANT_2 + +#include +#include + +typedef struct { + void *self; + void *fibril_data; +} tcb_t; + +static inline void __tcb_set(tcb_t *tcb) +{ +} + +static inline tcb_t *__tcb_get(void) +{ + return NULL; +} + +extern uintptr_t __aeabi_read_tp(void); + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/abs32le/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/abs32le/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 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 libcabs32le + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le_TYPES_H_ +#define LIBC_abs32le_TYPES_H_ + +#define __32_BITS__ + +#include + +#define SIZE_MIN UINT32_MIN +#define SIZE_MAX UINT32_MAX + +#define SSIZE_MIN INT32_MIN +#define SSIZE_MAX INT32_MAX + +typedef uint32_t sysarg_t; +typedef int32_t native_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef int32_t intptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/syscall.h =================================================================== --- uspace/lib/c/arch/abs32le/include/syscall.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,56 +1,0 @@ -/* - * Copyright (c) 2010 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_abs32le_SYSCALL_H_ -#define LIBC_abs32le_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 - -extern sysarg_t __syscall(const sysarg_t, const sysarg_t, const sysarg_t, - const sysarg_t, const sysarg_t, const sysarg_t, const syscall_t); - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/thread.h =================================================================== --- uspace/lib/c/arch/abs32le/include/thread.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,41 +1,0 @@ -/* - * Copyright (c) 2010 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 libcabs32le - * @{ - */ -/** @file - */ - -#ifndef LIBC_abs32le_THREAD_H_ -#define LIBC_abs32le_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/tls.h =================================================================== --- uspace/lib/c/arch/abs32le/include/tls.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,62 +1,0 @@ -/* - * Copyright (c) 2010 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 libcabs32le - * @{ - */ -/** @file - */ - -#ifndef LIBC_abs32le_TLS_H_ -#define LIBC_abs32le_TLS_H_ - -#define CONFIG_TLS_VARIANT_2 - -#include -#include - -typedef struct { - void *self; - void *fibril_data; -} tcb_t; - -static inline void __tcb_set(tcb_t *tcb) -{ -} - -static inline tcb_t *__tcb_get(void) -{ - return NULL; -} - -extern uintptr_t __aeabi_read_tp(void); - -#endif - -/** @} - */ Index: uspace/lib/c/arch/abs32le/include/types.h =================================================================== --- uspace/lib/c/arch/abs32le/include/types.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,62 +1,0 @@ -/* - * Copyright (c) 2010 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 libcabs32le - * @{ - */ -/** @file - */ - -#ifndef LIBC_abs32le_TYPES_H_ -#define LIBC_abs32le_TYPES_H_ - -#define __32_BITS__ - -#include - -#define SIZE_MIN UINT32_MIN -#define SIZE_MAX UINT32_MAX - -#define SSIZE_MIN INT32_MIN -#define SSIZE_MAX INT32_MAX - -typedef uint32_t sysarg_t; -typedef int32_t native_t; - -typedef int32_t ssize_t; -typedef uint32_t size_t; - -typedef uint32_t uintptr_t; -typedef int32_t intptr_t; -typedef uint32_t atomic_count_t; -typedef int32_t atomic_signed_t; - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/atomic.h =================================================================== --- uspace/lib/c/arch/amd64/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,122 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 amd64 - * @ingroup lc - * @brief amd64 architecture dependent parts of libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_ATOMIC_H_ -#define LIBC_amd64_ATOMIC_H_ - -#define LIBC_ARCH_ATOMIC_H_ - -#include - -static inline void atomic_inc(atomic_t *val) -{ -#ifdef __PCC__ - asm volatile ( - "lock incq %0\n" - : "+m" (val->count) - ); -#else - asm volatile ( - "lock incq %[count]\n" - : [count] "+m" (val->count) - ); -#endif -} - -static inline void atomic_dec(atomic_t *val) -{ -#ifdef __PCC__ - asm volatile ( - "lock decq %0\n" - : "+m" (val->count) - ); -#else - asm volatile ( - "lock decq %[count]\n" - : [count] "+m" (val->count) - ); -#endif -} - -static inline atomic_count_t atomic_postinc(atomic_t *val) -{ - atomic_count_t r = 1; - -#ifdef __PCC__ - asm volatile ( - "lock xaddq %1, %0\n" - : "+m" (val->count), - "+r" (r) - ); -#else - asm volatile ( - "lock xaddq %[r], %[count]\n" - : [count] "+m" (val->count), - [r] "+r" (r) - ); -#endif - - return r; -} - -static inline atomic_count_t atomic_postdec(atomic_t *val) -{ - atomic_count_t r = -1; - -#ifdef __PCC__ - asm volatile ( - "lock xaddq %1, %0\n" - : "+m" (val->count), - "+r" (r) - ); -#else - asm volatile ( - "lock xaddq %[r], %[count]\n" - : [count] "+m" (val->count), - [r] "+r" (r) - ); -#endif - - return r; -} - -#define atomic_preinc(val) (atomic_postinc(val) + 1) -#define atomic_predec(val) (atomic_postdec(val) - 1) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/barrier.h =================================================================== --- uspace/lib/c/arch/amd64/include/barrier.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/amd64/include/barrier.h Index: uspace/lib/c/arch/amd64/include/config.h =================================================================== --- uspace/lib/c/arch/amd64/include/config.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_CONFIG_H_ -#define LIBC_amd64_CONFIG_H_ - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/context_offset.h =================================================================== --- uspace/lib/c/arch/amd64/include/context_offset.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/amd64/include/context_offset.h Index: uspace/lib/c/arch/amd64/include/ddi.h =================================================================== --- uspace/lib/c/arch/amd64/include/ddi.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../ia32/include/ddi.h Index: uspace/lib/c/arch/amd64/include/elf.h =================================================================== --- uspace/lib/c/arch/amd64/include/elf.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/amd64/include/elf.h Index: uspace/lib/c/arch/amd64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/amd64/include/elf_linux.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,120 +1,0 @@ -/* - * Copyright (c) 2011 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file Definitions needed to write core files in Linux-ELF format. - */ - -#ifndef LIBC_amd64_ELF_LINUX_H_ -#define LBIC_amd64_ELF_LINUX_H_ - -#include -#include - -/** Linux kernel struct pt_regs structure. - * - * We need this to save register state to a core file in Linux format - * (readable by GDB configured for Linux target). - */ -typedef struct { - uint64_t r15; - uint64_t r14; - uint64_t r13; - uint64_t r12; - uint64_t rbp; - uint64_t rbx; - uint64_t r11; - uint64_t r10; - uint64_t r9; - uint64_t r8; - uint64_t rax; - uint64_t rcx; - uint64_t rdx; - uint64_t rsi; - uint64_t rdi; - uint64_t old_rax; - uint64_t rip; - uint64_t cs; - uint64_t rflags; - uint64_t rsp; - uint64_t ss; - - /* - * The following registers need to be part of elf_regs_t. - * Unfortunately, we don't have any information about them in our - * istate_t. - */ - uint64_t unused_fs_base; - uint64_t unused_gs_base; - uint64_t unused_ds; - uint64_t unused_es; - uint64_t unused_fs; - uint64_t unused_gs; -} elf_regs_t; - -/** Convert istate_t to elf_regs_t. */ -static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) -{ - elf_regs->r15 = istate->r15; - elf_regs->r14 = istate->r14; - elf_regs->r13 = istate->r13; - elf_regs->r12 = istate->r12; - elf_regs->rbp = istate->rbp; - elf_regs->rbx = istate->rbx; - elf_regs->r11 = istate->r11; - elf_regs->r10 = istate->r10; - elf_regs->r9 = istate->r9; - elf_regs->r8 = istate->r8; - elf_regs->rax = istate->rax; - elf_regs->rcx = istate->rcx; - elf_regs->rdx = istate->rdx; - elf_regs->rsi = istate->rsi; - elf_regs->rdi = istate->rdi; - elf_regs->rip = istate->rip; - elf_regs->cs = istate->cs; - elf_regs->rflags = istate->rflags; - elf_regs->rsp = istate->rsp; - elf_regs->ss = istate->ss; - - /* - * Reset the registers for which there is not enough info in istate_t. - */ - elf_regs->unused_fs_base = 0; - elf_regs->unused_gs_base = 0; - elf_regs->unused_ds = 0; - elf_regs->unused_es = 0; - elf_regs->unused_fs = 0; - elf_regs->unused_gs = 0; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/faddr.h =================================================================== --- uspace/lib/c/arch/amd64/include/faddr.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2005 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_FADDR_H_ -#define LIBC_amd64_FADDR_H_ - -#include - -#define FADDR(fptr) ((uintptr_t) (fptr)) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/fibril.h =================================================================== --- uspace/lib/c/arch/amd64/include/fibril.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,81 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_FIBRIL_H_ -#define LIBC_amd64_FIBRIL_H_ - -#include - -/* - * According to ABI the stack MUST be aligned on - * 16-byte boundary. If it is not, the va_arg calling will - * panic sooner or later - */ -#define SP_DELTA 16 - -#define context_set(c, _pc, stack, size, ptls) \ - do { \ - (c)->pc = (sysarg_t) (_pc); \ - (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ - (c)->tls = (sysarg_t) (ptls); \ - (c)->rbp = 0; \ - } while (0) - -/* We include only registers that must be preserved - * during function call - */ -typedef struct { - uint64_t sp; - uint64_t pc; - - uint64_t rbx; - uint64_t rbp; - - uint64_t r12; - uint64_t r13; - uint64_t r14; - uint64_t r15; - - uint64_t tls; -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return ctx->rbp; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/amd64/include/inttypes.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2010 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ - -#ifndef LIBC_amd64_INTTYPES_H_ -#define LIBC_amd64_INTTYPES_H_ - -#define PRIdn PRId64 /**< Format for native_t. */ -#define PRIun PRIu64 /**< Format for sysarg_t. */ -#define PRIxn PRIx64 /**< Format for hexadecimal sysarg_t. */ -#define PRIua PRIu64 /**< Format for atomic_count_t. */ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/istate.h =================================================================== --- uspace/lib/c/arch/amd64/include/istate.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/amd64/include/istate.h Index: uspace/lib/c/arch/amd64/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2001-2004 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 amd64 + * @ingroup lc + * @brief amd64 architecture dependent parts of libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_ATOMIC_H_ +#define LIBC_amd64_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ + +#include + +static inline void atomic_inc(atomic_t *val) +{ +#ifdef __PCC__ + asm volatile ( + "lock incq %0\n" + : "+m" (val->count) + ); +#else + asm volatile ( + "lock incq %[count]\n" + : [count] "+m" (val->count) + ); +#endif +} + +static inline void atomic_dec(atomic_t *val) +{ +#ifdef __PCC__ + asm volatile ( + "lock decq %0\n" + : "+m" (val->count) + ); +#else + asm volatile ( + "lock decq %[count]\n" + : [count] "+m" (val->count) + ); +#endif +} + +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + atomic_count_t r = 1; + +#ifdef __PCC__ + asm volatile ( + "lock xaddq %1, %0\n" + : "+m" (val->count), + "+r" (r) + ); +#else + asm volatile ( + "lock xaddq %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); +#endif + + return r; +} + +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + atomic_count_t r = -1; + +#ifdef __PCC__ + asm volatile ( + "lock xaddq %1, %0\n" + : "+m" (val->count), + "+r" (r) + ); +#else + asm volatile ( + "lock xaddq %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); +#endif + + return r; +} + +#define atomic_preinc(val) (atomic_postinc(val) + 1) +#define atomic_predec(val) (atomic_postdec(val) - 1) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/amd64/include/arch/barrier.h Index: uspace/lib/c/arch/amd64/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_CONFIG_H_ +#define LIBC_amd64_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/amd64/include/arch/context_offset.h Index: uspace/lib/c/arch/amd64/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../ia32/include/libarch/ddi.h Index: uspace/lib/c/arch/amd64/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/amd64/include/arch/elf.h Index: uspace/lib/c/arch/amd64/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file Definitions needed to write core files in Linux-ELF format. + */ + +#ifndef LIBC_amd64_ELF_LINUX_H_ +#define LBIC_amd64_ELF_LINUX_H_ + +#include +#include + +/** Linux kernel struct pt_regs structure. + * + * We need this to save register state to a core file in Linux format + * (readable by GDB configured for Linux target). + */ +typedef struct { + uint64_t r15; + uint64_t r14; + uint64_t r13; + uint64_t r12; + uint64_t rbp; + uint64_t rbx; + uint64_t r11; + uint64_t r10; + uint64_t r9; + uint64_t r8; + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rsi; + uint64_t rdi; + uint64_t old_rax; + uint64_t rip; + uint64_t cs; + uint64_t rflags; + uint64_t rsp; + uint64_t ss; + + /* + * The following registers need to be part of elf_regs_t. + * Unfortunately, we don't have any information about them in our + * istate_t. + */ + uint64_t unused_fs_base; + uint64_t unused_gs_base; + uint64_t unused_ds; + uint64_t unused_es; + uint64_t unused_fs; + uint64_t unused_gs; +} elf_regs_t; + +/** Convert istate_t to elf_regs_t. */ +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + elf_regs->r15 = istate->r15; + elf_regs->r14 = istate->r14; + elf_regs->r13 = istate->r13; + elf_regs->r12 = istate->r12; + elf_regs->rbp = istate->rbp; + elf_regs->rbx = istate->rbx; + elf_regs->r11 = istate->r11; + elf_regs->r10 = istate->r10; + elf_regs->r9 = istate->r9; + elf_regs->r8 = istate->r8; + elf_regs->rax = istate->rax; + elf_regs->rcx = istate->rcx; + elf_regs->rdx = istate->rdx; + elf_regs->rsi = istate->rsi; + elf_regs->rdi = istate->rdi; + elf_regs->rip = istate->rip; + elf_regs->cs = istate->cs; + elf_regs->rflags = istate->rflags; + elf_regs->rsp = istate->rsp; + elf_regs->ss = istate->ss; + + /* + * Reset the registers for which there is not enough info in istate_t. + */ + elf_regs->unused_fs_base = 0; + elf_regs->unused_gs_base = 0; + elf_regs->unused_ds = 0; + elf_regs->unused_es = 0; + elf_regs->unused_fs = 0; + elf_regs->unused_gs = 0; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_FADDR_H_ +#define LIBC_amd64_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_FIBRIL_H_ +#define LIBC_amd64_FIBRIL_H_ + +#include + +/* + * According to ABI the stack MUST be aligned on + * 16-byte boundary. If it is not, the va_arg calling will + * panic sooner or later + */ +#define SP_DELTA 16 + +#define context_set(c, _pc, stack, size, ptls) \ + do { \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = (sysarg_t) (ptls); \ + (c)->rbp = 0; \ + } while (0) + +/* We include only registers that must be preserved + * during function call + */ +typedef struct { + uint64_t sp; + uint64_t pc; + + uint64_t rbx; + uint64_t rbp; + + uint64_t r12; + uint64_t r13; + uint64_t r14; + uint64_t r15; + + uint64_t tls; +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->rbp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ + +#ifndef LIBC_amd64_INTTYPES_H_ +#define LIBC_amd64_INTTYPES_H_ + +#define PRIdn PRId64 /**< Format for native_t. */ +#define PRIun PRIu64 /**< Format for sysarg_t. */ +#define PRIxn PRIx64 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu64 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/amd64/include/arch/istate.h Index: uspace/lib/c/arch/amd64/include/libarch/stackarg.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/stackarg.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/stackarg.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2006 Josef Cejka + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_STACKARG_H_ +#define LIBC_STACKARG_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** + * @file + */ + +#ifndef LIBC_amd64_SYSCALL_H_ +#define LIBC_amd64_SYSCALL_H_ + +#define LIBARCH_SYSCALL_GENERIC + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_THREAD_H_ +#define LIBC_amd64_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_TLS_H_ +#define LIBC_amd64_TLS_H_ + +#define CONFIG_TLS_VARIANT_2 + +#include + +typedef struct { + void *self; + void *fibril_data; +} tcb_t; + +static inline void __tcb_set(tcb_t *tcb) +{ + __SYSCALL1(SYS_TLS_SET, (sysarg_t) tcb); +} + +static inline tcb_t * __tcb_get(void) +{ + void * retval; + + asm ("movq %%fs:0, %0" : "=r"(retval)); + return retval; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/amd64/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_TYPES_H_ +#define LIBC_amd64_TYPES_H_ + +#define __64_BITS__ + +#include + +#define SIZE_MIN UINT64_MIN +#define SIZE_MAX UINT64_MAX + +#define SSIZE_MIN INT64_MIN +#define SSIZE_MAX INT64_MAX + +typedef uint64_t sysarg_t; +typedef int64_t native_t; + +typedef int64_t ssize_t; +typedef uint64_t size_t; + +typedef uint64_t uintptr_t; +typedef int64_t intptr_t; +typedef uint64_t atomic_count_t; +typedef int64_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/stackarg.h =================================================================== --- uspace/lib/c/arch/amd64/include/stackarg.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,41 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_STACKARG_H_ -#define LIBC_STACKARG_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/syscall.h =================================================================== --- uspace/lib/c/arch/amd64/include/syscall.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** - * @file - */ - -#ifndef LIBC_amd64_SYSCALL_H_ -#define LIBC_amd64_SYSCALL_H_ - -#define LIBARCH_SYSCALL_GENERIC - -#include - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/thread.h =================================================================== --- uspace/lib/c/arch/amd64/include/thread.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,41 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_THREAD_H_ -#define LIBC_amd64_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/tls.h =================================================================== --- uspace/lib/c/arch/amd64/include/tls.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,63 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_TLS_H_ -#define LIBC_amd64_TLS_H_ - -#define CONFIG_TLS_VARIANT_2 - -#include - -typedef struct { - void *self; - void *fibril_data; -} tcb_t; - -static inline void __tcb_set(tcb_t *tcb) -{ - __SYSCALL1(SYS_TLS_SET, (sysarg_t) tcb); -} - -static inline tcb_t * __tcb_get(void) -{ - void * retval; - - asm ("movq %%fs:0, %0" : "=r"(retval)); - return retval; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/amd64/include/types.h =================================================================== --- uspace/lib/c/arch/amd64/include/types.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,62 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_amd64_TYPES_H_ -#define LIBC_amd64_TYPES_H_ - -#define __64_BITS__ - -#include - -#define SIZE_MIN UINT64_MIN -#define SIZE_MAX UINT64_MAX - -#define SSIZE_MIN INT64_MIN -#define SSIZE_MAX INT64_MAX - -typedef uint64_t sysarg_t; -typedef int64_t native_t; - -typedef int64_t ssize_t; -typedef uint64_t size_t; - -typedef uint64_t uintptr_t; -typedef int64_t intptr_t; -typedef uint64_t atomic_count_t; -typedef int64_t atomic_signed_t; - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/atomic.h =================================================================== --- uspace/lib/c/arch/arm32/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,204 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * 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 libcarm32 - * @{ - */ -/** @file - * @brief Atomic operations. - */ - -#ifndef LIBC_arm32_ATOMIC_H_ -#define LIBC_arm32_ATOMIC_H_ - -#define LIBC_ARCH_ATOMIC_H_ -#define CAS - -#include -#include -#include - -extern uintptr_t *ras_page; - -static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv) -{ - atomic_count_t ret = 0; - - /* - * The following instructions between labels 1 and 2 constitute a - * Restartable Atomic Seqeunce. Should the sequence be non-atomic, - * the kernel will restart it. - */ - asm volatile ( - "1:\n" - " adr %[ret], 1b\n" - " str %[ret], %[rp0]\n" - " adr %[ret], 2f\n" - " str %[ret], %[rp1]\n" - " ldr %[ret], %[addr]\n" - " cmp %[ret], %[ov]\n" - " streq %[nv], %[addr]\n" - "2:\n" - " moveq %[ret], #1\n" - " movne %[ret], #0\n" - : [ret] "+&r" (ret), - [rp0] "=m" (ras_page[0]), - [rp1] "=m" (ras_page[1]), - [addr] "+m" (val->count) - : [ov] "r" (ov), - [nv] "r" (nv) - : "memory" - ); - - ras_page[0] = 0; - asm volatile ( - "" ::: "memory" - ); - ras_page[1] = 0xffffffff; - - return (bool) ret; -} - -/** Atomic addition. - * - * @param val Where to add. - * @param i Value to be added. - * - * @return Value after addition. - * - */ -static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i) -{ - atomic_count_t ret = 0; - - /* - * The following instructions between labels 1 and 2 constitute a - * Restartable Atomic Seqeunce. Should the sequence be non-atomic, - * the kernel will restart it. - */ - asm volatile ( - "1:\n" - " adr %[ret], 1b\n" - " str %[ret], %[rp0]\n" - " adr %[ret], 2f\n" - " str %[ret], %[rp1]\n" - " ldr %[ret], %[addr]\n" - " add %[ret], %[ret], %[imm]\n" - " str %[ret], %[addr]\n" - "2:\n" - : [ret] "+&r" (ret), - [rp0] "=m" (ras_page[0]), - [rp1] "=m" (ras_page[1]), - [addr] "+m" (val->count) - : [imm] "r" (i) - ); - - ras_page[0] = 0; - asm volatile ( - "" ::: "memory" - ); - ras_page[1] = 0xffffffff; - - return ret; -} - - -/** Atomic increment. - * - * @param val Variable to be incremented. - * - */ -static inline void atomic_inc(atomic_t *val) -{ - atomic_add(val, 1); -} - - -/** Atomic decrement. - * - * @param val Variable to be decremented. - * - */ -static inline void atomic_dec(atomic_t *val) -{ - atomic_add(val, -1); -} - - -/** Atomic pre-increment. - * - * @param val Variable to be incremented. - * @return Value after incrementation. - * - */ -static inline atomic_count_t atomic_preinc(atomic_t *val) -{ - return atomic_add(val, 1); -} - - -/** Atomic pre-decrement. - * - * @param val Variable to be decremented. - * @return Value after decrementation. - * - */ -static inline atomic_count_t atomic_predec(atomic_t *val) -{ - return atomic_add(val, -1); -} - - -/** Atomic post-increment. - * - * @param val Variable to be incremented. - * @return Value before incrementation. - * - */ -static inline atomic_count_t atomic_postinc(atomic_t *val) -{ - return atomic_add(val, 1) - 1; -} - - -/** Atomic post-decrement. - * - * @param val Variable to be decremented. - * @return Value before decrementation. - * - */ -static inline atomic_count_t atomic_postdec(atomic_t *val) -{ - return atomic_add(val, -1) + 1; -} - - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/barrier.h =================================================================== --- uspace/lib/c/arch/arm32/include/barrier.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/arm32/include/barrier.h Index: uspace/lib/c/arch/arm32/include/config.h =================================================================== --- uspace/lib/c/arch/arm32/include/config.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,45 +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 libcarm32 - * @{ - */ -/** @file - * @brief Configuration constants. - */ - -#ifndef LIBC_arm32_CONFIG_H_ -#define LIBC_arm32_CONFIG_H_ - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/cp15.h =================================================================== --- uspace/lib/c/arch/arm32/include/cp15.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/arm32/include/cp15.h Index: uspace/lib/c/arch/arm32/include/ddi.h =================================================================== --- uspace/lib/c/arch/arm32/include/ddi.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcarm32 - */ - -#ifndef LIBC_arm32_DDI_H_ -#define LIBC_arm32_DDI_H_ - -#include -#include - -static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) -{ - *port = v; -} - -static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) -{ - *port = v; -} - -static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) -{ - *port = v; -} - -static inline uint8_t arch_pio_read_8(const ioport8_t *port) -{ - return *port; -} - -static inline uint16_t arch_pio_read_16(const ioport16_t *port) -{ - return *port; -} - -static inline uint32_t arch_pio_read_32(const ioport32_t *port) -{ - return *port; -} - -#endif Index: uspace/lib/c/arch/arm32/include/elf.h =================================================================== --- uspace/lib/c/arch/arm32/include/elf.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/arm32/include/elf.h Index: uspace/lib/c/arch/arm32/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/arm32/include/elf_linux.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,94 +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 libcarm32 - * @{ - */ -/** @file Definitions needed to write core files in Linux-ELF format. - */ - -#ifndef LIBC_arm32_ELF_LINUX_H_ -#define LBIC_arm32_ELF_LINUX_H_ - -#include -#include - -/** Linux kernel struct pt_regs structure. - * - * We need this to save register state to a core file in Linux format - * (readable by GDB configured for Linux target). - */ -typedef struct { - uint32_t r0; - uint32_t r1; - uint32_t r2; - uint32_t r3; - uint32_t r4; - uint32_t r5; - uint32_t r6; - uint32_t r7; - uint32_t r8; - uint32_t r9; - uint32_t r10; - uint32_t fp; - uint32_t r12; - uint32_t sp; - uint32_t lr; - uint32_t pc; - uint32_t cpsr; - uint32_t old_r0; -} elf_regs_t; - -/** Convert istate_t to elf_regs_t. */ -static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) -{ - elf_regs->r0 = istate->r0; - elf_regs->r1 = istate->r1; - elf_regs->r2 = istate->r2; - elf_regs->r3 = istate->r3; - elf_regs->r4 = istate->r4; - elf_regs->r5 = istate->r5; - elf_regs->r6 = istate->r6; - elf_regs->r7 = istate->r7; - elf_regs->r8 = istate->r8; - elf_regs->r9 = istate->r9; - elf_regs->r10 = istate->r10; - - elf_regs->fp = istate->fp; - elf_regs->r12 = istate->r12; - elf_regs->sp = istate->sp; - elf_regs->lr = istate->lr; - elf_regs->pc = istate->pc; - elf_regs->cpsr = istate->spsr; - elf_regs->old_r0 = 0; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/faddr.h =================================================================== --- uspace/lib/c/arch/arm32/include/faddr.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,50 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * 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 libcarm32 - * @{ - */ -/** @file - * @brief Function address conversion. - */ - -#ifndef LIBC_arm32_FADDR_H_ -#define LIBC_arm32_FADDR_H_ - -#include - -/** Calculate absolute address of function referenced by fptr pointer. - * - * @param f Function pointer. - */ -#define FADDR(f) (f) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/fibril.h =================================================================== --- uspace/lib/c/arch/arm32/include/fibril.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,96 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * 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 libcarm32 - * @{ - */ -/** @file - * @brief Fibrils related declarations. - */ - -#ifndef LIBC_arm32_FIBRIL_H_ -#define LIBC_arm32_FIBRIL_H_ - -#include -#include -#include - -/** Size of a stack item */ -#define STACK_ITEM_SIZE 4 - -/** Stack alignment - see ABI for details */ -#define STACK_ALIGNMENT 8 - -#define SP_DELTA (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) - - -/** Sets data to the context. - * - * @param c Context (#context_t). - * @param _pc Program counter. - * @param stack Stack address. - * @param size Stack size. - * @param ptls Pointer to the TCB. - */ -#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)) + sizeof(tcb_t) + ARM_TP_OFFSET; \ - (c)->fp = 0; \ - } while (0) - -/** Fibril context. - * - * Only registers preserved accross function calls are included. r9 is used - * to store a TLS address. -ffixed-r9 gcc forces gcc not to use this - * register. -mtp=soft forces gcc to use #__aeabi_read_tp to obtain - * TLS address. - */ -typedef struct { - uint32_t sp; - uint32_t pc; - uint32_t r4; - uint32_t r5; - uint32_t r6; - uint32_t r7; - uint32_t r8; - uint32_t tls; /* r9 */ - uint32_t r10; - uint32_t fp; /* r11 */ -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return ctx->fp; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/arm32/include/inttypes.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcarm32 - * @{ - */ - -#ifndef LIBC_arm32_INTTYPES_H_ -#define LIBC_arm32_INTTYPES_H_ - -#define PRIdn PRId32 /**< Format for native_t. */ -#define PRIun PRIu32 /**< Format for sysarg_t. */ -#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ -#define PRIua PRIu32 /**< Format for atomic_count_t. */ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/istate.h =================================================================== --- uspace/lib/c/arch/arm32/include/istate.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/arm32/include/istate.h Index: uspace/lib/c/arch/arm32/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,204 @@ +/* + * Copyright (c) 2007 Michal Kebrt + * 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 libcarm32 + * @{ + */ +/** @file + * @brief Atomic operations. + */ + +#ifndef LIBC_arm32_ATOMIC_H_ +#define LIBC_arm32_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ +#define CAS + +#include +#include +#include + +extern uintptr_t *ras_page; + +static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv) +{ + atomic_count_t ret = 0; + + /* + * The following instructions between labels 1 and 2 constitute a + * Restartable Atomic Seqeunce. Should the sequence be non-atomic, + * the kernel will restart it. + */ + asm volatile ( + "1:\n" + " adr %[ret], 1b\n" + " str %[ret], %[rp0]\n" + " adr %[ret], 2f\n" + " str %[ret], %[rp1]\n" + " ldr %[ret], %[addr]\n" + " cmp %[ret], %[ov]\n" + " streq %[nv], %[addr]\n" + "2:\n" + " moveq %[ret], #1\n" + " movne %[ret], #0\n" + : [ret] "+&r" (ret), + [rp0] "=m" (ras_page[0]), + [rp1] "=m" (ras_page[1]), + [addr] "+m" (val->count) + : [ov] "r" (ov), + [nv] "r" (nv) + : "memory" + ); + + ras_page[0] = 0; + asm volatile ( + "" ::: "memory" + ); + ras_page[1] = 0xffffffff; + + return (bool) ret; +} + +/** Atomic addition. + * + * @param val Where to add. + * @param i Value to be added. + * + * @return Value after addition. + * + */ +static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i) +{ + atomic_count_t ret = 0; + + /* + * The following instructions between labels 1 and 2 constitute a + * Restartable Atomic Seqeunce. Should the sequence be non-atomic, + * the kernel will restart it. + */ + asm volatile ( + "1:\n" + " adr %[ret], 1b\n" + " str %[ret], %[rp0]\n" + " adr %[ret], 2f\n" + " str %[ret], %[rp1]\n" + " ldr %[ret], %[addr]\n" + " add %[ret], %[ret], %[imm]\n" + " str %[ret], %[addr]\n" + "2:\n" + : [ret] "+&r" (ret), + [rp0] "=m" (ras_page[0]), + [rp1] "=m" (ras_page[1]), + [addr] "+m" (val->count) + : [imm] "r" (i) + ); + + ras_page[0] = 0; + asm volatile ( + "" ::: "memory" + ); + ras_page[1] = 0xffffffff; + + return ret; +} + + +/** Atomic increment. + * + * @param val Variable to be incremented. + * + */ +static inline void atomic_inc(atomic_t *val) +{ + atomic_add(val, 1); +} + + +/** Atomic decrement. + * + * @param val Variable to be decremented. + * + */ +static inline void atomic_dec(atomic_t *val) +{ + atomic_add(val, -1); +} + + +/** Atomic pre-increment. + * + * @param val Variable to be incremented. + * @return Value after incrementation. + * + */ +static inline atomic_count_t atomic_preinc(atomic_t *val) +{ + return atomic_add(val, 1); +} + + +/** Atomic pre-decrement. + * + * @param val Variable to be decremented. + * @return Value after decrementation. + * + */ +static inline atomic_count_t atomic_predec(atomic_t *val) +{ + return atomic_add(val, -1); +} + + +/** Atomic post-increment. + * + * @param val Variable to be incremented. + * @return Value before incrementation. + * + */ +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + return atomic_add(val, 1) - 1; +} + + +/** Atomic post-decrement. + * + * @param val Variable to be decremented. + * @return Value before decrementation. + * + */ +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + return atomic_add(val, -1) + 1; +} + + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/arm32/include/arch/barrier.h Index: uspace/lib/c/arch/arm32/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,45 @@ +/* + * 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 libcarm32 + * @{ + */ +/** @file + * @brief Configuration constants. + */ + +#ifndef LIBC_arm32_CONFIG_H_ +#define LIBC_arm32_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/libarch/cp15.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/cp15.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/cp15.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/arm32/include/arch/cp15.h Index: uspace/lib/c/arch/arm32/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcarm32 + */ + +#ifndef LIBC_arm32_DDI_H_ +#define LIBC_arm32_DDI_H_ + +#include +#include + +static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t arch_pio_read_8(const ioport8_t *port) +{ + return *port; +} + +static inline uint16_t arch_pio_read_16(const ioport16_t *port) +{ + return *port; +} + +static inline uint32_t arch_pio_read_32(const ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/arm32/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/arm32/include/arch/elf.h Index: uspace/lib/c/arch/arm32/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,94 @@ +/* + * 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 libcarm32 + * @{ + */ +/** @file Definitions needed to write core files in Linux-ELF format. + */ + +#ifndef LIBC_arm32_ELF_LINUX_H_ +#define LBIC_arm32_ELF_LINUX_H_ + +#include +#include + +/** Linux kernel struct pt_regs structure. + * + * We need this to save register state to a core file in Linux format + * (readable by GDB configured for Linux target). + */ +typedef struct { + uint32_t r0; + uint32_t r1; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + uint32_t fp; + uint32_t r12; + uint32_t sp; + uint32_t lr; + uint32_t pc; + uint32_t cpsr; + uint32_t old_r0; +} elf_regs_t; + +/** Convert istate_t to elf_regs_t. */ +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + elf_regs->r0 = istate->r0; + elf_regs->r1 = istate->r1; + elf_regs->r2 = istate->r2; + elf_regs->r3 = istate->r3; + elf_regs->r4 = istate->r4; + elf_regs->r5 = istate->r5; + elf_regs->r6 = istate->r6; + elf_regs->r7 = istate->r7; + elf_regs->r8 = istate->r8; + elf_regs->r9 = istate->r9; + elf_regs->r10 = istate->r10; + + elf_regs->fp = istate->fp; + elf_regs->r12 = istate->r12; + elf_regs->sp = istate->sp; + elf_regs->lr = istate->lr; + elf_regs->pc = istate->pc; + elf_regs->cpsr = istate->spsr; + elf_regs->old_r0 = 0; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2007 Michal Kebrt + * 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 libcarm32 + * @{ + */ +/** @file + * @brief Function address conversion. + */ + +#ifndef LIBC_arm32_FADDR_H_ +#define LIBC_arm32_FADDR_H_ + +#include + +/** Calculate absolute address of function referenced by fptr pointer. + * + * @param f Function pointer. + */ +#define FADDR(f) (f) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2007 Michal Kebrt + * 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 libcarm32 + * @{ + */ +/** @file + * @brief Fibrils related declarations. + */ + +#ifndef LIBC_arm32_FIBRIL_H_ +#define LIBC_arm32_FIBRIL_H_ + +#include +#include +#include + +/** Size of a stack item */ +#define STACK_ITEM_SIZE 4 + +/** Stack alignment - see ABI for details */ +#define STACK_ALIGNMENT 8 + +#define SP_DELTA (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) + + +/** Sets data to the context. + * + * @param c Context (#context_t). + * @param _pc Program counter. + * @param stack Stack address. + * @param size Stack size. + * @param ptls Pointer to the TCB. + */ +#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)) + sizeof(tcb_t) + ARM_TP_OFFSET; \ + (c)->fp = 0; \ + } while (0) + +/** Fibril context. + * + * Only registers preserved accross function calls are included. r9 is used + * to store a TLS address. -ffixed-r9 gcc forces gcc not to use this + * register. -mtp=soft forces gcc to use #__aeabi_read_tp to obtain + * TLS address. + */ +typedef struct { + uint32_t sp; + uint32_t pc; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t tls; /* r9 */ + uint32_t r10; + uint32_t fp; /* r11 */ +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->fp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcarm32 + * @{ + */ + +#ifndef LIBC_arm32_INTTYPES_H_ +#define LIBC_arm32_INTTYPES_H_ + +#define PRIdn PRId32 /**< Format for native_t. */ +#define PRIun PRIu32 /**< Format for sysarg_t. */ +#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu32 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/arm32/include/arch/istate.h Index: uspace/lib/c/arch/arm32/include/libarch/regutils.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/regutils.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/regutils.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/arm32/include/arch/regutils.h Index: uspace/lib/c/arch/arm32/include/libarch/stackarg.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/stackarg.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/stackarg.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2007 Michal Kebrt + * 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 libcarm32 + * @{ + */ +/** @file + * @brief Empty. + */ + +#ifndef LIBC_arm32_STACKARG_H_ +#define LIBC_arm32_STACKARG_H_ + +#endif + +/** @} + */ + Index: uspace/lib/c/arch/arm32/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2007 Michal Kebrt + * 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 libcarm32 + * @{ + */ +/** @file + * @brief + */ + +#ifndef LIBC_arm32_SYSCALL_H_ +#define LIBC_arm32_SYSCALL_H_ + +#define LIBARCH_SYSCALL_GENERIC + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2007 Pavel Jancik + * Copyright (c) 2007 Michal Kebrt + * 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 libcarm32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_arm32_THREAD_H_ +#define LIBC_arm32_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2007 Pavel Jancik + * Copyright (c) 2007 Michal Kebrt + * 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 libcarm32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_arm32_TLS_H_ +#define LIBC_arm32_TLS_H_ + +#include + +#define CONFIG_TLS_VARIANT_1 + +/** Offsets for accessing thread-local variables are shifted 8 bytes higher. */ +#define ARM_TP_OFFSET (-8) + +/** TCB (Thread Control Block) struct. + * + * TLS starts just after this struct. + */ +typedef struct { + /** Fibril data. */ + void *fibril_data; +} tcb_t; + + +/** Sets TLS address to the r9 register. + * + * @param tcb TCB (TLS starts behind) + */ +static inline void __tcb_set(tcb_t *tcb) +{ + void *tls = (void *) tcb; + tls += sizeof(tcb_t) + ARM_TP_OFFSET; + asm volatile ( + "mov r9, %0" + : + : "r" (tls) + ); +} + + +/** Returns TCB address. + * + * @return TCB address (starts before TLS which address is stored + * in r9 register). + */ +static inline tcb_t *__tcb_get(void) +{ + void *ret; + asm volatile ( + "mov %0, r9" + : "=r"(ret) + ); + return (tcb_t *) (ret - ARM_TP_OFFSET - sizeof(tcb_t)); +} + + +/** Returns TLS address stored. + * + * Implemented in assembly. + * + * @return TLS address stored in r9 register + */ +extern uintptr_t __aeabi_read_tp(void); + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/arm32/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/arm32/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcarm32 + * @{ + */ +/** @file + * @brief Definitions of basic types like #uintptr_t. + */ + +#ifndef LIBC_arm32_TYPES_H_ +#define LIBC_arm32_TYPES_H_ + +#define __32_BITS__ + +#include + +#define SIZE_MIN UINT32_MIN +#define SIZE_MAX UINT32_MAX + +#define SSIZE_MIN INT32_MIN +#define SSIZE_MAX INT32_MAX + +typedef uint32_t sysarg_t; +typedef int32_t native_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef int32_t intptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/regutils.h =================================================================== --- uspace/lib/c/arch/arm32/include/regutils.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/arm32/include/regutils.h Index: uspace/lib/c/arch/arm32/include/stackarg.h =================================================================== --- uspace/lib/c/arch/arm32/include/stackarg.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,43 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * 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 libcarm32 - * @{ - */ -/** @file - * @brief Empty. - */ - -#ifndef LIBC_arm32_STACKARG_H_ -#define LIBC_arm32_STACKARG_H_ - -#endif - -/** @} - */ - Index: uspace/lib/c/arch/arm32/include/syscall.h =================================================================== --- uspace/lib/c/arch/arm32/include/syscall.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * 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 libcarm32 - * @{ - */ -/** @file - * @brief - */ - -#ifndef LIBC_arm32_SYSCALL_H_ -#define LIBC_arm32_SYSCALL_H_ - -#define LIBARCH_SYSCALL_GENERIC - -#include - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/thread.h =================================================================== --- uspace/lib/c/arch/arm32/include/thread.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,42 +1,0 @@ -/* - * Copyright (c) 2007 Pavel Jancik - * Copyright (c) 2007 Michal Kebrt - * 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 libcarm32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_arm32_THREAD_H_ -#define LIBC_arm32_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/tls.h =================================================================== --- uspace/lib/c/arch/arm32/include/tls.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,99 +1,0 @@ -/* - * Copyright (c) 2007 Pavel Jancik - * Copyright (c) 2007 Michal Kebrt - * 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 libcarm32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_arm32_TLS_H_ -#define LIBC_arm32_TLS_H_ - -#include - -#define CONFIG_TLS_VARIANT_1 - -/** Offsets for accessing thread-local variables are shifted 8 bytes higher. */ -#define ARM_TP_OFFSET (-8) - -/** TCB (Thread Control Block) struct. - * - * TLS starts just after this struct. - */ -typedef struct { - /** Fibril data. */ - void *fibril_data; -} tcb_t; - - -/** Sets TLS address to the r9 register. - * - * @param tcb TCB (TLS starts behind) - */ -static inline void __tcb_set(tcb_t *tcb) -{ - void *tls = (void *) tcb; - tls += sizeof(tcb_t) + ARM_TP_OFFSET; - asm volatile ( - "mov r9, %0" - : - : "r" (tls) - ); -} - - -/** Returns TCB address. - * - * @return TCB address (starts before TLS which address is stored - * in r9 register). - */ -static inline tcb_t *__tcb_get(void) -{ - void *ret; - asm volatile ( - "mov %0, r9" - : "=r"(ret) - ); - return (tcb_t *) (ret - ARM_TP_OFFSET - sizeof(tcb_t)); -} - - -/** Returns TLS address stored. - * - * Implemented in assembly. - * - * @return TLS address stored in r9 register - */ -extern uintptr_t __aeabi_read_tp(void); - -#endif - -/** @} - */ Index: uspace/lib/c/arch/arm32/include/types.h =================================================================== --- uspace/lib/c/arch/arm32/include/types.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcarm32 - * @{ - */ -/** @file - * @brief Definitions of basic types like #uintptr_t. - */ - -#ifndef LIBC_arm32_TYPES_H_ -#define LIBC_arm32_TYPES_H_ - -#define __32_BITS__ - -#include - -#define SIZE_MIN UINT32_MIN -#define SIZE_MAX UINT32_MAX - -#define SSIZE_MIN INT32_MIN -#define SSIZE_MAX INT32_MAX - -typedef uint32_t sysarg_t; -typedef int32_t native_t; - -typedef int32_t ssize_t; -typedef uint32_t size_t; - -typedef uint32_t uintptr_t; -typedef int32_t intptr_t; -typedef uint32_t atomic_count_t; -typedef int32_t atomic_signed_t; - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/atomic.h =================================================================== --- uspace/lib/c/arch/ia32/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,120 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_ATOMIC_H_ -#define LIBC_ia32_ATOMIC_H_ - -#define LIBC_ARCH_ATOMIC_H_ - -#include - -static inline void atomic_inc(atomic_t *val) -{ -#ifdef __PCC__ - asm volatile ( - "lock incl %0\n" - : "+m" (val->count) - ); -#else - asm volatile ( - "lock incl %[count]\n" - : [count] "+m" (val->count) - ); -#endif -} - -static inline void atomic_dec(atomic_t *val) -{ -#ifdef __PCC__ - asm volatile ( - "lock decl %0\n" - : "+m" (val->count) - ); -#else - asm volatile ( - "lock decl %[count]\n" - : [count] "+m" (val->count) - ); -#endif -} - -static inline atomic_count_t atomic_postinc(atomic_t *val) -{ - atomic_count_t r = 1; - -#ifdef __PCC__ - asm volatile ( - "lock xaddl %1, %0\n" - : "+m" (val->count), - "+r" (r) - ); -#else - asm volatile ( - "lock xaddl %[r], %[count]\n" - : [count] "+m" (val->count), - [r] "+r" (r) - ); -#endif - - return r; -} - -static inline atomic_count_t atomic_postdec(atomic_t *val) -{ - atomic_count_t r = -1; - -#ifdef __PCC__ - asm volatile ( - "lock xaddl %1, %0\n" - : "+m" (val->count), - "+r" (r) - ); -#else - asm volatile ( - "lock xaddl %[r], %[count]\n" - : [count] "+m" (val->count), - [r] "+r" (r) - ); -#endif - - return r; -} - -#define atomic_preinc(val) (atomic_postinc(val) + 1) -#define atomic_predec(val) (atomic_postdec(val) - 1) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/barrier.h =================================================================== --- uspace/lib/c/arch/ia32/include/barrier.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia32/include/barrier.h Index: uspace/lib/c/arch/ia32/include/config.h =================================================================== --- uspace/lib/c/arch/ia32/include/config.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_CONFIG_H_ -#define LIBC_ia32_CONFIG_H_ - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#define USER_ADDRESS_SPACE_START_ARCH UINT32_C(0x00000000) -#define USER_ADDRESS_SPACE_END_ARCH UINT32_C(0x7fffffff) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/context_offset.h =================================================================== --- uspace/lib/c/arch/ia32/include/context_offset.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia32/include/context_offset.h Index: uspace/lib/c/arch/ia32/include/ddi.h =================================================================== --- uspace/lib/c/arch/ia32/include/ddi.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,122 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @file - * @ingroup libcia32, libcamd64 - */ - -#ifndef LIBC_ia32_DDI_H_ -#define LIBC_ia32_DDI_H_ - -#include -#include - -#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) - -static inline uint8_t arch_pio_read_8(const ioport8_t *port) -{ - if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { - uint8_t val; - - asm volatile ( - "inb %w[port], %b[val]\n" - : [val] "=a" (val) - : [port] "d" (port) - ); - - return val; - } else - return (uint8_t) *port; -} - -static inline uint16_t arch_pio_read_16(const ioport16_t *port) -{ - if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { - uint16_t val; - - asm volatile ( - "inw %w[port], %w[val]\n" - : [val] "=a" (val) - : [port] "d" (port) - ); - - return val; - } else - return (uint16_t) *port; -} - -static inline uint32_t arch_pio_read_32(const ioport32_t *port) -{ - if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { - uint32_t val; - - asm volatile ( - "inl %w[port], %[val]\n" - : [val] "=a" (val) - : [port] "d" (port) - ); - - return val; - } else - return (uint32_t) *port; -} - -static inline void arch_pio_write_8(ioport8_t *port, uint8_t val) -{ - if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { - asm volatile ( - "outb %b[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) - ); - } else - *port = val; -} - -static inline void arch_pio_write_16(ioport16_t *port, uint16_t val) -{ - if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { - asm volatile ( - "outw %w[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) - ); - } else - *port = val; -} - -static inline void arch_pio_write_32(ioport32_t *port, uint32_t val) -{ - if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { - asm volatile ( - "outl %[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) - ); - } else - *port = val; -} - -#endif Index: uspace/lib/c/arch/ia32/include/elf.h =================================================================== --- uspace/lib/c/arch/ia32/include/elf.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia32/include/elf.h Index: uspace/lib/c/arch/ia32/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/ia32/include/elf_linux.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,93 +1,0 @@ -/* - * Copyright (c) 2011 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia32 - * @{ - */ -/** @file Definitions needed to write core files in Linux-ELF format. - */ - -#ifndef LIBC_ia32_ELF_LINUX_H_ -#define LBIC_ia32_ELF_LINUX_H_ - -#include -#include - -/** Linux kernel struct pt_regs structure. - * - * We need this to save register state to a core file in Linux format - * (readable by GDB configured for Linux target). - */ -typedef struct { - uint32_t ebx; - uint32_t ecx; - uint32_t edx; - uint32_t esi; - uint32_t edi; - uint32_t ebp; - uint32_t eax; - uint32_t ds; - uint32_t es; - uint32_t fs; - uint32_t gs; - uint32_t old_eax; - uint32_t eip; - uint32_t cs; - uint32_t eflags; - uint32_t esp; - uint32_t ss; -} elf_regs_t; - -/** Convert istate_t to elf_regs_t. */ -static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) -{ - elf_regs->ebx = istate->ebx; - elf_regs->ecx = istate->ecx; - elf_regs->edx = istate->edx; - elf_regs->esi = istate->esi; - elf_regs->edi = istate->edi; - elf_regs->ebp = istate->ebp; - elf_regs->eax = istate->eax; - - elf_regs->ds = istate->ds; - elf_regs->es = istate->es; - elf_regs->fs = istate->fs; - elf_regs->gs = istate->gs; - - elf_regs->old_eax = 0; - elf_regs->eip = istate->eip; - elf_regs->cs = istate->cs; - elf_regs->eflags = istate->eflags; - elf_regs->esp = istate->esp; - elf_regs->ss = istate->ss; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/faddr.h =================================================================== --- uspace/lib/c/arch/ia32/include/faddr.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2005 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_FADDR_H_ -#define LIBC_ia32_FADDR_H_ - -#include - -#define FADDR(fptr) ((uintptr_t) (fptr)) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/fibril.h =================================================================== --- uspace/lib/c/arch/ia32/include/fibril.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,79 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_FIBRIL_H_ -#define LIBC_ia32_FIBRIL_H_ - -#include - -/* - * According to ABI the stack MUST be aligned on - * 16-byte boundary. If it is not, the va_arg calling will - * panic sooner or later - */ -#define SP_DELTA 12 - -#define context_set(c, _pc, stack, size, ptls) \ - do { \ - (c)->pc = (sysarg_t) (_pc); \ - (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ - (c)->tls = (sysarg_t) (ptls); \ - (c)->ebp = 0; \ - } while (0) - -/* - * We include only registers that must be preserved - * during function call - */ -typedef struct { - uint32_t sp; - uint32_t pc; - - uint32_t ebx; - uint32_t esi; - uint32_t edi; - uint32_t ebp; - - uint32_t tls; -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return ctx->ebp; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ia32/include/inttypes.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2010 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia32 - * @{ - */ - -#ifndef LIBC_ia32_INTTYPES_H_ -#define LIBC_ia32_INTTYPES_H_ - -#define PRIdn PRId32 /**< Format for native_t. */ -#define PRIun PRIu32 /**< Format for sysarg_t. */ -#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ -#define PRIua PRIu32 /**< Format for atomic_count_t. */ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/istate.h =================================================================== --- uspace/lib/c/arch/ia32/include/istate.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia32/include/istate.h Index: uspace/lib/c/arch/ia32/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2001-2004 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_ATOMIC_H_ +#define LIBC_ia32_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ + +#include + +static inline void atomic_inc(atomic_t *val) +{ +#ifdef __PCC__ + asm volatile ( + "lock incl %0\n" + : "+m" (val->count) + ); +#else + asm volatile ( + "lock incl %[count]\n" + : [count] "+m" (val->count) + ); +#endif +} + +static inline void atomic_dec(atomic_t *val) +{ +#ifdef __PCC__ + asm volatile ( + "lock decl %0\n" + : "+m" (val->count) + ); +#else + asm volatile ( + "lock decl %[count]\n" + : [count] "+m" (val->count) + ); +#endif +} + +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + atomic_count_t r = 1; + +#ifdef __PCC__ + asm volatile ( + "lock xaddl %1, %0\n" + : "+m" (val->count), + "+r" (r) + ); +#else + asm volatile ( + "lock xaddl %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); +#endif + + return r; +} + +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + atomic_count_t r = -1; + +#ifdef __PCC__ + asm volatile ( + "lock xaddl %1, %0\n" + : "+m" (val->count), + "+r" (r) + ); +#else + asm volatile ( + "lock xaddl %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); +#endif + + return r; +} + +#define atomic_preinc(val) (atomic_postinc(val) + 1) +#define atomic_predec(val) (atomic_postdec(val) - 1) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia32/include/arch/barrier.h Index: uspace/lib/c/arch/ia32/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_CONFIG_H_ +#define LIBC_ia32_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define USER_ADDRESS_SPACE_START_ARCH UINT32_C(0x00000000) +#define USER_ADDRESS_SPACE_END_ARCH UINT32_C(0x7fffffff) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia32/include/arch/context_offset.h Index: uspace/lib/c/arch/ia32/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @file + * @ingroup libcia32, libcamd64 + */ + +#ifndef LIBC_ia32_DDI_H_ +#define LIBC_ia32_DDI_H_ + +#include +#include + +#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) + +static inline uint8_t arch_pio_read_8(const ioport8_t *port) +{ + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + uint8_t val; + + asm volatile ( + "inb %w[port], %b[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + + return val; + } else + return (uint8_t) *port; +} + +static inline uint16_t arch_pio_read_16(const ioport16_t *port) +{ + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + uint16_t val; + + asm volatile ( + "inw %w[port], %w[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + + return val; + } else + return (uint16_t) *port; +} + +static inline uint32_t arch_pio_read_32(const ioport32_t *port) +{ + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { + uint32_t val; + + asm volatile ( + "inl %w[port], %[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + + return val; + } else + return (uint32_t) *port; +} + +static inline void arch_pio_write_8(ioport8_t *port, uint8_t val) +{ + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + asm volatile ( + "outb %b[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); + } else + *port = val; +} + +static inline void arch_pio_write_16(ioport16_t *port, uint16_t val) +{ + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + asm volatile ( + "outw %w[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); + } else + *port = val; +} + +static inline void arch_pio_write_32(ioport32_t *port, uint32_t val) +{ + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { + asm volatile ( + "outl %[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); + } else + *port = val; +} + +#endif Index: uspace/lib/c/arch/ia32/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia32/include/arch/elf.h Index: uspace/lib/c/arch/ia32/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file Definitions needed to write core files in Linux-ELF format. + */ + +#ifndef LIBC_ia32_ELF_LINUX_H_ +#define LBIC_ia32_ELF_LINUX_H_ + +#include +#include + +/** Linux kernel struct pt_regs structure. + * + * We need this to save register state to a core file in Linux format + * (readable by GDB configured for Linux target). + */ +typedef struct { + uint32_t ebx; + uint32_t ecx; + uint32_t edx; + uint32_t esi; + uint32_t edi; + uint32_t ebp; + uint32_t eax; + uint32_t ds; + uint32_t es; + uint32_t fs; + uint32_t gs; + uint32_t old_eax; + uint32_t eip; + uint32_t cs; + uint32_t eflags; + uint32_t esp; + uint32_t ss; +} elf_regs_t; + +/** Convert istate_t to elf_regs_t. */ +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + elf_regs->ebx = istate->ebx; + elf_regs->ecx = istate->ecx; + elf_regs->edx = istate->edx; + elf_regs->esi = istate->esi; + elf_regs->edi = istate->edi; + elf_regs->ebp = istate->ebp; + elf_regs->eax = istate->eax; + + elf_regs->ds = istate->ds; + elf_regs->es = istate->es; + elf_regs->fs = istate->fs; + elf_regs->gs = istate->gs; + + elf_regs->old_eax = 0; + elf_regs->eip = istate->eip; + elf_regs->cs = istate->cs; + elf_regs->eflags = istate->eflags; + elf_regs->esp = istate->esp; + elf_regs->ss = istate->ss; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_FADDR_H_ +#define LIBC_ia32_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_FIBRIL_H_ +#define LIBC_ia32_FIBRIL_H_ + +#include + +/* + * According to ABI the stack MUST be aligned on + * 16-byte boundary. If it is not, the va_arg calling will + * panic sooner or later + */ +#define SP_DELTA 12 + +#define context_set(c, _pc, stack, size, ptls) \ + do { \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = (sysarg_t) (ptls); \ + (c)->ebp = 0; \ + } while (0) + +/* + * We include only registers that must be preserved + * during function call + */ +typedef struct { + uint32_t sp; + uint32_t pc; + + uint32_t ebx; + uint32_t esi; + uint32_t edi; + uint32_t ebp; + + uint32_t tls; +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->ebp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ + +#ifndef LIBC_ia32_INTTYPES_H_ +#define LIBC_ia32_INTTYPES_H_ + +#define PRIdn PRId32 /**< Format for native_t. */ +#define PRIun PRIu32 /**< Format for sysarg_t. */ +#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu32 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia32/include/arch/istate.h Index: uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup generic + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_RTLD_DYNAMIC_H_ +#define LIBC_ia32_RTLD_DYNAMIC_H_ + +#include + +typedef struct { + /* Empty. */ +} dyn_info_arch_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/rtld/elf_dyn.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/rtld/elf_dyn.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/rtld/elf_dyn.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2008 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup generic + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_RTLD_ELF_DYN_H_ +#define LIBC_ia32_RTLD_ELF_DYN_H_ + +/* + * ia32 dynamic relocation types + */ + +#define R_386_32 1 +#define R_386_PC32 2 +#define R_386_COPY 5 +#define R_386_GLOB_DAT 6 +#define R_386_JUMP_SLOT 7 +#define R_386_RELATIVE 8 + +#define R_386_TLS_DTPMOD32 35 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** + * @file + */ + +#ifndef LIBC_ia32_SYSCALL_H_ +#define LIBC_ia32_SYSCALL_H_ + +#include +#include + +#define __syscall0 __syscall_fast_func +#define __syscall1 __syscall_fast_func +#define __syscall2 __syscall_fast_func +#define __syscall3 __syscall_fast_func +#define __syscall4 __syscall_fast_func +#define __syscall5 __syscall_slow +#define __syscall6 __syscall_slow + +extern sysarg_t (* __syscall_fast_func)(const sysarg_t, const sysarg_t, + const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t, + const syscall_t); + +extern sysarg_t __syscall_slow(const sysarg_t, const sysarg_t, const sysarg_t, + const sysarg_t, const sysarg_t, const sysarg_t, const syscall_t); + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_THREAD_H_ +#define LIBC_ia32_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_TLS_H_ +#define LIBC_ia32_TLS_H_ + +#define CONFIG_TLS_VARIANT_2 + +#include + +typedef struct { + void *self; + void *fibril_data; +} tcb_t; + +static inline void __tcb_set(tcb_t *tcb) +{ + __SYSCALL1(SYS_TLS_SET, (sysarg_t) tcb); +} + +static inline tcb_t * __tcb_get(void) +{ + void *retval; + + asm ( + "movl %%gs:0, %0" + : "=r" (retval) + ); + + return retval; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/ia32/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia32/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_TYPES_H_ +#define LIBC_ia32_TYPES_H_ + +#define __32_BITS__ + +#include + +#define SIZE_MIN UINT32_MIN +#define SIZE_MAX UINT32_MAX + +#define SSIZE_MIN INT32_MIN +#define SSIZE_MAX INT32_MAX + +typedef uint32_t sysarg_t; +typedef int32_t native_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef int32_t intptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/rtld/dynamic.h =================================================================== --- uspace/lib/c/arch/ia32/include/rtld/dynamic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2008 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup generic - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_RTLD_DYNAMIC_H_ -#define LIBC_ia32_RTLD_DYNAMIC_H_ - -#include - -typedef struct { - /* Empty. */ -} dyn_info_arch_t; - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h =================================================================== --- uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,54 +1,0 @@ -/* - * Copyright (c) 2008 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup generic - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_RTLD_ELF_DYN_H_ -#define LIBC_ia32_RTLD_ELF_DYN_H_ - -/* - * ia32 dynamic relocation types - */ - -#define R_386_32 1 -#define R_386_PC32 2 -#define R_386_COPY 5 -#define R_386_GLOB_DAT 6 -#define R_386_JUMP_SLOT 7 -#define R_386_RELATIVE 8 - -#define R_386_TLS_DTPMOD32 35 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/syscall.h =================================================================== --- uspace/lib/c/arch/ia32/include/syscall.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,60 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** - * @file - */ - -#ifndef LIBC_ia32_SYSCALL_H_ -#define LIBC_ia32_SYSCALL_H_ - -#include -#include - -#define __syscall0 __syscall_fast_func -#define __syscall1 __syscall_fast_func -#define __syscall2 __syscall_fast_func -#define __syscall3 __syscall_fast_func -#define __syscall4 __syscall_fast_func -#define __syscall5 __syscall_slow -#define __syscall6 __syscall_slow - -extern sysarg_t (* __syscall_fast_func)(const sysarg_t, const sysarg_t, - const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t, - const syscall_t); - -extern sysarg_t __syscall_slow(const sysarg_t, const sysarg_t, const sysarg_t, - const sysarg_t, const sysarg_t, const sysarg_t, const syscall_t); - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/thread.h =================================================================== --- uspace/lib/c/arch/ia32/include/thread.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,41 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_THREAD_H_ -#define LIBC_ia32_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/tls.h =================================================================== --- uspace/lib/c/arch/ia32/include/tls.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,67 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_TLS_H_ -#define LIBC_ia32_TLS_H_ - -#define CONFIG_TLS_VARIANT_2 - -#include - -typedef struct { - void *self; - void *fibril_data; -} tcb_t; - -static inline void __tcb_set(tcb_t *tcb) -{ - __SYSCALL1(SYS_TLS_SET, (sysarg_t) tcb); -} - -static inline tcb_t * __tcb_get(void) -{ - void *retval; - - asm ( - "movl %%gs:0, %0" - : "=r" (retval) - ); - - return retval; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia32/include/types.h =================================================================== --- uspace/lib/c/arch/ia32/include/types.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,62 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia32_TYPES_H_ -#define LIBC_ia32_TYPES_H_ - -#define __32_BITS__ - -#include - -#define SIZE_MIN UINT32_MIN -#define SIZE_MAX UINT32_MAX - -#define SSIZE_MIN INT32_MIN -#define SSIZE_MAX INT32_MAX - -typedef uint32_t sysarg_t; -typedef int32_t native_t; - -typedef int32_t ssize_t; -typedef uint32_t size_t; - -typedef uint32_t uintptr_t; -typedef int32_t intptr_t; -typedef uint32_t atomic_count_t; -typedef int32_t atomic_signed_t; - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/atomic.h =================================================================== --- uspace/lib/c/arch/ia64/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,119 +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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_ATOMIC_H_ -#define LIBC_ia64_ATOMIC_H_ - -#define LIBC_ARCH_ATOMIC_H_ - -#include - -static inline void atomic_inc(atomic_t *val) -{ - atomic_count_t v; - - asm volatile ( - "fetchadd8.rel %[v] = %[count], 1\n" - : [v] "=r" (v), - [count] "+m" (val->count) - ); -} - -static inline void atomic_dec(atomic_t *val) -{ - atomic_count_t v; - - asm volatile ( - "fetchadd8.rel %[v] = %[count], -1\n" - : [v] "=r" (v), - [count] "+m" (val->count) - ); -} - -static inline atomic_count_t atomic_preinc(atomic_t *val) -{ - atomic_count_t v; - - asm volatile ( - "fetchadd8.rel %[v] = %[count], 1\n" - : [v] "=r" (v), - [count] "+m" (val->count) - ); - - return (v + 1); -} - -static inline atomic_count_t atomic_predec(atomic_t *val) -{ - atomic_count_t v; - - asm volatile ( - "fetchadd8.rel %[v] = %[count], -1\n" - : [v] "=r" (v), - [count] "+m" (val->count) - ); - - return (v - 1); -} - -static inline atomic_count_t atomic_postinc(atomic_t *val) -{ - atomic_count_t v; - - asm volatile ( - "fetchadd8.rel %[v] = %[count], 1\n" - : [v] "=r" (v), - [count] "+m" (val->count) - ); - - return v; -} - -static inline atomic_count_t atomic_postdec(atomic_t *val) -{ - atomic_count_t v; - - asm volatile ( - "fetchadd8.rel %[v] = %[count], -1\n" - : [v] "=r" (v), - [count] "+m" (val->count) - ); - - return v; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/barrier.h =================================================================== --- uspace/lib/c/arch/ia64/include/barrier.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia64/include/barrier.h Index: uspace/lib/c/arch/ia64/include/config.h =================================================================== --- uspace/lib/c/arch/ia64/include/config.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_CONFIG_H_ -#define LIBC_ia64_CONFIG_H_ - -#define PAGE_WIDTH 14 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/ddi.h =================================================================== --- uspace/lib/c/arch/ia64/include/ddi.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,160 +1,0 @@ -/* - * Copyright (c) 2005 Jakub Vana - * 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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_DDI_H_ -#define LIBC_ia64_DDI_H_ - -#include -#include - -#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) - -uint64_t get_ia64_iospace_address(void); - -extern uint64_t ia64_iospace_address; - -#define IA64_IOSPACE_ADDRESS \ - (ia64_iospace_address ? \ - ia64_iospace_address : \ - (ia64_iospace_address = get_ia64_iospace_address())) - -static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) -{ - if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { - uintptr_t prt = (uintptr_t) port; - - *((ioport8_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; - } else { - *port = v; - } - - asm volatile ("mf\n" ::: "memory"); - asm volatile ("mf.a\n" ::: "memory"); -} - -static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) -{ - if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { - uintptr_t prt = (uintptr_t) port; - - *((ioport16_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; - } else { - *port = v; - } - - asm volatile ("mf\n" ::: "memory"); - asm volatile ("mf.a\n" ::: "memory"); -} - -static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) -{ - if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { - uintptr_t prt = (uintptr_t) port; - - *((ioport32_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; - } else { - *port = v; - } - - asm volatile ("mf\n" ::: "memory"); - asm volatile ("mf.a\n" ::: "memory"); -} - -static inline uint8_t arch_pio_read_8(const ioport8_t *port) -{ - uint8_t v; - - asm volatile ("mf\n" ::: "memory"); - - if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { - uintptr_t prt = (uintptr_t) port; - - v = *((ioport8_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))); - } else { - v = *port; - } - - asm volatile ("mf.a\n" ::: "memory"); - - return v; -} - -static inline uint16_t arch_pio_read_16(const ioport16_t *port) -{ - uint16_t v; - - asm volatile ("mf\n" ::: "memory"); - - if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { - uintptr_t prt = (uintptr_t) port; - - v = *((ioport16_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))); - } else { - v = *port; - } - - asm volatile ("mf.a\n" ::: "memory"); - - return v; -} - -static inline uint32_t arch_pio_read_32(const ioport32_t *port) -{ - uint32_t v; - - asm volatile ("mf\n" ::: "memory"); - - if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { - uintptr_t prt = (uintptr_t) port; - - v = *((ioport32_t *)(IA64_IOSPACE_ADDRESS + - ((prt & 0xfff) | ((prt >> 2) << 12)))); - } else { - v = *port; - } - - asm volatile ("mf.a\n" ::: "memory"); - - return v; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/elf.h =================================================================== --- uspace/lib/c/arch/ia64/include/elf.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia64/include/elf.h Index: uspace/lib/c/arch/ia64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/ia64/include/elf_linux.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_ELF_LINUX_H_ -#define LBIC_ia64_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/ia64/include/faddr.h =================================================================== --- uspace/lib/c/arch/ia64/include/faddr.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,53 +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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_FADDR_H_ -#define LIBC_ia64_FADDR_H_ - -#include - -/** - * - * Calculate absolute address of function - * referenced by fptr pointer. - * - * @param fptr Function pointer. - * - */ -#define FADDR(fptr) (((fncptr_t *) (fptr))->fnc) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/fibril.h =================================================================== --- uspace/lib/c/arch/ia64/include/fibril.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,141 +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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_FIBRIL_H_ -#define LIBC_ia64_FIBRIL_H_ - -#include -#include -#include -#include - -/* - * context_save() and context_restore() are both leaf procedures. - * No need to allocate scratch area. - */ -#define SP_DELTA (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) - -#define PFM_MASK (~0x3fffffffff) - -/* Stack is divided into two equal parts (for memory stack and register stack). */ -#define FIBRIL_INITIAL_STACK_DIVISION 2 - -#define context_set(c, _pc, stack, size, tls) \ - do { \ - (c)->pc = (uint64_t) _pc; \ - (c)->bsp = ((uint64_t) stack) + \ - size / FIBRIL_INITIAL_STACK_DIVISION; \ - (c)->ar_pfs &= PFM_MASK; \ - (c)->sp = ((uint64_t) stack) + \ - ALIGN_UP((size / FIBRIL_INITIAL_STACK_DIVISION), STACK_ALIGNMENT) - \ - SP_DELTA; \ - (c)->tp = (uint64_t) tls; \ - } while (0) - -/* - * Only save registers that must be preserved across - * function calls. - */ -typedef struct context { - - /* - * Application registers - */ - uint64_t ar_pfs; - uint64_t ar_unat_caller; - uint64_t ar_unat_callee; - uint64_t ar_rsc; - uint64_t bsp; /* ar_bsp */ - uint64_t ar_rnat; - uint64_t ar_lc; - - /* - * General registers - */ - uint64_t r1; - uint64_t r4; - uint64_t r5; - uint64_t r6; - uint64_t r7; - uint64_t sp; /* r12 */ - uint64_t tp; /* r13 */ - - /* - * Branch registers - */ - uint64_t pc; /* b0 */ - uint64_t b1; - uint64_t b2; - uint64_t b3; - uint64_t b4; - uint64_t b5; - - /* - * Predicate registers - */ - uint64_t pr; - - uint128_t f2 __attribute__ ((aligned(16))); - uint128_t f3; - uint128_t f4; - uint128_t f5; - - uint128_t f16; - uint128_t f17; - uint128_t f18; - uint128_t f19; - uint128_t f20; - uint128_t f21; - uint128_t f22; - uint128_t f23; - uint128_t f24; - uint128_t f25; - uint128_t f26; - uint128_t f27; - uint128_t f28; - uint128_t f29; - uint128_t f30; - uint128_t f31; - -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return 0; /* FIXME */ -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ia64/include/inttypes.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libia64 - * @{ - */ - -#ifndef LIBC_ia64_INTTYPES_H_ -#define LIBC_ia64_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/ia64/include/istate.h =================================================================== --- uspace/lib/c/arch/ia64/include/istate.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia64/include/istate.h Index: uspace/lib/c/arch/ia64/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,119 @@ +/* + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_ATOMIC_H_ +#define LIBC_ia64_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ + +#include + +static inline void atomic_inc(atomic_t *val) +{ + atomic_count_t v; + + asm volatile ( + "fetchadd8.rel %[v] = %[count], 1\n" + : [v] "=r" (v), + [count] "+m" (val->count) + ); +} + +static inline void atomic_dec(atomic_t *val) +{ + atomic_count_t v; + + asm volatile ( + "fetchadd8.rel %[v] = %[count], -1\n" + : [v] "=r" (v), + [count] "+m" (val->count) + ); +} + +static inline atomic_count_t atomic_preinc(atomic_t *val) +{ + atomic_count_t v; + + asm volatile ( + "fetchadd8.rel %[v] = %[count], 1\n" + : [v] "=r" (v), + [count] "+m" (val->count) + ); + + return (v + 1); +} + +static inline atomic_count_t atomic_predec(atomic_t *val) +{ + atomic_count_t v; + + asm volatile ( + "fetchadd8.rel %[v] = %[count], -1\n" + : [v] "=r" (v), + [count] "+m" (val->count) + ); + + return (v - 1); +} + +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + atomic_count_t v; + + asm volatile ( + "fetchadd8.rel %[v] = %[count], 1\n" + : [v] "=r" (v), + [count] "+m" (val->count) + ); + + return v; +} + +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + atomic_count_t v; + + asm volatile ( + "fetchadd8.rel %[v] = %[count], -1\n" + : [v] "=r" (v), + [count] "+m" (val->count) + ); + + return v; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia64/include/arch/barrier.h Index: uspace/lib/c/arch/ia64/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_CONFIG_H_ +#define LIBC_ia64_CONFIG_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,160 @@ +/* + * Copyright (c) 2005 Jakub Vana + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_DDI_H_ +#define LIBC_ia64_DDI_H_ + +#include +#include + +#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) + +uint64_t get_ia64_iospace_address(void); + +extern uint64_t ia64_iospace_address; + +#define IA64_IOSPACE_ADDRESS \ + (ia64_iospace_address ? \ + ia64_iospace_address : \ + (ia64_iospace_address = get_ia64_iospace_address())) + +static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) +{ + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + *((ioport8_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + } else { + *port = v; + } + + asm volatile ("mf\n" ::: "memory"); + asm volatile ("mf.a\n" ::: "memory"); +} + +static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) +{ + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + *((ioport16_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + } else { + *port = v; + } + + asm volatile ("mf\n" ::: "memory"); + asm volatile ("mf.a\n" ::: "memory"); +} + +static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) +{ + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + *((ioport32_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + } else { + *port = v; + } + + asm volatile ("mf\n" ::: "memory"); + asm volatile ("mf.a\n" ::: "memory"); +} + +static inline uint8_t arch_pio_read_8(const ioport8_t *port) +{ + uint8_t v; + + asm volatile ("mf\n" ::: "memory"); + + if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + v = *((ioport8_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); + } else { + v = *port; + } + + asm volatile ("mf.a\n" ::: "memory"); + + return v; +} + +static inline uint16_t arch_pio_read_16(const ioport16_t *port) +{ + uint16_t v; + + asm volatile ("mf\n" ::: "memory"); + + if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + v = *((ioport16_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); + } else { + v = *port; + } + + asm volatile ("mf.a\n" ::: "memory"); + + return v; +} + +static inline uint32_t arch_pio_read_32(const ioport32_t *port) +{ + uint32_t v; + + asm volatile ("mf\n" ::: "memory"); + + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { + uintptr_t prt = (uintptr_t) port; + + v = *((ioport32_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); + } else { + v = *port; + } + + asm volatile ("mf.a\n" ::: "memory"); + + return v; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia64/include/arch/elf.h Index: uspace/lib/c/arch/ia64/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_ELF_LINUX_H_ +#define LBIC_ia64_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/ia64/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,53 @@ +/* + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_FADDR_H_ +#define LIBC_ia64_FADDR_H_ + +#include + +/** + * + * Calculate absolute address of function + * referenced by fptr pointer. + * + * @param fptr Function pointer. + * + */ +#define FADDR(fptr) (((fncptr_t *) (fptr))->fnc) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,141 @@ +/* + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_FIBRIL_H_ +#define LIBC_ia64_FIBRIL_H_ + +#include +#include +#include +#include + +/* + * context_save() and context_restore() are both leaf procedures. + * No need to allocate scratch area. + */ +#define SP_DELTA (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) + +#define PFM_MASK (~0x3fffffffff) + +/* Stack is divided into two equal parts (for memory stack and register stack). */ +#define FIBRIL_INITIAL_STACK_DIVISION 2 + +#define context_set(c, _pc, stack, size, tls) \ + do { \ + (c)->pc = (uint64_t) _pc; \ + (c)->bsp = ((uint64_t) stack) + \ + size / FIBRIL_INITIAL_STACK_DIVISION; \ + (c)->ar_pfs &= PFM_MASK; \ + (c)->sp = ((uint64_t) stack) + \ + ALIGN_UP((size / FIBRIL_INITIAL_STACK_DIVISION), STACK_ALIGNMENT) - \ + SP_DELTA; \ + (c)->tp = (uint64_t) tls; \ + } while (0) + +/* + * Only save registers that must be preserved across + * function calls. + */ +typedef struct context { + + /* + * Application registers + */ + uint64_t ar_pfs; + uint64_t ar_unat_caller; + uint64_t ar_unat_callee; + uint64_t ar_rsc; + uint64_t bsp; /* ar_bsp */ + uint64_t ar_rnat; + uint64_t ar_lc; + + /* + * General registers + */ + uint64_t r1; + uint64_t r4; + uint64_t r5; + uint64_t r6; + uint64_t r7; + uint64_t sp; /* r12 */ + uint64_t tp; /* r13 */ + + /* + * Branch registers + */ + uint64_t pc; /* b0 */ + uint64_t b1; + uint64_t b2; + uint64_t b3; + uint64_t b4; + uint64_t b5; + + /* + * Predicate registers + */ + uint64_t pr; + + uint128_t f2 __attribute__ ((aligned(16))); + uint128_t f3; + uint128_t f4; + uint128_t f5; + + uint128_t f16; + uint128_t f17; + uint128_t f18; + uint128_t f19; + uint128_t f20; + uint128_t f21; + uint128_t f22; + uint128_t f23; + uint128_t f24; + uint128_t f25; + uint128_t f26; + uint128_t f27; + uint128_t f28; + uint128_t f29; + uint128_t f30; + uint128_t f31; + +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return 0; /* FIXME */ +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libia64 + * @{ + */ + +#ifndef LIBC_ia64_INTTYPES_H_ +#define LIBC_ia64_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/ia64/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia64/include/arch/istate.h Index: uspace/lib/c/arch/ia64/include/libarch/register.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/register.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/register.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ia64/include/arch/register.h Index: uspace/lib/c/arch/ia64/include/libarch/stack.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/stack.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/stack.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,46 @@ +/* + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_STACK_H_ +#define LIBC_ia64_STACK_H_ + +#define STACK_ITEM_SIZE 8 +#define STACK_ALIGNMENT 16 +#define STACK_SCRATCH_AREA_SIZE 16 +#define REGISTER_STACK_ALIGNMENT 8 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/libarch/stackarg.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/stackarg.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/stackarg.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,43 @@ +/* + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_STACKARG_H_ +#define LIBC_STACKARG_H_ + +#endif + + + /** @} + */ + Index: uspace/lib/c/arch/ia64/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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_ia64_SYSCALL_H_ +#define LIBC_ia64_SYSCALL_H_ + +#define LIBARCH_SYSCALL_GENERIC + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,41 @@ +/* + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_THREAD_H_ +#define LIBC_ia64_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,65 @@ +/* + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_TLS_H_ +#define LIBC_ia64_TLS_H_ + +#define CONFIG_TLS_VARIANT_1 + +#include + +/* This structure must be exactly 16 bytes long */ +typedef struct { + void *dtv; /* unused in static linking*/ + void *fibril_data; +} tcb_t; + +static inline void __tcb_set(tcb_t *tcb) +{ + asm volatile ("mov r13 = %0\n" : : "r" (tcb) : "r13"); +} + +static inline tcb_t *__tcb_get(void) +{ + void *retval; + + asm volatile ("mov %0 = r13\n" : "=r" (retval)); + + return retval; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/ia64/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ia64/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,77 @@ +/* + * 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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_TYPES_H_ +#define LIBC_ia64_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 struct { + uint64_t lo; + int64_t hi; +} int128_t; + +typedef struct { + uint64_t lo; + uint64_t hi; +} uint128_t; + +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; + +typedef struct { + uintptr_t fnc; + uintptr_t gp; +} __attribute__((may_alias)) fncptr_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/register.h =================================================================== --- uspace/lib/c/arch/ia64/include/register.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ia64/include/register.h Index: uspace/lib/c/arch/ia64/include/stack.h =================================================================== --- uspace/lib/c/arch/ia64/include/stack.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,46 +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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_STACK_H_ -#define LIBC_ia64_STACK_H_ - -#define STACK_ITEM_SIZE 8 -#define STACK_ALIGNMENT 16 -#define STACK_SCRATCH_AREA_SIZE 16 -#define REGISTER_STACK_ALIGNMENT 8 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/stackarg.h =================================================================== --- uspace/lib/c/arch/ia64/include/stackarg.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,43 +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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_STACKARG_H_ -#define LIBC_STACKARG_H_ - -#endif - - - /** @} - */ - Index: uspace/lib/c/arch/ia64/include/syscall.h =================================================================== --- uspace/lib/c/arch/ia64/include/syscall.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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_ia64_SYSCALL_H_ -#define LIBC_ia64_SYSCALL_H_ - -#define LIBARCH_SYSCALL_GENERIC - -#include - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/thread.h =================================================================== --- uspace/lib/c/arch/ia64/include/thread.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,41 +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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_THREAD_H_ -#define LIBC_ia64_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/tls.h =================================================================== --- uspace/lib/c/arch/ia64/include/tls.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,65 +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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_TLS_H_ -#define LIBC_ia64_TLS_H_ - -#define CONFIG_TLS_VARIANT_1 - -#include - -/* This structure must be exactly 16 bytes long */ -typedef struct { - void *dtv; /* unused in static linking*/ - void *fibril_data; -} tcb_t; - -static inline void __tcb_set(tcb_t *tcb) -{ - asm volatile ("mov r13 = %0\n" : : "r" (tcb) : "r13"); -} - -static inline tcb_t *__tcb_get(void) -{ - void *retval; - - asm volatile ("mov %0 = r13\n" : "=r" (retval)); - - return retval; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ia64/include/types.h =================================================================== --- uspace/lib/c/arch/ia64/include/types.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,77 +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 libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ia64_TYPES_H_ -#define LIBC_ia64_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 struct { - uint64_t lo; - int64_t hi; -} int128_t; - -typedef struct { - uint64_t lo; - uint64_t hi; -} uint128_t; - -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; - -typedef struct { - uintptr_t fnc; - uintptr_t gp; -} __attribute__((may_alias)) fncptr_t; - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/include/atomic.h =================================================================== --- uspace/lib/c/arch/mips32/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcmips32 - * @{ - */ -/** @file - * @ingroup libcmips32 - */ - -#ifndef LIBC_mips32_ATOMIC_H_ -#define LIBC_mips32_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" - " ll %0, %1\n" - " addu %0, %0, %3\n" /* same as add, but never traps on overflow */ - " move %2, %0\n" - " sc %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/mips32/include/barrier.h =================================================================== --- uspace/lib/c/arch/mips32/include/barrier.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips32/include/barrier.h Index: uspace/lib/c/arch/mips32/include/config.h =================================================================== --- uspace/lib/c/arch/mips32/include/config.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcmips32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_mips32_CONFIG_H_ -#define LIBC_mips32_CONFIG_H_ - -#define PAGE_WIDTH 14 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/include/context_offset.h =================================================================== --- uspace/lib/c/arch/mips32/include/context_offset.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips32/include/context_offset.h Index: uspace/lib/c/arch/mips32/include/cp0.h =================================================================== --- uspace/lib/c/arch/mips32/include/cp0.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips32/include/cp0.h Index: uspace/lib/c/arch/mips32/include/ddi.h =================================================================== --- uspace/lib/c/arch/mips32/include/ddi.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcmips32 - */ - -#ifndef LIBC_mips32_DDI_H_ -#define LIBC_mips32_DDI_H_ - -#include -#include - -static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) -{ - *port = v; -} - -static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) -{ - *port = v; -} - -static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) -{ - *port = v; -} - -static inline uint8_t arch_pio_read_8(const ioport8_t *port) -{ - return *port; -} - -static inline uint16_t arch_pio_read_16(const ioport16_t *port) -{ - return *port; -} - -static inline uint32_t arch_pio_read_32(const ioport32_t *port) -{ - return *port; -} - -#endif Index: uspace/lib/c/arch/mips32/include/elf.h =================================================================== --- uspace/lib/c/arch/mips32/include/elf.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips32/include/elf.h Index: uspace/lib/c/arch/mips32/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips32/include/elf_linux.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,134 +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 libcmips32 - * @{ - */ -/** @file Definitions needed to write core files in Linux-ELF format. - */ - -#ifndef LIBC_mips32_ELF_LINUX_H_ -#define LBIC_mips32_ELF_LINUX_H_ - -#include -#include - -/** Linux kernel struct pt_regs structure. - * - * We need this to save register state to a core file in Linux format - * (readable by GDB configured for Linux target). - */ -typedef struct { - uint32_t pad0[6]; - - uint32_t r0; - uint32_t r1; - uint32_t r2; - uint32_t r3; - uint32_t r4; - uint32_t r5; - uint32_t r6; - uint32_t r7; - uint32_t r8; - uint32_t r9; - uint32_t r10; - uint32_t r11; - uint32_t r12; - uint32_t r13; - uint32_t r14; - uint32_t r15; - uint32_t r16; - uint32_t r17; - uint32_t r18; - uint32_t r19; - uint32_t r20; - uint32_t r21; - uint32_t r22; - uint32_t r23; - uint32_t r24; - uint32_t r25; - uint32_t r26; - uint32_t r27; - uint32_t r28; - uint32_t r29; - uint32_t r30; - uint32_t r31; - - uint32_t cp0_status; - uint32_t hi; - uint32_t lo; - uint32_t cp0_badvaddr; - uint32_t cp0_cause; - uint32_t cp0_epc; -} elf_regs_t; - -/** Convert istate_t to elf_regs_t. */ -static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) -{ - elf_regs->r1 = istate->at; - elf_regs->r2 = istate->v0; - elf_regs->r3 = istate->v1; - elf_regs->r4 = istate->a0; - elf_regs->r5 = istate->a1; - elf_regs->r6 = istate->a2; - elf_regs->r7 = istate->a3; - elf_regs->r8 = istate->t0; - elf_regs->r9 = istate->t1; - elf_regs->r10 = istate->t2; - elf_regs->r11 = istate->t3; - elf_regs->r12 = istate->t4; - elf_regs->r13 = istate->t5; - elf_regs->r14 = istate->t6; - elf_regs->r15 = istate->t7; - elf_regs->r16 = istate->s0; - elf_regs->r17 = istate->s1; - elf_regs->r18 = istate->s2; - elf_regs->r19 = istate->s3; - elf_regs->r20 = istate->s4; - elf_regs->r21 = istate->s5; - elf_regs->r22 = istate->s6; - elf_regs->r23 = istate->s7; - elf_regs->r24 = istate->t8; - elf_regs->r25 = istate->t9; - elf_regs->r26 = istate->kt0; - elf_regs->r27 = istate->kt1; - elf_regs->r28 = istate->gp; - elf_regs->r29 = istate->sp; - elf_regs->r30 = istate->s8; - elf_regs->r31 = istate->ra; - - elf_regs->cp0_status = istate->status; - elf_regs->hi = istate->hi; - elf_regs->lo = istate->lo; - elf_regs->cp0_epc = istate->epc; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/include/faddr.h =================================================================== --- uspace/lib/c/arch/mips32/include/faddr.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcmips32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_mips32_FADDR_H_ -#define LIBC_mips32_FADDR_H_ - -#include - -#define FADDR(fptr) ((uintptr_t) (fptr)) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/include/fibril.h =================================================================== --- uspace/lib/c/arch/mips32/include/fibril.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,96 +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 libcmips32 - * @{ - */ -/** @file - * @ingroup libcmips32 - */ - -#ifndef LIBC_mips32_FIBRIL_H_ -#define LIBC_mips32_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 { - uint32_t sp; - uint32_t pc; - - uint32_t s0; - uint32_t s1; - uint32_t s2; - uint32_t s3; - uint32_t s4; - uint32_t s5; - uint32_t s6; - uint32_t s7; - uint32_t s8; - uint32_t gp; - uint32_t tls; /* Thread local storage(=k1) */ - - uint32_t f20; - uint32_t f21; - uint32_t f22; - uint32_t f23; - uint32_t f24; - uint32_t f25; - uint32_t f26; - uint32_t f27; - uint32_t f28; - uint32_t f29; - uint32_t f30; - -} context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return ctx->sp; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/mips32/include/inttypes.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcmips32 - * @{ - */ - -#ifndef LIBC_mips32_INTTYPES_H_ -#define LIBC_mips32_INTTYPES_H_ - -#define PRIdn PRId32 /**< Format for native_t. */ -#define PRIun PRIu32 /**< Format for sysarg_t. */ -#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ -#define PRIua PRIu32 /**< Format for atomic_count_t. */ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/include/istate.h =================================================================== --- uspace/lib/c/arch/mips32/include/istate.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips32/include/istate.h Index: uspace/lib/c/arch/mips32/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcmips32 + * @{ + */ +/** @file + * @ingroup libcmips32 + */ + +#ifndef LIBC_mips32_ATOMIC_H_ +#define LIBC_mips32_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" + " ll %0, %1\n" + " addu %0, %0, %3\n" /* same as add, but never traps on overflow */ + " move %2, %0\n" + " sc %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/mips32/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips32/include/arch/barrier.h Index: uspace/lib/c/arch/mips32/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcmips32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips32_CONFIG_H_ +#define LIBC_mips32_CONFIG_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips32/include/arch/context_offset.h Index: uspace/lib/c/arch/mips32/include/libarch/cp0.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/cp0.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/cp0.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips32/include/arch/cp0.h Index: uspace/lib/c/arch/mips32/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcmips32 + */ + +#ifndef LIBC_mips32_DDI_H_ +#define LIBC_mips32_DDI_H_ + +#include +#include + +static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t arch_pio_read_8(const ioport8_t *port) +{ + return *port; +} + +static inline uint16_t arch_pio_read_16(const ioport16_t *port) +{ + return *port; +} + +static inline uint32_t arch_pio_read_32(const ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/mips32/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips32/include/arch/elf.h Index: uspace/lib/c/arch/mips32/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,134 @@ +/* + * 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 libcmips32 + * @{ + */ +/** @file Definitions needed to write core files in Linux-ELF format. + */ + +#ifndef LIBC_mips32_ELF_LINUX_H_ +#define LBIC_mips32_ELF_LINUX_H_ + +#include +#include + +/** Linux kernel struct pt_regs structure. + * + * We need this to save register state to a core file in Linux format + * (readable by GDB configured for Linux target). + */ +typedef struct { + uint32_t pad0[6]; + + uint32_t r0; + uint32_t r1; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + uint32_t r11; + uint32_t r12; + uint32_t r13; + uint32_t r14; + uint32_t r15; + uint32_t r16; + uint32_t r17; + uint32_t r18; + uint32_t r19; + uint32_t r20; + uint32_t r21; + uint32_t r22; + uint32_t r23; + uint32_t r24; + uint32_t r25; + uint32_t r26; + uint32_t r27; + uint32_t r28; + uint32_t r29; + uint32_t r30; + uint32_t r31; + + uint32_t cp0_status; + uint32_t hi; + uint32_t lo; + uint32_t cp0_badvaddr; + uint32_t cp0_cause; + uint32_t cp0_epc; +} elf_regs_t; + +/** Convert istate_t to elf_regs_t. */ +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + elf_regs->r1 = istate->at; + elf_regs->r2 = istate->v0; + elf_regs->r3 = istate->v1; + elf_regs->r4 = istate->a0; + elf_regs->r5 = istate->a1; + elf_regs->r6 = istate->a2; + elf_regs->r7 = istate->a3; + elf_regs->r8 = istate->t0; + elf_regs->r9 = istate->t1; + elf_regs->r10 = istate->t2; + elf_regs->r11 = istate->t3; + elf_regs->r12 = istate->t4; + elf_regs->r13 = istate->t5; + elf_regs->r14 = istate->t6; + elf_regs->r15 = istate->t7; + elf_regs->r16 = istate->s0; + elf_regs->r17 = istate->s1; + elf_regs->r18 = istate->s2; + elf_regs->r19 = istate->s3; + elf_regs->r20 = istate->s4; + elf_regs->r21 = istate->s5; + elf_regs->r22 = istate->s6; + elf_regs->r23 = istate->s7; + elf_regs->r24 = istate->t8; + elf_regs->r25 = istate->t9; + elf_regs->r26 = istate->kt0; + elf_regs->r27 = istate->kt1; + elf_regs->r28 = istate->gp; + elf_regs->r29 = istate->sp; + elf_regs->r30 = istate->s8; + elf_regs->r31 = istate->ra; + + elf_regs->cp0_status = istate->status; + elf_regs->hi = istate->hi; + elf_regs->lo = istate->lo; + elf_regs->cp0_epc = istate->epc; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcmips32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips32_FADDR_H_ +#define LIBC_mips32_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,96 @@ +/* + * 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 libcmips32 + * @{ + */ +/** @file + * @ingroup libcmips32 + */ + +#ifndef LIBC_mips32_FIBRIL_H_ +#define LIBC_mips32_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 { + uint32_t sp; + uint32_t pc; + + uint32_t s0; + uint32_t s1; + uint32_t s2; + uint32_t s3; + uint32_t s4; + uint32_t s5; + uint32_t s6; + uint32_t s7; + uint32_t s8; + uint32_t gp; + uint32_t tls; /* Thread local storage(=k1) */ + + uint32_t f20; + uint32_t f21; + uint32_t f22; + uint32_t f23; + uint32_t f24; + uint32_t f25; + uint32_t f26; + uint32_t f27; + uint32_t f28; + uint32_t f29; + uint32_t f30; + +} context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->sp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcmips32 + * @{ + */ + +#ifndef LIBC_mips32_INTTYPES_H_ +#define LIBC_mips32_INTTYPES_H_ + +#define PRIdn PRId32 /**< Format for native_t. */ +#define PRIun PRIu32 /**< Format for sysarg_t. */ +#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu32 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips32/include/arch/istate.h Index: uspace/lib/c/arch/mips32/include/libarch/regname.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/regname.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/regname.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips32/include/arch/asm/regname.h Index: uspace/lib/c/arch/mips32/include/libarch/stack.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/stack.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/stack.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/mips32/include/arch/stack.h Index: uspace/lib/c/arch/mips32/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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_mips32_SYSCALL_H_ +#define LIBC_mips32_SYSCALL_H_ + +#define LIBARCH_SYSCALL_GENERIC + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcmips32 + * @{ + */ +/** @file + * @ingroup libcmips32 + */ + +#ifndef LIBC_mips32_THREAD_H_ +#define LIBC_mips32_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,86 @@ +/* + * 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 libcmips32 + * @{ + */ +/** @file + * @ingroup libcmips32 + */ + +/* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */ + +#ifndef LIBC_mips32_TLS_H_ +#define LIBC_mips32_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); + + asm volatile ("add $27, %0, $0" : : "r"(tp)); /* Move tls to K1 */ +} + +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/mips32/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcmips32 + * @{ + */ +/** @file + * @ingroup libcmips32 + */ + +#ifndef LIBC_mips32_TYPES_H_ +#define LIBC_mips32_TYPES_H_ + +#define __32_BITS__ + +#include + +#define SIZE_MIN UINT32_MIN +#define SIZE_MAX UINT32_MAX + +#define SSIZE_MIN INT32_MIN +#define SSIZE_MAX INT32_MAX + +typedef uint32_t sysarg_t; +typedef int32_t native_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef int32_t intptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/regname.h =================================================================== --- uspace/lib/c/arch/mips32/include/regname.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips32/include/asm/regname.h Index: uspace/lib/c/arch/mips32/include/stack.h =================================================================== --- uspace/lib/c/arch/mips32/include/stack.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips32/include/stack.h Index: uspace/lib/c/arch/mips32/include/syscall.h =================================================================== --- uspace/lib/c/arch/mips32/include/syscall.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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_mips32_SYSCALL_H_ -#define LIBC_mips32_SYSCALL_H_ - -#define LIBARCH_SYSCALL_GENERIC - -#include - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/include/thread.h =================================================================== --- uspace/lib/c/arch/mips32/include/thread.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcmips32 - * @{ - */ -/** @file - * @ingroup libcmips32 - */ - -#ifndef LIBC_mips32_THREAD_H_ -#define LIBC_mips32_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32/include/tls.h =================================================================== --- uspace/lib/c/arch/mips32/include/tls.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,86 +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 libcmips32 - * @{ - */ -/** @file - * @ingroup libcmips32 - */ - -/* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */ - -#ifndef LIBC_mips32_TLS_H_ -#define LIBC_mips32_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); - - asm volatile ("add $27, %0, $0" : : "r"(tp)); /* Move tls to K1 */ -} - -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/mips32/include/types.h =================================================================== --- uspace/lib/c/arch/mips32/include/types.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcmips32 - * @{ - */ -/** @file - * @ingroup libcmips32 - */ - -#ifndef LIBC_mips32_TYPES_H_ -#define LIBC_mips32_TYPES_H_ - -#define __32_BITS__ - -#include - -#define SIZE_MIN UINT32_MIN -#define SIZE_MAX UINT32_MAX - -#define SSIZE_MIN INT32_MIN -#define SSIZE_MAX INT32_MAX - -typedef uint32_t sysarg_t; -typedef int32_t native_t; - -typedef int32_t ssize_t; -typedef uint32_t size_t; - -typedef uint32_t uintptr_t; -typedef int32_t intptr_t; -typedef uint32_t atomic_count_t; -typedef int32_t atomic_signed_t; - -#endif - -/** @} - */ Index: uspace/lib/c/arch/mips32eb/include/atomic.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/atomic.h Index: uspace/lib/c/arch/mips32eb/include/barrier.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/barrier.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/barrier.h Index: uspace/lib/c/arch/mips32eb/include/config.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/config.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/config.h Index: uspace/lib/c/arch/mips32eb/include/context_offset.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/context_offset.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/context_offset.h Index: uspace/lib/c/arch/mips32eb/include/cp0.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/cp0.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/cp0.h Index: uspace/lib/c/arch/mips32eb/include/ddi.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/ddi.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/ddi.h Index: uspace/lib/c/arch/mips32eb/include/elf.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/elf.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/elf.h Index: uspace/lib/c/arch/mips32eb/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/elf_linux.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/elf_linux.h Index: uspace/lib/c/arch/mips32eb/include/faddr.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/faddr.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/faddr.h Index: uspace/lib/c/arch/mips32eb/include/fibril.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/fibril.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/fibril.h Index: uspace/lib/c/arch/mips32eb/include/inttypes.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/inttypes.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/inttypes.h Index: uspace/lib/c/arch/mips32eb/include/istate.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/istate.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/istate.h Index: uspace/lib/c/arch/mips32eb/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/atomic.h Index: uspace/lib/c/arch/mips32eb/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/barrier.h Index: uspace/lib/c/arch/mips32eb/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/config.h Index: uspace/lib/c/arch/mips32eb/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/context_offset.h Index: uspace/lib/c/arch/mips32eb/include/libarch/cp0.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/cp0.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/cp0.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/cp0.h Index: uspace/lib/c/arch/mips32eb/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/ddi.h Index: uspace/lib/c/arch/mips32eb/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/elf.h Index: uspace/lib/c/arch/mips32eb/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/elf_linux.h Index: uspace/lib/c/arch/mips32eb/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/faddr.h Index: uspace/lib/c/arch/mips32eb/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/fibril.h Index: uspace/lib/c/arch/mips32eb/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/inttypes.h Index: uspace/lib/c/arch/mips32eb/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/istate.h Index: uspace/lib/c/arch/mips32eb/include/libarch/regname.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/regname.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/regname.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/regname.h Index: uspace/lib/c/arch/mips32eb/include/libarch/stack.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/stack.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/stack.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/stack.h Index: uspace/lib/c/arch/mips32eb/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/syscall.h Index: uspace/lib/c/arch/mips32eb/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/thread.h Index: uspace/lib/c/arch/mips32eb/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/tls.h Index: uspace/lib/c/arch/mips32eb/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips32eb/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../mips32/include/libarch/types.h Index: uspace/lib/c/arch/mips32eb/include/regname.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/regname.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/regname.h Index: uspace/lib/c/arch/mips32eb/include/stack.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/stack.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/stack.h Index: uspace/lib/c/arch/mips32eb/include/syscall.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/syscall.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/syscall.h Index: uspace/lib/c/arch/mips32eb/include/thread.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/thread.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/thread.h Index: uspace/lib/c/arch/mips32eb/include/tls.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/tls.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/tls.h Index: uspace/lib/c/arch/mips32eb/include/types.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/types.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/types.h Index: uspace/lib/c/arch/mips64/include/atomic.h =================================================================== --- uspace/lib/c/arch/mips64/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/barrier.h Index: uspace/lib/c/arch/mips64/include/config.h =================================================================== --- uspace/lib/c/arch/mips64/include/config.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/context_offset.h Index: uspace/lib/c/arch/mips64/include/cp0.h =================================================================== --- uspace/lib/c/arch/mips64/include/cp0.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/cp0.h Index: uspace/lib/c/arch/mips64/include/ddi.h =================================================================== --- uspace/lib/c/arch/mips64/include/ddi.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 arch_pio_write_8(ioport8_t *port, uint8_t v) -{ - *port = v; -} - -static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) -{ - *port = v; -} - -static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) -{ - *port = v; -} - -static inline uint8_t arch_pio_read_8(const ioport8_t *port) -{ - return *port; -} - -static inline uint16_t arch_pio_read_16(const ioport16_t *port) -{ - return *port; -} - -static inline uint32_t arch_pio_read_32(const ioport32_t *port) -{ - return *port; -} - -#endif Index: uspace/lib/c/arch/mips64/include/elf.h =================================================================== --- uspace/lib/c/arch/mips64/include/elf.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/elf.h Index: uspace/lib/c/arch/mips64/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/mips64/include/elf_linux.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/istate.h Index: uspace/lib/c/arch/mips64/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/cp0.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 arch_pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t arch_pio_read_8(const ioport8_t *port) +{ + return *port; +} + +static inline uint16_t arch_pio_read_16(const ioport16_t *port) +{ + return *port; +} + +static inline uint32_t arch_pio_read_32(const 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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/regname.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/stack.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/mips64/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/asm/regname.h Index: uspace/lib/c/arch/mips64/include/stack.h =================================================================== --- uspace/lib/c/arch/mips64/include/stack.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/mips64/include/stack.h Index: uspace/lib/c/arch/mips64/include/syscall.h =================================================================== --- uspace/lib/c/arch/mips64/include/syscall.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/atomic.h =================================================================== --- uspace/lib/c/arch/ppc32/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,105 +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 libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_ATOMIC_H_ -#define LIBC_ppc32_ATOMIC_H_ - -#define LIBC_ARCH_ATOMIC_H_ - -#include - -static inline void atomic_inc(atomic_t *val) -{ - atomic_count_t tmp; - - asm volatile ( - "1:\n" - "lwarx %0, 0, %2\n" - "addic %0, %0, 1\n" - "stwcx. %0, 0, %2\n" - "bne- 1b" - : "=&r" (tmp), - "=m" (val->count) - : "r" (&val->count), - "m" (val->count) - : "cc" - ); -} - -static inline void atomic_dec(atomic_t *val) -{ - atomic_count_t tmp; - - asm volatile ( - "1:\n" - "lwarx %0, 0, %2\n" - "addic %0, %0, -1\n" - "stwcx. %0, 0, %2\n" - "bne- 1b" - : "=&r" (tmp), - "=m" (val->count) - : "r" (&val->count), - "m" (val->count) - : "cc" - ); -} - -static inline atomic_count_t atomic_postinc(atomic_t *val) -{ - atomic_inc(val); - return val->count - 1; -} - -static inline atomic_count_t atomic_postdec(atomic_t *val) -{ - atomic_dec(val); - return val->count + 1; -} - -static inline atomic_count_t atomic_preinc(atomic_t *val) -{ - atomic_inc(val); - return val->count; -} - -static inline atomic_count_t atomic_predec(atomic_t *val) -{ - atomic_dec(val); - return val->count; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/barrier.h =================================================================== --- uspace/lib/c/arch/ppc32/include/barrier.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ppc32/include/barrier.h Index: uspace/lib/c/arch/ppc32/include/config.h =================================================================== --- uspace/lib/c/arch/ppc32/include/config.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_CONFIG_H_ -#define LIBC_ppc32_CONFIG_H_ - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/context_offset.h =================================================================== --- uspace/lib/c/arch/ppc32/include/context_offset.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ppc32/include/context_offset.h Index: uspace/lib/c/arch/ppc32/include/ddi.h =================================================================== --- uspace/lib/c/arch/ppc32/include/ddi.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcppc32 - */ - -#ifndef LIBC_ppc32_DDI_H_ -#define LIBC_ppc32_DDI_H_ - -#include -#include - -static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) -{ - *port = v; -} - -static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) -{ - *port = v; -} - -static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) -{ - *port = v; -} - -static inline uint8_t arch_pio_read_8(const ioport8_t *port) -{ - return *port; -} - -static inline uint16_t arch_pio_read_16(const ioport16_t *port) -{ - return *port; -} - -static inline uint32_t arch_pio_read_32(const ioport32_t *port) -{ - return *port; -} - -#endif Index: uspace/lib/c/arch/ppc32/include/elf.h =================================================================== --- uspace/lib/c/arch/ppc32/include/elf.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ppc32/include/elf.h Index: uspace/lib/c/arch/ppc32/include/elf_linux.h =================================================================== --- uspace/lib/c/arch/ppc32/include/elf_linux.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,140 +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 libcppc32 - * @{ - */ -/** @file Definitions needed to write core files in Linux-ELF format. - */ - -#ifndef LIBC_ppc32_ELF_LINUX_H_ -#define LBIC_ppc32_ELF_LINUX_H_ - -#include -#include - -/** Linux kernel struct pt_regs structure. - * - * We need this to save register state to a core file in Linux format - * (readable by GDB configured for Linux target). - */ -typedef struct { - uint32_t r0; - uint32_t r1; - uint32_t r2; - uint32_t r3; - uint32_t r4; - uint32_t r5; - uint32_t r6; - uint32_t r7; - uint32_t r8; - uint32_t r9; - uint32_t r10; - uint32_t r11; - uint32_t r12; - uint32_t r13; - uint32_t r14; - uint32_t r15; - uint32_t r16; - uint32_t r17; - uint32_t r18; - uint32_t r19; - uint32_t r20; - uint32_t r21; - uint32_t r22; - uint32_t r23; - uint32_t r24; - uint32_t r25; - uint32_t r26; - uint32_t r27; - uint32_t r28; - uint32_t r29; - uint32_t r30; - uint32_t r31; - - uint32_t nip; - uint32_t msr; - uint32_t old_r3; - uint32_t ctr; - uint32_t link; - uint32_t xer; - uint32_t ccr; - uint32_t mq; - uint32_t trap; - uint32_t dar; - uint32_t dsisr; - uint32_t result; -} elf_regs_t; - -/** Convert istate_t to elf_regs_t. */ -static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) -{ - elf_regs->r0 = istate->r0; - elf_regs->r1 = istate->sp; - elf_regs->r2 = istate->r2; - elf_regs->r3 = istate->r3; - elf_regs->r4 = istate->r4; - elf_regs->r5 = istate->r5; - elf_regs->r6 = istate->r6; - elf_regs->r7 = istate->r7; - elf_regs->r8 = istate->r8; - elf_regs->r9 = istate->r9; - elf_regs->r10 = istate->r10; - elf_regs->r11 = istate->r11; - elf_regs->r12 = istate->r12; - elf_regs->r13 = istate->r13; - elf_regs->r14 = istate->r14; - elf_regs->r15 = istate->r15; - elf_regs->r16 = istate->r16; - elf_regs->r17 = istate->r17; - elf_regs->r18 = istate->r18; - elf_regs->r19 = istate->r19; - elf_regs->r20 = istate->r20; - elf_regs->r21 = istate->r21; - elf_regs->r22 = istate->r22; - elf_regs->r23 = istate->r23; - elf_regs->r24 = istate->r24; - elf_regs->r25 = istate->r25; - elf_regs->r26 = istate->r26; - elf_regs->r27 = istate->r27; - elf_regs->r28 = istate->r28; - elf_regs->r29 = istate->r29; - elf_regs->r30 = istate->r30; - elf_regs->r31 = istate->r31; - - elf_regs->ctr = istate->ctr; - elf_regs->link = istate->lr; - elf_regs->xer = istate->xer; - elf_regs->ccr = istate->cr; - elf_regs->dar = istate->dar; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/faddr.h =================================================================== --- uspace/lib/c/arch/ppc32/include/faddr.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_FADDR_H_ -#define LIBC_ppc32_FADDR_H_ - -#include - -#define FADDR(fptr) ((uintptr_t) (fptr)) - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/fibril.h =================================================================== --- uspace/lib/c/arch/ppc32/include/fibril.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,91 +1,0 @@ -/* - * Copyright (c) 2006 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 libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_FIBRIL_H_ -#define LIBC_ppc32_FIBRIL_H_ - -#include - -#define SP_DELTA 16 - -/* - * 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 { - uint32_t sp; - uint32_t pc; - - uint32_t tls; - uint32_t r13; - uint32_t r14; - uint32_t r15; - uint32_t r16; - uint32_t r17; - uint32_t r18; - uint32_t r19; - uint32_t r20; - uint32_t r21; - uint32_t r22; - uint32_t r23; - uint32_t r24; - uint32_t r25; - uint32_t r26; - uint32_t r27; - uint32_t r28; - uint32_t r29; - uint32_t r30; - uint32_t r31; - - uint32_t cr; -} __attribute__ ((packed)) context_t; - -static inline uintptr_t context_get_fp(context_t *ctx) -{ - return ctx->sp; -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ppc32/include/inttypes.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcppc32 - * @{ - */ - -#ifndef LIBC_ppc32_INTTYPES_H_ -#define LIBC_ppc32_INTTYPES_H_ - -#define PRIdn PRId32 /**< Format for native_t. */ -#define PRIun PRIu32 /**< Format for sysarg_t. */ -#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ -#define PRIua PRIu32 /**< Format for atomic_count_t. */ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/istate.h =================================================================== --- uspace/lib/c/arch/ppc32/include/istate.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ppc32/include/istate.h Index: uspace/lib/c/arch/ppc32/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,105 @@ +/* + * 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 libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_ATOMIC_H_ +#define LIBC_ppc32_ATOMIC_H_ + +#define LIBC_ARCH_ATOMIC_H_ + +#include + +static inline void atomic_inc(atomic_t *val) +{ + atomic_count_t tmp; + + asm volatile ( + "1:\n" + "lwarx %0, 0, %2\n" + "addic %0, %0, 1\n" + "stwcx. %0, 0, %2\n" + "bne- 1b" + : "=&r" (tmp), + "=m" (val->count) + : "r" (&val->count), + "m" (val->count) + : "cc" + ); +} + +static inline void atomic_dec(atomic_t *val) +{ + atomic_count_t tmp; + + asm volatile ( + "1:\n" + "lwarx %0, 0, %2\n" + "addic %0, %0, -1\n" + "stwcx. %0, 0, %2\n" + "bne- 1b" + : "=&r" (tmp), + "=m" (val->count) + : "r" (&val->count), + "m" (val->count) + : "cc" + ); +} + +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + atomic_inc(val); + return val->count - 1; +} + +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + atomic_dec(val); + return val->count + 1; +} + +static inline atomic_count_t atomic_preinc(atomic_t *val) +{ + atomic_inc(val); + return val->count; +} + +static inline atomic_count_t atomic_predec(atomic_t *val) +{ + atomic_dec(val); + return val->count; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/barrier.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ppc32/include/arch/barrier.h Index: uspace/lib/c/arch/ppc32/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_CONFIG_H_ +#define LIBC_ppc32_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/context_offset.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ppc32/include/arch/context_offset.h Index: uspace/lib/c/arch/ppc32/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcppc32 + */ + +#ifndef LIBC_ppc32_DDI_H_ +#define LIBC_ppc32_DDI_H_ + +#include +#include + +static inline void arch_pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void arch_pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void arch_pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t arch_pio_read_8(const ioport8_t *port) +{ + return *port; +} + +static inline uint16_t arch_pio_read_16(const ioport16_t *port) +{ + return *port; +} + +static inline uint32_t arch_pio_read_32(const ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/ppc32/include/libarch/elf.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ppc32/include/arch/elf.h Index: uspace/lib/c/arch/ppc32/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,140 @@ +/* + * 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 libcppc32 + * @{ + */ +/** @file Definitions needed to write core files in Linux-ELF format. + */ + +#ifndef LIBC_ppc32_ELF_LINUX_H_ +#define LBIC_ppc32_ELF_LINUX_H_ + +#include +#include + +/** Linux kernel struct pt_regs structure. + * + * We need this to save register state to a core file in Linux format + * (readable by GDB configured for Linux target). + */ +typedef struct { + uint32_t r0; + uint32_t r1; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + uint32_t r11; + uint32_t r12; + uint32_t r13; + uint32_t r14; + uint32_t r15; + uint32_t r16; + uint32_t r17; + uint32_t r18; + uint32_t r19; + uint32_t r20; + uint32_t r21; + uint32_t r22; + uint32_t r23; + uint32_t r24; + uint32_t r25; + uint32_t r26; + uint32_t r27; + uint32_t r28; + uint32_t r29; + uint32_t r30; + uint32_t r31; + + uint32_t nip; + uint32_t msr; + uint32_t old_r3; + uint32_t ctr; + uint32_t link; + uint32_t xer; + uint32_t ccr; + uint32_t mq; + uint32_t trap; + uint32_t dar; + uint32_t dsisr; + uint32_t result; +} elf_regs_t; + +/** Convert istate_t to elf_regs_t. */ +static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs) +{ + elf_regs->r0 = istate->r0; + elf_regs->r1 = istate->sp; + elf_regs->r2 = istate->r2; + elf_regs->r3 = istate->r3; + elf_regs->r4 = istate->r4; + elf_regs->r5 = istate->r5; + elf_regs->r6 = istate->r6; + elf_regs->r7 = istate->r7; + elf_regs->r8 = istate->r8; + elf_regs->r9 = istate->r9; + elf_regs->r10 = istate->r10; + elf_regs->r11 = istate->r11; + elf_regs->r12 = istate->r12; + elf_regs->r13 = istate->r13; + elf_regs->r14 = istate->r14; + elf_regs->r15 = istate->r15; + elf_regs->r16 = istate->r16; + elf_regs->r17 = istate->r17; + elf_regs->r18 = istate->r18; + elf_regs->r19 = istate->r19; + elf_regs->r20 = istate->r20; + elf_regs->r21 = istate->r21; + elf_regs->r22 = istate->r22; + elf_regs->r23 = istate->r23; + elf_regs->r24 = istate->r24; + elf_regs->r25 = istate->r25; + elf_regs->r26 = istate->r26; + elf_regs->r27 = istate->r27; + elf_regs->r28 = istate->r28; + elf_regs->r29 = istate->r29; + elf_regs->r30 = istate->r30; + elf_regs->r31 = istate->r31; + + elf_regs->ctr = istate->ctr; + elf_regs->link = istate->lr; + elf_regs->xer = istate->xer; + elf_regs->ccr = istate->cr; + elf_regs->dar = istate->dar; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_FADDR_H_ +#define LIBC_ppc32_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2006 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 libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_FIBRIL_H_ +#define LIBC_ppc32_FIBRIL_H_ + +#include + +#define SP_DELTA 16 + +/* + * 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 { + uint32_t sp; + uint32_t pc; + + uint32_t tls; + uint32_t r13; + uint32_t r14; + uint32_t r15; + uint32_t r16; + uint32_t r17; + uint32_t r18; + uint32_t r19; + uint32_t r20; + uint32_t r21; + uint32_t r22; + uint32_t r23; + uint32_t r24; + uint32_t r25; + uint32_t r26; + uint32_t r27; + uint32_t r28; + uint32_t r29; + uint32_t r30; + uint32_t r31; + + uint32_t cr; +} __attribute__ ((packed)) context_t; + +static inline uintptr_t context_get_fp(context_t *ctx) +{ + return ctx->sp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/inttypes.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcppc32 + * @{ + */ + +#ifndef LIBC_ppc32_INTTYPES_H_ +#define LIBC_ppc32_INTTYPES_H_ + +#define PRIdn PRId32 /**< Format for native_t. */ +#define PRIun PRIu32 /**< Format for sysarg_t. */ +#define PRIxn PRIx32 /**< Format for hexadecimal sysarg_t. */ +#define PRIua PRIu32 /**< Format for atomic_count_t. */ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/istate.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ppc32/include/arch/istate.h Index: uspace/lib/c/arch/ppc32/include/libarch/msr.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/msr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/msr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,1 @@ +../../../../../../../kernel/arch/ppc32/include/arch/msr.h Index: uspace/lib/c/arch/ppc32/include/libarch/regname.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/regname.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/regname.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,188 @@ +/* + * Copyright (c) 2006 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 libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_REGNAME_H_ +#define LIBC_ppc32_REGNAME_H_ + +/* Condition Register Bit Fields */ +#define cr0 0 +#define cr1 1 +#define cr2 2 +#define cr3 3 +#define cr4 4 +#define cr5 5 +#define cr6 6 +#define cr7 7 + +/* General Purpose Registers (GPRs) */ +#define r0 0 +#define r1 1 +#define r2 2 +#define r3 3 +#define r4 4 +#define r5 5 +#define r6 6 +#define r7 7 +#define r8 8 +#define r9 9 +#define r10 10 +#define r11 11 +#define r12 12 +#define r13 13 +#define r14 14 +#define r15 15 +#define r16 16 +#define r17 17 +#define r18 18 +#define r19 19 +#define r20 20 +#define r21 21 +#define r22 22 +#define r23 23 +#define r24 24 +#define r25 25 +#define r26 26 +#define r27 27 +#define r28 28 +#define r29 29 +#define r30 30 +#define r31 31 + +/* GPR Aliases */ +#define sp 1 + +/* Floating Point Registers (FPRs) */ +#define fr0 0 +#define fr1 1 +#define fr2 2 +#define fr3 3 +#define fr4 4 +#define fr5 5 +#define fr6 6 +#define fr7 7 +#define fr8 8 +#define fr9 9 +#define fr10 10 +#define fr11 11 +#define fr12 12 +#define fr13 13 +#define fr14 14 +#define fr15 15 +#define fr16 16 +#define fr17 17 +#define fr18 18 +#define fr19 19 +#define fr20 20 +#define fr21 21 +#define fr22 22 +#define fr23 23 +#define fr24 24 +#define fr25 25 +#define fr26 26 +#define fr27 27 +#define fr28 28 +#define fr29 29 +#define fr30 30 +#define fr31 31 + +#define vr0 0 +#define vr1 1 +#define vr2 2 +#define vr3 3 +#define vr4 4 +#define vr5 5 +#define vr6 6 +#define vr7 7 +#define vr8 8 +#define vr9 9 +#define vr10 10 +#define vr11 11 +#define vr12 12 +#define vr13 13 +#define vr14 14 +#define vr15 15 +#define vr16 16 +#define vr17 17 +#define vr18 18 +#define vr19 19 +#define vr20 20 +#define vr21 21 +#define vr22 22 +#define vr23 23 +#define vr24 24 +#define vr25 25 +#define vr26 26 +#define vr27 27 +#define vr28 28 +#define vr29 29 +#define vr30 30 +#define vr31 31 + +#define evr0 0 +#define evr1 1 +#define evr2 2 +#define evr3 3 +#define evr4 4 +#define evr5 5 +#define evr6 6 +#define evr7 7 +#define evr8 8 +#define evr9 9 +#define evr10 10 +#define evr11 11 +#define evr12 12 +#define evr13 13 +#define evr14 14 +#define evr15 15 +#define evr16 16 +#define evr17 17 +#define evr18 18 +#define evr19 19 +#define evr20 20 +#define evr21 21 +#define evr22 22 +#define evr23 23 +#define evr24 24 +#define evr25 25 +#define evr26 26 +#define evr27 27 +#define evr28 28 +#define evr29 29 +#define evr30 30 +#define evr31 31 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/stackarg.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/stackarg.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/stackarg.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_STACKARG_H_ +#define LIBC_STACKARG_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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_ppc32_SYSCALL_H_ +#define LIBC_ppc32_SYSCALL_H_ + +#define LIBARCH_SYSCALL_GENERIC + +#include + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/thread.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2006 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 libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_THREAD_H_ +#define LIBC_ppc32_THREAD_H_ + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2006 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 libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_TLS_H_ +#define LIBC_ppc32_TLS_H_ + +#define CONFIG_TLS_VARIANT_1 + +#define PPC_TP_OFFSET 0x7000 + +typedef struct { + void *fibril_data; +} tcb_t; + +static inline void __tcb_set(tcb_t *tcb) +{ + void *tp = tcb; + tp += PPC_TP_OFFSET + sizeof(tcb_t); + + asm volatile ( + "mr %%r2, %0\n" + : + : "r" (tp) + ); +} + +static inline tcb_t * __tcb_get(void) +{ + void * retval; + + asm volatile ( + "mr %0, %%r2\n" + : "=r" (retval) + ); + + return (tcb_t *)(retval - PPC_TP_OFFSET - sizeof(tcb_t)); +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/libarch/types.h =================================================================== --- uspace/lib/c/arch/ppc32/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/ppc32/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_TYPES_H_ +#define LIBC_ppc32_TYPES_H_ + +#define __32_BITS__ + +#include + +#define SIZE_MIN UINT32_MIN +#define SIZE_MAX UINT32_MAX + +#define SSIZE_MIN INT32_MIN +#define SSIZE_MAX INT32_MAX + +typedef uint32_t sysarg_t; +typedef int32_t native_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef int32_t intptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ + Index: uspace/lib/c/arch/ppc32/include/msr.h =================================================================== --- uspace/lib/c/arch/ppc32/include/msr.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../kernel/arch/ppc32/include/msr.h Index: uspace/lib/c/arch/ppc32/include/regname.h =================================================================== --- uspace/lib/c/arch/ppc32/include/regname.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,188 +1,0 @@ -/* - * Copyright (c) 2006 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 libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_REGNAME_H_ -#define LIBC_ppc32_REGNAME_H_ - -/* Condition Register Bit Fields */ -#define cr0 0 -#define cr1 1 -#define cr2 2 -#define cr3 3 -#define cr4 4 -#define cr5 5 -#define cr6 6 -#define cr7 7 - -/* General Purpose Registers (GPRs) */ -#define r0 0 -#define r1 1 -#define r2 2 -#define r3 3 -#define r4 4 -#define r5 5 -#define r6 6 -#define r7 7 -#define r8 8 -#define r9 9 -#define r10 10 -#define r11 11 -#define r12 12 -#define r13 13 -#define r14 14 -#define r15 15 -#define r16 16 -#define r17 17 -#define r18 18 -#define r19 19 -#define r20 20 -#define r21 21 -#define r22 22 -#define r23 23 -#define r24 24 -#define r25 25 -#define r26 26 -#define r27 27 -#define r28 28 -#define r29 29 -#define r30 30 -#define r31 31 - -/* GPR Aliases */ -#define sp 1 - -/* Floating Point Registers (FPRs) */ -#define fr0 0 -#define fr1 1 -#define fr2 2 -#define fr3 3 -#define fr4 4 -#define fr5 5 -#define fr6 6 -#define fr7 7 -#define fr8 8 -#define fr9 9 -#define fr10 10 -#define fr11 11 -#define fr12 12 -#define fr13 13 -#define fr14 14 -#define fr15 15 -#define fr16 16 -#define fr17 17 -#define fr18 18 -#define fr19 19 -#define fr20 20 -#define fr21 21 -#define fr22 22 -#define fr23 23 -#define fr24 24 -#define fr25 25 -#define fr26 26 -#define fr27 27 -#define fr28 28 -#define fr29 29 -#define fr30 30 -#define fr31 31 - -#define vr0 0 -#define vr1 1 -#define vr2 2 -#define vr3 3 -#define vr4 4 -#define vr5 5 -#define vr6 6 -#define vr7 7 -#define vr8 8 -#define vr9 9 -#define vr10 10 -#define vr11 11 -#define vr12 12 -#define vr13 13 -#define vr14 14 -#define vr15 15 -#define vr16 16 -#define vr17 17 -#define vr18 18 -#define vr19 19 -#define vr20 20 -#define vr21 21 -#define vr22 22 -#define vr23 23 -#define vr24 24 -#define vr25 25 -#define vr26 26 -#define vr27 27 -#define vr28 28 -#define vr29 29 -#define vr30 30 -#define vr31 31 - -#define evr0 0 -#define evr1 1 -#define evr2 2 -#define evr3 3 -#define evr4 4 -#define evr5 5 -#define evr6 6 -#define evr7 7 -#define evr8 8 -#define evr9 9 -#define evr10 10 -#define evr11 11 -#define evr12 12 -#define evr13 13 -#define evr14 14 -#define evr15 15 -#define evr16 16 -#define evr17 17 -#define evr18 18 -#define evr19 19 -#define evr20 20 -#define evr21 21 -#define evr22 22 -#define evr23 23 -#define evr24 24 -#define evr25 25 -#define evr26 26 -#define evr27 27 -#define evr28 28 -#define evr29 29 -#define evr30 30 -#define evr31 31 - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/stackarg.h =================================================================== --- uspace/lib/c/arch/ppc32/include/stackarg.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_STACKARG_H_ -#define LIBC_STACKARG_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/syscall.h =================================================================== --- uspace/lib/c/arch/ppc32/include/syscall.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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_ppc32_SYSCALL_H_ -#define LIBC_ppc32_SYSCALL_H_ - -#define LIBARCH_SYSCALL_GENERIC - -#include - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/thread.h =================================================================== --- uspace/lib/c/arch/ppc32/include/thread.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,41 +1,0 @@ -/* - * Copyright (c) 2006 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 libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_THREAD_H_ -#define LIBC_ppc32_THREAD_H_ - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/tls.h =================================================================== --- uspace/lib/c/arch/ppc32/include/tls.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (revision ) @@ -1,73 +1,0 @@ -/* - * Copyright (c) 2006 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 libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_TLS_H_ -#define LIBC_ppc32_TLS_H_ - -#define CONFIG_TLS_VARIANT_1 - -#define PPC_TP_OFFSET 0x7000 - -typedef struct { - void *fibril_data; -} tcb_t; - -static inline void __tcb_set(tcb_t *tcb) -{ - void *tp = tcb; - tp += PPC_TP_OFFSET + sizeof(tcb_t); - - asm volatile ( - "mr %%r2, %0\n" - : - : "r" (tp) - ); -} - -static inline tcb_t * __tcb_get(void) -{ - void * retval; - - asm volatile ( - "mr %0, %%r2\n" - : "=r" (retval) - ); - - return (tcb_t *)(retval - PPC_TP_OFFSET - sizeof(tcb_t)); -} - -#endif - -/** @} - */ Index: uspace/lib/c/arch/ppc32/include/types.h =================================================================== --- uspace/lib/c/arch/ppc32/include/types.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_ppc32_TYPES_H_ -#define LIBC_ppc32_TYPES_H_ - -#define __32_BITS__ - -#include - -#define SIZE_MIN UINT32_MIN -#define SIZE_MAX UINT32_MAX - -#define SSIZE_MIN INT32_MIN -#define SSIZE_MAX INT32_MAX - -typedef uint32_t sysarg_t; -typedef int32_t native_t; - -typedef int32_t ssize_t; -typedef uint32_t size_t; - -typedef uint32_t uintptr_t; -typedef int32_t intptr_t; -typedef uint32_t atomic_count_t; -typedef int32_t atomic_signed_t; - -#endif - -/** @} - */ - Index: uspace/lib/c/arch/sparc64/include/atomic.h =================================================================== --- uspace/lib/c/arch/sparc64/include/atomic.h (revision 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/atomic.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/barrier.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/config.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/context_offset.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/ddi.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/elf.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/elf_linux.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/faddr.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/fibril.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/inttypes.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/istate.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/regdef.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/stack.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/stackarg.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/syscall.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/thread.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/tls.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 850235d404a93a3e011befe27ef139ef8e288759) +++ uspace/lib/c/arch/sparc64/include/libarch/types.h (revision 850235d404a93a3e011befe27ef139ef8e288759) @@ -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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 31399f351e50cccf9ca8013eff7464706542f56d) +++ (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 - -/** @} - */