Index: uspace/lib/c/arch/abs32le/Makefile.common =================================================================== --- uspace/lib/c/arch/abs32le/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,33 @@ +# +# 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. +# + +ifeq ($(COMPILER),clang) + CLANG_ARCH = i386 +endif + +ENDIANESS = LE Index: uspace/lib/c/arch/abs32le/Makefile.inc =================================================================== --- uspace/lib/c/arch/abs32le/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,37 @@ +# +# 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. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.c \ + arch/$(UARCH)/src/thread_entry.c \ + arch/$(UARCH)/src/fibril.c \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/syscall.c \ + arch/$(UARCH)/src/stacktrace.c + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/abs32le/_link.ld.in =================================================================== --- uspace/lib/c/arch/abs32le/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,53 @@ +STARTUP(LIBC_PATH/arch/UARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000 + SIZEOF_HEADERS; + + .text : { + *(.text); + *(.rodata*); + } :text + + . = . + 0x1000; + + .data : { + *(.data); + *(.data.rel*); + } :data + + .tdata : { + _tdata_start = .; + *(.tdata); + *(.gnu.linkonce.tb.*); + _tdata_end = .; + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + + _tls_alignment = ALIGNOF(.tdata); + + .sbss : { + *(.scommon); + *(.sbss); + } + + .bss : { + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + + _heap = .; + + /DISCARD/ : { + *(*); + } +} Index: uspace/lib/c/arch/abs32le/include/atomic.h =================================================================== --- uspace/lib/c/arch/abs32le/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/config.h =================================================================== --- uspace/lib/c/arch/abs32le/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/ddi.h =================================================================== --- uspace/lib/c/arch/abs32le/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,65 @@ +/* + * 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_ + +static inline void pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + return *port; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + return *port; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/abs32le/include/entry.h =================================================================== --- uspace/lib/c/arch/abs32le/include/entry.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/entry.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/faddr.h =================================================================== --- uspace/lib/c/arch/abs32le/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/fibril.h =================================================================== --- uspace/lib/c/arch/abs32le/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,62 @@ +/* + * 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)->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 pc; + uintptr_t tls; +} context_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/inttypes.h =================================================================== --- uspace/lib/c/arch/abs32le/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,69 @@ +/* + * 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 PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/istate.h =================================================================== --- uspace/lib/c/arch/abs32le/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,64 @@ +/* + * 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 debug + * @{ + */ +/** @file + */ + +#ifndef LIBC_abs32le__ISTATE_H_ +#define LIBC_abs32le__ISTATE_H_ + +#include + +/** Interrupt context. + * + * On real hardware this stores the registers which + * need to be preserved during interupts. + */ +typedef struct istate { + uintptr_t ip; + uintptr_t fp; + uint32_t stack[]; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->ip; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->fp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/limits.h =================================================================== --- uspace/lib/c/arch/abs32le/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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__LIMITS_H_ +#define LIBC_abs32le__LIMITS_H_ + +#define LONG_MIN MIN_INT32 +#define LONG_MAX MAX_INT32 +#define ULONG_MIN MIN_UINT32 +#define ULONG_MAX MAX_UINT32 + +#define SIZE_MIN MIN_UINT32 +#define SIZE_MAX MAX_UINT32 +#define SSIZE_MIN MIN_INT32 +#define SSIZE_MAX MAX_INT32 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/include/syscall.h =================================================================== --- uspace/lib/c/arch/abs32le/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/thread.h =================================================================== --- uspace/lib/c/arch/abs32le/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/tls.h =================================================================== --- uspace/lib/c/arch/abs32le/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/types.h =================================================================== --- uspace/lib/c/arch/abs32le/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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__ + +typedef unsigned int sysarg_t; + +typedef char int8_t; +typedef short int int16_t; +typedef int int32_t; +typedef long long int int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long int uint64_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/abs32le/src/entry.c =================================================================== --- uspace/lib/c/arch/abs32le/src/entry.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/src/entry.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,43 @@ +/* + * 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 + */ + +#include +#include +#include + +void __entry(void) +{ + __main(NULL); + __exit(); +} + +/** @} + */ Index: uspace/lib/c/arch/abs32le/src/fibril.c =================================================================== --- uspace/lib/c/arch/abs32le/src/fibril.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/src/fibril.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,46 @@ +/* + * 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 + */ + +#include +#include + +int context_save(context_t *ctx) +{ + return 1; +} + +void context_restore(context_t *ctx) +{ + while (true); +} + +/** @} + */ Index: uspace/lib/c/arch/abs32le/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/abs32le/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,67 @@ +/* + * 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 + */ + +#include +#include +#include +#include + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + return true; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return 0; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return 0; +} + +void stacktrace_prepare(void) +{ +} + +uintptr_t stacktrace_fp_get(void) +{ + return NULL; +} + +uintptr_t stacktrace_pc_get(void) +{ + return NULL; +} + +/** @} + */ Index: uspace/lib/c/arch/abs32le/src/syscall.c =================================================================== --- uspace/lib/c/arch/abs32le/src/syscall.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/src/syscall.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,43 @@ +/* + * 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 + */ + +#include +#include + +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) +{ + return 0; +} + +/** @} + */ Index: uspace/lib/c/arch/abs32le/src/thread_entry.c =================================================================== --- uspace/lib/c/arch/abs32le/src/thread_entry.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/src/thread_entry.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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. + */ + +/** @file + */ + +#include +#include + +void __thread_entry(void) +{ + __thread_main(NULL); +} + +/** @} + */ Index: uspace/lib/c/arch/abs32le/src/tls.c =================================================================== --- uspace/lib/c/arch/abs32le/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/abs32le/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,52 @@ +/* + * 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 + */ + +#include +#include +#include + +tcb_t * __alloc_tls(void **data, size_t size) +{ + return tls_alloc_variant_2(data, size); +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + tls_free_variant_2(tcb, size); +} + +uintptr_t __aeabi_read_tp(void) +{ + return NULL; +} + +/** @} + */ Index: uspace/lib/c/arch/amd64/Makefile.common =================================================================== --- uspace/lib/c/arch/amd64/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,35 @@ +# +# 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. +# + +CLANG_ARCH = x86_64 +GCC_CFLAGS += -fno-omit-frame-pointer + +ENDIANESS = LE + +BFD_NAME = elf64-x86-64 +BFD_ARCH = i386:x86-64 Index: uspace/lib/c/arch/amd64/Makefile.inc =================================================================== --- uspace/lib/c/arch/amd64/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,38 @@ +# +# 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. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/syscall.S \ + arch/$(UARCH)/src/fibril.S \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/amd64/_link.ld.in =================================================================== --- uspace/lib/c/arch/amd64/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,46 @@ +STARTUP(LIBC_PATH/arch/UARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000 + SIZEOF_HEADERS; + + .init : { + *(.init); + } :text + .text : { + *(.text); + *(.rodata*); + } :text + + . = . + 0x1000; + + .data : { + *(.data); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/c/arch/amd64/include/atomic.h =================================================================== --- uspace/lib/c/arch/amd64/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,92 @@ +/* + * 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) +{ + asm volatile ( + "lock incq %[count]\n" + : [count] "+m" (val->count) + ); +} + +static inline void atomic_dec(atomic_t *val) +{ + asm volatile ( + "lock decq %[count]\n" + : [count] "+m" (val->count) + ); +} + +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + atomic_count_t r = 1; + + asm volatile ( + "lock xaddq %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); + + return r; +} + +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + atomic_count_t r = -1; + + asm volatile ( + "lock xaddq %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); + + 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/config.h =================================================================== --- uspace/lib/c/arch/amd64/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/ddi.h =================================================================== --- uspace/lib/c/arch/amd64/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../ia32/include/ddi.h Index: uspace/lib/c/arch/amd64/include/faddr.h =================================================================== --- uspace/lib/c/arch/amd64/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/fibril.h =================================================================== --- uspace/lib/c/arch/amd64/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,75 @@ +/* + * 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; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/amd64/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,76 @@ +/* + * 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 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_amd64_INTTYPES_H_ +#define LIBC_amd64_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "lld" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "llo" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "llu" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "llx" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "llX" + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/istate.h =================================================================== --- uspace/lib/c/arch/amd64/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,75 @@ +/* + * 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 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_ISTATE_H_ +#define LIBC_amd64_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rsi; + uint64_t rdi; + uint64_t r8; + uint64_t r9; + uint64_t r10; + uint64_t r11; + uint64_t rbp; + uint64_t error_word; + uint64_t rip; + uint64_t cs; + uint64_t rflags; + uint64_t stack[]; /* Additional data on stack */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->rip; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->rbp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/limits.h =================================================================== --- uspace/lib/c/arch/amd64/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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_amd64_LIMITS_H_ +#define LIBC_amd64_LIMITS_H_ + +#define LONG_MIN MIN_INT64 +#define LONG_MAX MAX_INT64 +#define ULONG_MIN MIN_UINT64 +#define ULONG_MAX MAX_UINT64 + +#define SIZE_MIN MIN_UINT64 +#define SIZE_MAX MAX_UINT64 +#define SSIZE_MIN MIN_INT64 +#define SSIZE_MAX MAX_INT64 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/include/stackarg.h =================================================================== --- uspace/lib/c/arch/amd64/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/syscall.h =================================================================== --- uspace/lib/c/arch/amd64/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/thread.h =================================================================== --- uspace/lib/c/arch/amd64/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/tls.h =================================================================== --- uspace/lib/c/arch/amd64/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/types.h =================================================================== --- uspace/lib/c/arch/amd64/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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__ + +typedef unsigned long long sysarg_t; + +typedef signed char int8_t; +typedef short int int16_t; +typedef int int32_t; +typedef long long int int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long int uint64_t; + +typedef int64_t ssize_t; +typedef uint64_t size_t; + +typedef uint64_t uintptr_t; +typedef uint64_t atomic_count_t; +typedef int64_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/amd64/src/entry.s =================================================================== --- uspace/lib/c/arch/amd64/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,50 @@ +# +# 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. +# + +.section .init, "ax" + +.org 0 + +.globl __entry + +## User-space task entry point +# +# %rdi contains the PCB pointer +# +__entry: + # + # Create the first stack frame. + # + pushq $0 + mov %rsp, %rbp + + # %rdi was deliberately chosen as the first argument is also in %rdi + # Pass PCB pointer to __main (no operation) + call __main + + call __exit Index: uspace/lib/c/arch/amd64/src/fibril.S =================================================================== --- uspace/lib/c/arch/amd64/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,73 @@ +# +# 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. +# + +.text + +.global context_save +.global context_restore + +#include + +## Save current CPU context +# +# Save CPU context to context_t variable +# pointed by the 1st argument. Returns 1 in EAX. +# +context_save: + movq (%rsp), %rdx # the caller's return %eip + + # In %edi is passed 1st argument + CONTEXT_SAVE_ARCH_CORE %rdi %rdx + + # Save TLS + movq %fs:0, %rax + movq %rax, OFFSET_TLS(%rdi) + + xorq %rax,%rax # context_save returns 1 + incq %rax + ret + + +## Restore current CPU context +# +# Restore CPU context from context_t variable +# pointed by the 1st argument. Returns 0 in EAX. +# +context_restore: + + CONTEXT_RESTORE_ARCH_CORE %rdi %rdx + + movq %rdx,(%rsp) + + # Set thread local storage + movq OFFSET_TLS(%rdi), %rdi # Set arg1 to TLS addr + movq $1, %rax # SYS_TLS_SET + syscall + + xorq %rax,%rax # context_restore returns 0 + ret Index: uspace/lib/c/arch/amd64/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/amd64/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * 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 amd64 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 8 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/c/arch/amd64/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/amd64/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,44 @@ +# +# 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. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + ret + +stacktrace_fp_get: + movq %rbp, %rax + ret + +stacktrace_pc_get: + movq (%rsp), %rax + ret Index: uspace/lib/c/arch/amd64/src/syscall.S =================================================================== --- uspace/lib/c/arch/amd64/src/syscall.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/src/syscall.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,57 @@ +# +# 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. +# + +.text + +.global __syscall + +## Make a system call. +# +# @param rdi First argument. +# @param rsi Second argument. +# @param rdx Third argument. +# @param rcx Fourth argument. +# @param r8 Fifth argument. +# @param r9 Sixth argument. +# @param 8(%rsp) Syscall number. +# +# @return The return value will be stored in RAX. +# +__syscall: + # + # Move the syscall number into RAX. + movslq 8(%rsp), %rax + + # + # Save RCX, the 4th argument, aside because RCX gets rewritten by the + # SYSCALL instruction. + # + movq %rcx, %r10 + syscall + ret + Index: uspace/lib/c/arch/amd64/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/amd64/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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. +# + +.text + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +__thread_entry: + # + # Create the first stack frame. + # + pushq $0 + movq %rsp, %rbp + + # + # RAX contains address of uarg + # + movq %rax, %rdi + call __thread_main + +.end __thread_entry Index: uspace/lib/c/arch/amd64/src/tls.c =================================================================== --- uspace/lib/c/arch/amd64/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/amd64/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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 amd64 + * @ingroup lc + * @{ + */ +/** @file + * @ingroup libcia32 + */ + +#include +#include + +tcb_t * __alloc_tls(void **data, size_t size) +{ + return tls_alloc_variant_2(data, size); +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + tls_free_variant_2(tcb, size); +} + +/** @} + */ Index: uspace/lib/c/arch/arm32/Makefile.common =================================================================== --- uspace/lib/c/arch/arm32/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,35 @@ +# +# Copyright (c) 2007 Michal Kebrt +# Copyright (c) 2007 Pavel Jancik +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +GCC_CFLAGS += -ffixed-r9 -mtp=soft -mapcs-frame -fno-omit-frame-pointer + +ENDIANESS = LE + +BFD_NAME = elf32-littlearm +BFD_ARCH = arm Index: uspace/lib/c/arch/arm32/Makefile.inc =================================================================== --- uspace/lib/c/arch/arm32/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,40 @@ +# +# Copyright (c) 2007 Michal Kebrt +# Copyright (c) 2007 Pavel Jancik +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/syscall.c \ + arch/$(UARCH)/src/fibril.S \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/eabi.S \ + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/arm32/_link.ld.in =================================================================== --- uspace/lib/c/arch/arm32/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,50 @@ +STARTUP(LIBC_PATH/arch/UARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000 + SIZEOF_HEADERS; + + .init : { + *(.init); + } : text + .text : { + *(.text); + *(.rodata*); + } :text + + . = . + 0x1000; + + .data : { + *(.opd); + *(.data .data.*); + *(.sdata); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { + *(.sbss); + *(.scommon); + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/c/arch/arm32/include/atomic.h =================================================================== --- uspace/lib/c/arch/arm32/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/config.h =================================================================== --- uspace/lib/c/arch/arm32/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/ddi.h =================================================================== --- uspace/lib/c/arch/arm32/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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 pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + return *port; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + return *port; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/arm32/include/faddr.h =================================================================== --- uspace/lib/c/arch/arm32/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/fibril.h =================================================================== --- uspace/lib/c/arch/arm32/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,92 @@ +/* + * 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; + + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/arm32/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,76 @@ +/* + * 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 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_arm32_INTTYPES_H_ +#define LIBC_arm32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/istate.h =================================================================== --- uspace/lib/c/arch/arm32/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,79 @@ +/* + * 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 + * @{ + */ +/** @file + */ + +#ifndef LIBC_arm32__ISTATE_H_ +#define LIBC_arm32__ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t spsr; + uint32_t sp; + uint32_t lr; + + 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 pc; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->pc; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->fp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/limits.h =================================================================== --- uspace/lib/c/arch/arm32/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,52 @@ +/* + * 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 Limits declarations. + */ + +#ifndef LIBC_arm32__LIMITS_H_ +#define LIBC_arm32__LIMITS_H_ + +#define LONG_MIN MIN_INT32 +#define LONG_MAX MAX_INT32 +#define ULONG_MIN MIN_UINT32 +#define ULONG_MAX MAX_UINT32 + +#define SIZE_MIN MIN_UINT32 +#define SIZE_MAX MAX_UINT32 +#define SSIZE_MIN MIN_INT32 +#define SSIZE_MAX MAX_INT32 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/include/stackarg.h =================================================================== --- uspace/lib/c/arch/arm32/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/syscall.h =================================================================== --- uspace/lib/c/arch/arm32/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/thread.h =================================================================== --- uspace/lib/c/arch/arm32/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/tls.h =================================================================== --- uspace/lib/c/arch/arm32/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/types.h =================================================================== --- uspace/lib/c/arch/arm32/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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__ + +typedef unsigned int sysarg_t; + +typedef char int8_t; +typedef short int int16_t; +typedef long int int32_t; +typedef long long int int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned long int uint32_t; +typedef unsigned long long int uint64_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/arm32/src/eabi.S =================================================================== --- uspace/lib/c/arch/arm32/src/eabi.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/src/eabi.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,35 @@ +# +# Copyright (c) 2007 Pavel Jancik +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.global __aeabi_read_tp + +__aeabi_read_tp: + mov r0, r9 + mov pc, lr Index: uspace/lib/c/arch/arm32/src/entry.s =================================================================== --- uspace/lib/c/arch/arm32/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,64 @@ +# +# Copyright (c) 2007 Michal Kebrt, Pavel Jancik +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.section .init, "ax" + +.org 0 + +.global __entry + +## User-space task entry point +# +# r1 contains the PCB pointer +# r2 contains the RAS page address +# +__entry: + # Store the RAS page address into the ras_page variable + ldr r0, =ras_page + str r2, [r0] + + # + # Create the first stack frame. + # + mov fp, #0 + mov ip, sp + push {fp, ip, lr, pc} + sub fp, ip, #4 + + # Pass pcb_ptr to __main as the first argument (in r0) + mov r0, r1 + bl __main + + bl __exit + +.data + +.global ras_page +ras_page: + .long 0 + Index: uspace/lib/c/arch/arm32/src/fibril.S =================================================================== --- uspace/lib/c/arch/arm32/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,49 @@ +# +# 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. +# + +.text + +.global context_save +.global context_restore + +context_save: + stmia r0!, {sp, lr} + stmia r0!, {r4-r11} + + # return 1 + mov r0, #1 + mov pc, lr + +context_restore: + ldmia r0!, {sp, lr} + ldmia r0!, {r4-r11} + + #return 0 + mov r0, #0 + mov pc, lr + Index: uspace/lib/c/arch/arm32/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/arm32/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * 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 arm32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV -12 +#define FRAME_OFFSET_RA -4 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/c/arch/arm32/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/arm32/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,44 @@ +# +# 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. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + mov pc, lr + +stacktrace_fp_get: + mov r0, fp + mov pc, lr + +stacktrace_pc_get: + mov r0, lr + mov pc, lr Index: uspace/lib/c/arch/arm32/src/syscall.c =================================================================== --- uspace/lib/c/arch/arm32/src/syscall.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/src/syscall.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2007 Pavel Jancik + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING 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 Syscall routine. + */ + +#include + + +/** Syscall routine. + * + * Stores p1-p4, id to r0-r4 registers and calls swi + * instruction. Returned value is read from r0 register. + * + * @param p1 Parameter 1. + * @param p2 Parameter 2. + * @param p3 Parameter 3. + * @param p4 Parameter 4. + * @param id Number of syscall. + * + * @return Syscall return value. + */ +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 sysarg_t __arm_reg_r0 asm("r0") = p1; + register sysarg_t __arm_reg_r1 asm("r1") = p2; + register sysarg_t __arm_reg_r2 asm("r2") = p3; + register sysarg_t __arm_reg_r3 asm("r3") = p4; + register sysarg_t __arm_reg_r4 asm("r4") = p5; + register sysarg_t __arm_reg_r5 asm("r5") = p6; + register sysarg_t __arm_reg_r6 asm("r6") = id; + + asm volatile ( + "swi 0" + : "=r" (__arm_reg_r0) + : "r" (__arm_reg_r0), + "r" (__arm_reg_r1), + "r" (__arm_reg_r2), + "r" (__arm_reg_r3), + "r" (__arm_reg_r4), + "r" (__arm_reg_r5), + "r" (__arm_reg_r6) + ); + + return __arm_reg_r0; +} + +/** @} + */ Index: uspace/lib/c/arch/arm32/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/arm32/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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. +# + +.text + +.global __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +__thread_entry: + # + # Create the first stack frame. + # + mov fp, #0 + mov ip, sp + push {fp, ip, lr, pc} + sub fp, ip, #4 + + b __thread_main Index: uspace/lib/c/arch/arm32/src/tls.c =================================================================== --- uspace/lib/c/arch/arm32/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/arm32/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2007 Pavel Jancik + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING 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 arm32 + * @brief arm32 architecture dependent parts of libc + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +tcb_t * __alloc_tls(void **data, size_t size) +{ + return tls_alloc_variant_1(data, size); +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + tls_free_variant_1(tcb, size); +} + +/** @} + */ Index: uspace/lib/c/arch/ia32/Makefile.common =================================================================== --- uspace/lib/c/arch/ia32/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,35 @@ +# +# 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. +# + +CLANG_ARCH = i386 +GCC_CFLAGS += -march=pentium + +ENDIANESS = LE + +BFD_NAME = elf32-i386 +BFD_ARCH = i386 Index: uspace/lib/c/arch/ia32/Makefile.inc =================================================================== --- uspace/lib/c/arch/ia32/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,39 @@ +# +# 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. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/syscall.S \ + arch/$(UARCH)/src/fibril.S \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/setjmp.S \ + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/ia32/_link.ld.in =================================================================== --- uspace/lib/c/arch/ia32/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +STARTUP(LIBC_PATH/arch/UARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000 + SIZEOF_HEADERS; + + .init : { + *(.init); + } :text + + .text : { + *(.text); + *(.rodata*); + } :text + + . = . + 0x1000; + + .data : { + *(.data); + } :data + + .tdata : { + _tdata_start = .; + *(.tdata); + *(.gnu.linkonce.tb.*); + _tdata_end = .; + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + + _tls_alignment = ALIGNOF(.tdata); + + .bss : { + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + + _heap = .; + + /DISCARD/ : { + *(*); + } +} Index: uspace/lib/c/arch/ia32/include/atomic.h =================================================================== --- uspace/lib/c/arch/ia32/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,90 @@ +/* + * 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) +{ + asm volatile ( + "lock incl %[count]\n" + : [count] "+m" (val->count) + ); +} + +static inline void atomic_dec(atomic_t *val) +{ + asm volatile ( + "lock decl %[count]\n" + : [count] "+m" (val->count) + ); +} + +static inline atomic_count_t atomic_postinc(atomic_t *val) +{ + atomic_count_t r = 1; + + asm volatile ( + "lock xaddl %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); + + return r; +} + +static inline atomic_count_t atomic_postdec(atomic_t *val) +{ + atomic_count_t r = -1; + + asm volatile ( + "lock xaddl %[r], %[count]\n" + : [count] "+m" (val->count), + [r] "+r" (r) + ); + + 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/config.h =================================================================== --- uspace/lib/c/arch/ia32/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_CONFIG_H_ +#define LIBC_ia32_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/ddi.h =================================================================== --- uspace/lib/c/arch/ia32/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @file + * @ingroup libcia32, libcamd64 + */ + +#ifndef LIBC_ia32_DDI_H_ +#define LIBC_ia32_DDI_H_ + +#include +#include + +#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + uint8_t val; + + asm volatile ( + "inb %w[port], %b[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + + return val; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + uint16_t val; + + asm volatile ( + "inw %w[port], %w[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + + return val; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + uint32_t val; + + asm volatile ( + "inl %w[port], %[val]\n" + : [val] "=a" (val) + : [port] "d" (port) + ); + + return val; +} + +static inline void pio_write_8(ioport8_t *port, uint8_t val) +{ + asm volatile ( + "outb %b[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); +} + +static inline void pio_write_16(ioport16_t *port, uint16_t val) +{ + asm volatile ( + "outw %w[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); +} + +static inline void pio_write_32(ioport32_t *port, uint32_t val) +{ + asm volatile ( + "outl %[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) + ); +} + +#endif Index: uspace/lib/c/arch/ia32/include/faddr.h =================================================================== --- uspace/lib/c/arch/ia32/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/fibril.h =================================================================== --- uspace/lib/c/arch/ia32/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,72 @@ +/* + * 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; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ia32/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,76 @@ +/* + * 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 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_ia32_INTTYPES_H_ +#define LIBC_ia32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/istate.h =================================================================== --- uspace/lib/c/arch/ia32/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,75 @@ +/* + * 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 debug + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32__ISTATE_H_ +#define LIBC_ia32__ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t eax; + uint32_t ecx; + uint32_t edx; + uint32_t ebp; + + uint32_t gs; + uint32_t fs; + uint32_t es; + uint32_t ds; + + uint32_t error_word; + uint32_t eip; + uint32_t cs; + uint32_t eflags; + uint32_t stack[]; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->eip; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->ebp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/limits.h =================================================================== --- uspace/lib/c/arch/ia32/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32__LIMITS_H_ +#define LIBC_ia32__LIMITS_H_ + +#define LONG_MIN MIN_INT32 +#define LONG_MAX MAX_INT32 +#define ULONG_MIN MIN_UINT32 +#define ULONG_MAX MAX_UINT32 + +#define SIZE_MIN MIN_UINT32 +#define SIZE_MAX MAX_UINT32 +#define SSIZE_MIN MIN_INT32 +#define SSIZE_MAX MAX_INT32 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/include/syscall.h =================================================================== --- uspace/lib/c/arch/ia32/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/thread.h =================================================================== --- uspace/lib/c/arch/ia32/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/tls.h =================================================================== --- uspace/lib/c/arch/ia32/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/types.h =================================================================== --- uspace/lib/c/arch/ia32/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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__ + +typedef unsigned int sysarg_t; + +typedef char int8_t; +typedef short int int16_t; +typedef int int32_t; +typedef long long int int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long int uint64_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia32/src/entry.s =================================================================== --- uspace/lib/c/arch/ia32/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,67 @@ +# +# 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. +# + +INTEL_CPUID_STANDARD = 1 +INTEL_SEP = 11 + +.section .init, "ax" + +.org 0 + +.globl __entry + +## User-space task entry point +# +# %edi contains the PCB pointer +# +__entry: + mov %ss, %ax + mov %ax, %ds + mov %ax, %es + mov %ax, %fs + # Do not set %gs, it contains descriptor that can see TLS + + # Detect the mechanism used for making syscalls + movl $(INTEL_CPUID_STANDARD), %eax + cpuid + bt $(INTEL_SEP), %edx + jnc 0f + leal __syscall_fast_func, %eax + movl $__syscall_fast, (%eax) +0: + # + # Create the first stack frame. + # + pushl $0 + movl %esp, %ebp + + # Pass the PCB pointer to __main as the first argument + pushl %edi + call __main + + call __exit Index: uspace/lib/c/arch/ia32/src/fibril.S =================================================================== --- uspace/lib/c/arch/ia32/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,79 @@ +# +# 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. +# + +#include + +.text + +.global context_save +.global context_restore + + +## Save current CPU context +# +# Save CPU context to the context_t variable +# pointed by the 1st argument. Returns 1 in EAX. +# +context_save: + movl 0(%esp),%eax # the caller's return %eip + movl 4(%esp),%edx # address of the context variable to save context to + + # save registers to the context structure + CONTEXT_SAVE_ARCH_CORE %edx %eax + + # Save TLS + movl %gs:0, %eax + movl %eax, OFFSET_TLS(%edx) # tls -> ctx->tls + + xorl %eax,%eax # context_save returns 1 + incl %eax + ret + + +## Restore saved CPU context +# +# Restore CPU context from context_t variable +# pointed by the 1st argument. Returns 0 in EAX. +# +context_restore: + movl 4(%esp),%eax # address of the context variable to restore context from + + # restore registers from the context structure + CONTEXT_RESTORE_ARCH_CORE %eax %edx + + movl %edx,0(%esp) # ctx->pc -> saver's return %eip + + # Set thread local storage + pushl %edx + movl OFFSET_TLS(%eax), %edx # Set arg1 to TLS addr + movl $1, %eax # Syscall SYS_TLS_SET + int $0x30 + popl %edx + + xorl %eax,%eax # context_restore returns 0 + ret Index: uspace/lib/c/arch/ia32/src/setjmp.S =================================================================== --- uspace/lib/c/arch/ia32/src/setjmp.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/src/setjmp.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,57 @@ +# +# Copyright (c) 2008 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. +# + +#include + +.text +.global setjmp +.global longjmp + +.type setjmp,@function +setjmp: + movl 0(%esp),%eax # save pc value into eax + movl 4(%esp),%edx # address of the jmp_buf structure to save context to + + # save registers to the jmp_buf structure + CONTEXT_SAVE_ARCH_CORE %edx %eax + + xorl %eax,%eax # set_jmp returns 0 + ret + +.type longjmp,@function +longjmp: + + movl 4(%esp), %ecx # put address of jmp_buf into ecx + movl 8(%esp), %eax # put return value into eax + + # restore registers from the jmp_buf structure + CONTEXT_RESTORE_ARCH_CORE %ecx %edx + + movl %edx,0(%esp) # put saved pc on stack + ret + Index: uspace/lib/c/arch/ia32/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/ia32/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * 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 ia32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 4 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/c/arch/ia32/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/ia32/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,44 @@ +# +# 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. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + ret + +stacktrace_fp_get: + movl %ebp, %eax + ret + +stacktrace_pc_get: + movl (%esp), %eax + ret Index: uspace/lib/c/arch/ia32/src/syscall.S =================================================================== --- uspace/lib/c/arch/ia32/src/syscall.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/src/syscall.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,96 @@ +# +# Copyright (c) 2007 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. +# + +.data + +.global __syscall_fast_func +__syscall_fast_func: + .long __syscall_slow + +.text + +/** Syscall wrapper - INT $0x30 version. + * + * Mind the order of arguments. First two arguments and the syscall number go to + * scratch registers. An optimized version of this wrapper for fewer arguments + * could benefit from this and not save unused registers on the stack. + */ +.global __syscall_slow +__syscall_slow: + pushl %ebx + pushl %esi + pushl %edi + pushl %ebp + movl 20(%esp), %edx # First argument. + movl 24(%esp), %ecx # Second argument. + movl 28(%esp), %ebx # Third argument. + movl 32(%esp), %esi # Fourth argument. + movl 36(%esp), %edi # Fifth argument. + movl 40(%esp), %ebp # Sixth argument. + movl 44(%esp), %eax # Syscall number. + int $0x30 + popl %ebp + popl %edi + popl %esi + popl %ebx + ret + + +/** Syscall wrapper - SYSENTER version. + * + * This is an optimized version of syscall for four or less arguments. Note + * that EBP and EDI are used to remember user stack address and the return + * address. The kernel part doesn't save DS, ES and FS so the handler restores + * these to the selector immediately following CS (it must be the flat data + * segment, otherwise the SYSENTER wouldn't work in the first place). + */ +.global __syscall_fast +__syscall_fast: + pushl %ebx + pushl %esi + pushl %edi + pushl %ebp + mov %esp, %ebp + lea ra, %edi + movl 20(%esp), %edx # First argument. + movl 24(%esp), %ecx # Second argument. + movl 28(%esp), %ebx # Third argument. + movl 32(%esp), %esi # Fourth argument. + movl 44(%esp), %eax # Syscall number. + sysenter +ra: + movw %cs, %cx + addw $8, %cx + movw %cx, %ds + movw %cx, %es + movw %cx, %fs + popl %ebp + popl %edi + popl %esi + popl %ebx + ret Index: uspace/lib/c/arch/ia32/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/ia32/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,59 @@ +# +# 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. +# + +.text + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +__thread_entry: + mov %ss, %dx + mov %dx, %ds + mov %dx, %es + mov %dx, %fs + # Do not set %gs, it contains descriptor that can see TLS + + # + # Create the first stack frame. + # + pushl $0 + mov %esp, %ebp + + # + # EAX contains address of uarg. + # + pushl %eax + call __thread_main + + # + # Not reached. + # + +.end __thread_entry Index: uspace/lib/c/arch/ia32/src/tls.c =================================================================== --- uspace/lib/c/arch/ia32/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia32/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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 amd64 + * @ingroup lc + * @{ + */ +/** @file + * @ingroup libcia32 + */ + +#include +#include + +tcb_t * __alloc_tls(void **data, size_t size) +{ + return tls_alloc_variant_2(data, size); +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + tls_free_variant_2(tcb, size); +} + +/** @} + */ Index: uspace/lib/c/arch/ia64/Makefile.common =================================================================== --- uspace/lib/c/arch/ia64/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,34 @@ +# +# 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. +# + +GCC_CFLAGS += -fno-unwind-tables + +ENDIANESS = LE + +BFD_NAME = elf64-ia64-little +BFD_ARCH = ia64-elf64 Index: uspace/lib/c/arch/ia64/Makefile.inc =================================================================== --- uspace/lib/c/arch/ia64/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,39 @@ +# +# 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. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/syscall.S \ + arch/$(UARCH)/src/fibril.S \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/ddi.c \ + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/ia64/_link.ld.in =================================================================== --- uspace/lib/c/arch/ia64/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,53 @@ +STARTUP(LIBC_PATH/arch/UARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x4000 + SIZEOF_HEADERS; + + .init : { + *(.init); + } : text + .text : { + *(.text); + *(.rodata*); + } :text + + . = . + 0x4000; + + .got : { + _gp = .; + *(.got*); + } :data + .data : { + *(.opd); + *(.data .data.*); + *(.sdata); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { + *(.sbss); + *(.scommon); + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x4000); + _heap = .; + + /DISCARD/ : { + *(*); + } +} Index: uspace/lib/c/arch/ia64/include/atomic.h =================================================================== --- uspace/lib/c/arch/ia64/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/config.h =================================================================== --- uspace/lib/c/arch/ia64/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/ddi.h =================================================================== --- uspace/lib/c/arch/ia64/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,115 @@ +/* + * 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 pio_write_8(ioport8_t *port, uint8_t v) +{ + uintptr_t prt = (uintptr_t) port; + + *((ioport8_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + + asm volatile ("mf\n" ::: "memory"); +} + +static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + uintptr_t prt = (uintptr_t) port; + + *((ioport16_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + + asm volatile ("mf\n" ::: "memory"); +} + +static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + uintptr_t prt = (uintptr_t) port; + + *((ioport32_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))) = v; + + asm volatile ("mf\n" ::: "memory"); +} + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + uintptr_t prt = (uintptr_t) port; + + asm volatile ("mf\n" ::: "memory"); + + return *((ioport8_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + uintptr_t prt = (uintptr_t) port; + + asm volatile ("mf\n" ::: "memory"); + + return *((ioport16_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + uintptr_t prt = (uintptr_t) port; + + asm volatile ("mf\n" ::: "memory"); + + return *((ioport32_t *)(IA64_IOSPACE_ADDRESS + + ((prt & 0xfff) | ((prt >> 2) << 12)))); +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/faddr.h =================================================================== --- uspace/lib/c/arch/ia64/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/fibril.h =================================================================== --- uspace/lib/c/arch/ia64/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,135 @@ +/* + * 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) + +#define PSTHREAD_INITIAL_STACK_PAGES_NO 2 +/* Stack is divided into two equal parts (for memory stack and register stack). */ +#define PSTHREAD_INITIAL_STACK_DIVISION 2 + +#define context_set(c, _pc, stack, size, tls) \ + do { \ + (c)->pc = (uint64_t) _pc; \ + (c)->bsp = ((uint64_t) stack) + size / PSTHREAD_INITIAL_STACK_DIVISION; \ + (c)->ar_pfs &= PFM_MASK; \ + (c)->sp = ((uint64_t) stack) + ALIGN_UP((size / PSTHREAD_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; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ia64/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,76 @@ +/* + * 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 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_ia64_INTTYPES_H_ +#define LIBC_ia64_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "ld" +#define PRIdPTR "ld" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "lo" +#define PRIoPTR "lo" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "lu" +#define PRIuPTR "lu" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "lx" +#define PRIxPTR "lx" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "lX" +#define PRIXPTR "lX" + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/istate.h =================================================================== --- uspace/lib/c/arch/ia64/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,63 @@ +/* + * 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 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_ISTATE_H_ +#define LIBC_ia64_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + /* TODO */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + /* TODO */ + return 0; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/limits.h =================================================================== --- uspace/lib/c/arch/ia64/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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_ia64_LIMITS_H_ +#define LIBC_ia64_LIMITS_H_ + +#define LONG_MIN MIN_INT64 +#define LONG_MAX MAX_INT64 +#define ULONG_MIN MIN_UINT64 +#define ULONG_MAX MAX_UINT64 + +#define SIZE_MIN MIN_UINT64 +#define SIZE_MAX MAX_UINT64 +#define SSIZE_MIN MIN_INT64 +#define SSIZE_MAX MAX_INT64 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/stack.h =================================================================== --- uspace/lib/c/arch/ia64/include/stack.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/stack.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/stackarg.h =================================================================== --- uspace/lib/c/arch/ia64/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/syscall.h =================================================================== --- uspace/lib/c/arch/ia64/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/thread.h =================================================================== --- uspace/lib/c/arch/ia64/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,43 @@ +/* + * 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_ + +#define THREAD_INITIAL_STACK_PAGES_NO 2 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ia64/include/tls.h =================================================================== --- uspace/lib/c/arch/ia64/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/types.h =================================================================== --- uspace/lib/c/arch/ia64/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,72 @@ +/* + * 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__ + +typedef unsigned long sysarg_t; + +typedef char int8_t; +typedef short int int16_t; +typedef int int32_t; +typedef long int int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long int uint64_t; + +typedef struct { + uint64_t lo; + uint64_t hi; +} uint128_t; + +typedef int64_t ssize_t; +typedef uint64_t size_t; + +typedef uint64_t uintptr_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/src/ddi.c =================================================================== --- uspace/lib/c/arch/ia64/src/ddi.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/src/ddi.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,13 @@ +#include +#include + +uint64_t ia64_iospace_address=0; + + +uint64_t get_ia64_iospace_address(void) +{ + + return sysinfo_value("ia64_iospace.address.virtual"); + +} + Index: uspace/lib/c/arch/ia64/src/entry.s =================================================================== --- uspace/lib/c/arch/ia64/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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. +# + +.section .init, "ax" + +.org 0 + +.globl __entry + +## User-space task entry point +# +# r2 contains the PCB pointer +# +__entry: + alloc loc0 = ar.pfs, 0, 1, 2, 0 + movl r1 = _gp + + # Pass PCB pointer as the first argument to __main + mov out0 = r2 + br.call.sptk.many b0 = __main +0: + br.call.sptk.many b0 = __exit Index: uspace/lib/c/arch/ia64/src/fibril.S =================================================================== --- uspace/lib/c/arch/ia64/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,246 @@ +# +# 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. +# + +.text + +.global context_save +.global context_restore + +context_save: + alloc loc0 = ar.pfs, 1, 8, 0, 0 + mov loc1 = ar.unat ;; + /* loc2 */ + mov loc3 = ar.rsc + + .auto + + /* + * Flush dirty registers to backing store. + * After this ar.bsp and ar.bspstore are equal. + */ + flushrs + mov loc4 = ar.bsp + + /* + * Put RSE to enforced lazy mode. + * So that ar.rnat can be read. + */ + and loc5 = ~3, loc3 + mov ar.rsc = loc5 + mov loc5 = ar.rnat + + .explicit + + mov loc6 = ar.lc + + /* + * Save application registers + */ + st8 [in0] = loc0, 8 ;; /* save ar.pfs */ + st8 [in0] = loc1, 8 ;; /* save ar.unat (caller) */ + mov loc2 = in0 ;; + add in0 = 8, in0 ;; /* skip ar.unat (callee) */ + st8 [in0] = loc3, 8 ;; /* save ar.rsc */ + st8 [in0] = loc4, 8 ;; /* save ar.bsp */ + st8 [in0] = loc5, 8 ;; /* save ar.rnat */ + st8 [in0] = loc6, 8 ;; /* save ar.lc */ + + /* + * Save general registers including NaT bits + */ + st8.spill [in0] = r1, 8 ;; + st8.spill [in0] = r4, 8 ;; + st8.spill [in0] = r5, 8 ;; + st8.spill [in0] = r6, 8 ;; + st8.spill [in0] = r7, 8 ;; + st8.spill [in0] = r12, 8 ;; /* save sp */ + st8.spill [in0] = r13, 8 ;; /* save tp */ + + mov loc3 = ar.unat ;; + st8 [loc2] = loc3 /* save ar.unat (callee) */ + + /* + * Save branch registers + */ + mov loc2 = b0 ;; + st8 [in0] = loc2, 8 /* save pc */ + mov loc3 = b1 ;; + st8 [in0] = loc3, 8 + mov loc4 = b2 ;; + st8 [in0] = loc4, 8 + mov loc5 = b3 ;; + st8 [in0] = loc5, 8 + mov loc6 = b4 ;; + st8 [in0] = loc6, 8 + mov loc7 = b5 ;; + st8 [in0] = loc7, 8 + + /* + * Save predicate registers + */ + mov loc2 = pr ;; + st8 [in0] = loc2, 16;; /* Next fpu registers should be spilled to 16B aligned address */ + + /* + * Save floating-point registers. + */ + stf.spill [in0] = f2, 16 ;; + stf.spill [in0] = f3, 16 ;; + stf.spill [in0] = f4, 16 ;; + stf.spill [in0] = f5, 16 ;; + + stf.spill [in0] = f16, 16 ;; + stf.spill [in0] = f17, 16 ;; + stf.spill [in0] = f18, 16 ;; + stf.spill [in0] = f19, 16 ;; + stf.spill [in0] = f20, 16 ;; + stf.spill [in0] = f21, 16 ;; + stf.spill [in0] = f22, 16 ;; + stf.spill [in0] = f23, 16 ;; + stf.spill [in0] = f24, 16 ;; + stf.spill [in0] = f25, 16 ;; + stf.spill [in0] = f26, 16 ;; + stf.spill [in0] = f27, 16 ;; + stf.spill [in0] = f28, 16 ;; + stf.spill [in0] = f29, 16 ;; + stf.spill [in0] = f30, 16 ;; + stf.spill [in0] = f31, 16 ;; + + mov ar.unat = loc1 + + add r8 = r0, r0, 1 /* context_save returns 1 */ + br.ret.sptk.many b0 + +context_restore: + alloc loc0 = ar.pfs, 1, 9, 0, 0 ;; + + ld8 loc0 = [in0], 8 ;; /* load ar.pfs */ + ld8 loc1 = [in0], 8 ;; /* load ar.unat (caller) */ + ld8 loc2 = [in0], 8 ;; /* load ar.unat (callee) */ + ld8 loc3 = [in0], 8 ;; /* load ar.rsc */ + ld8 loc4 = [in0], 8 ;; /* load ar.bsp */ + ld8 loc5 = [in0], 8 ;; /* load ar.rnat */ + ld8 loc6 = [in0], 8 ;; /* load ar.lc */ + + .auto + + /* + * Invalidate the ALAT + */ + invala + + /* + * Put RSE to enforced lazy mode. + * So that ar.bspstore and ar.rnat can be written. + */ + movl loc8 = ~3 + and loc8 = loc3, loc8 + mov ar.rsc = loc8 + + /* + * Flush dirty registers to backing store. + * We do this because we want the following move + * to ar.bspstore to assign the same value to ar.bsp. + */ + flushrs + + /* + * Restore application registers + */ + mov ar.bspstore = loc4 /* rse.bspload = ar.bsp = ar.bspstore = loc4 */ + mov ar.rnat = loc5 + mov ar.pfs = loc0 + mov ar.rsc = loc3 + + .explicit + + mov ar.unat = loc2 ;; + mov ar.lc = loc6 + + /* + * Restore general registers including NaT bits + */ + ld8.fill r1 = [in0], 8 ;; + ld8.fill r4 = [in0], 8 ;; + ld8.fill r5 = [in0], 8 ;; + ld8.fill r6 = [in0], 8 ;; + ld8.fill r7 = [in0], 8 ;; + ld8.fill r12 = [in0], 8 ;; /* restore sp */ + ld8.fill r13 = [in0], 8 ;; + + /* + * Restore branch registers + */ + ld8 loc2 = [in0], 8 ;; /* restore pc */ + mov b0 = loc2 + ld8 loc3 = [in0], 8 ;; + mov b1 = loc3 + ld8 loc4 = [in0], 8 ;; + mov b2 = loc4 + ld8 loc5 = [in0], 8 ;; + mov b3 = loc5 + ld8 loc6 = [in0], 8 ;; + mov b4 = loc6 + ld8 loc7 = [in0], 8 ;; + mov b5 = loc7 + + /* + * Restore predicate registers + */ + ld8 loc2 = [in0], 16 ;; + mov pr = loc2, ~0 + + /* + * Restore floating-point registers. + */ + ldf.fill f2 = [in0], 16 ;; + ldf.fill f3 = [in0], 16 ;; + ldf.fill f4 = [in0], 16 ;; + ldf.fill f5 = [in0], 16 ;; + + ldf.fill f16 = [in0], 16 ;; + ldf.fill f17 = [in0], 16 ;; + ldf.fill f18 = [in0], 16 ;; + ldf.fill f19 = [in0], 16 ;; + ldf.fill f20 = [in0], 16 ;; + ldf.fill f21 = [in0], 16 ;; + ldf.fill f22 = [in0], 16 ;; + ldf.fill f23 = [in0], 16 ;; + ldf.fill f24 = [in0], 16 ;; + ldf.fill f25 = [in0], 16 ;; + ldf.fill f26 = [in0], 16 ;; + ldf.fill f27 = [in0], 16 ;; + ldf.fill f28 = [in0], 16 ;; + ldf.fill f29 = [in0], 16 ;; + ldf.fill f30 = [in0], 16 ;; + ldf.fill f31 = [in0], 16 ;; + + mov ar.unat = loc1 + + mov r8 = r0 /* context_restore returns 0 */ + br.ret.sptk.many b0 Index: uspace/lib/c/arch/ia64/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/ia64/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * 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 libcia64 ia64 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include +#include + +#include + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; (void) fp; + return false; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + (void) st; (void) fp; (void) prev; + return ENOTSUP; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + (void) st; (void) fp; (void) ra; + return ENOTSUP; +} + +/** @} + */ Index: uspace/lib/c/arch/ia64/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/ia64/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,41 @@ +# +# 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. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + br.ret.sptk.many b0 + +stacktrace_fp_get: +stacktrace_pc_get: + mov r8 = r0 + br.ret.sptk.many b0 Index: uspace/lib/c/arch/ia64/src/syscall.S =================================================================== --- uspace/lib/c/arch/ia64/src/syscall.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/src/syscall.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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. +# + +/** + * Immediate operand for break instruction. + * Be carefull about the value as Ski simulator + * is somewhat sensitive to its value. + * + * 0 will be confused with Ski breakpoint. + * And higher values will be confused with SSC's. + */ +#define SYSCALL_IMM 1 + +.global __syscall +__syscall: + alloc r14 = ar.pfs, 7, 0, 0, 0 ;; + break SYSCALL_IMM + mov ar.pfs = r14 ;; + br.ret.sptk.many b0 Index: uspace/lib/c/arch/ia64/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/ia64/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,52 @@ +# +# 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. +# + +.text + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +__thread_entry: + alloc loc0 = ar.pfs, 0, 1, 1, 0 + + movl r1 = _gp + + # + # r8 contains address of uarg structure. + # + + mov out0 = r8 + br.call.sptk.many b0 = __thread_main + + # + # Not reached. + # + +.end __thread_entry Index: uspace/lib/c/arch/ia64/src/tls.c =================================================================== --- uspace/lib/c/arch/ia64/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ia64/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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 ia64 + * @brief ia64 architecture dependent parts of libc + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +tcb_t * __alloc_tls(void **data, size_t size) +{ + return tls_alloc_variant_1(data, size); +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + tls_free_variant_1(tcb, size); +} + +/** @} + */ Index: uspace/lib/c/arch/mips32/Makefile.common =================================================================== --- uspace/lib/c/arch/mips32/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,34 @@ +# +# 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. +# + +GCC_CFLAGS += -mips3 + +ENDIANESS = LE + +BFD_ARCH = mips +BFD_NAME = elf32-tradlittlemips Index: uspace/lib/c/arch/mips32/Makefile.inc =================================================================== --- uspace/lib/c/arch/mips32/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,38 @@ +# +# 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. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/syscall.c \ + arch/$(UARCH)/src/fibril.S \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/mips32/_link.ld.in =================================================================== --- uspace/lib/c/arch/mips32/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,57 @@ +STARTUP(LIBC_PATH/arch/UARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x4000 + SIZEOF_HEADERS; + + .init : { + *(.init); + } :text + .text : { + *(.text); + *(.rodata*); + } :text + + . = . + 0x4000; + + .data : { + *(.data); + *(.data.rel*); + } :data + + .got : { + _gp = .; + *(.got); + } :data + + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + _tls_alignment = ALIGNOF(.tdata); + + .sbss : { + *(.scommon); + *(.sbss); + } + .bss : { + *(.bss); + *(COMMON); + } :data + + . = ALIGN(0x4000); + _heap = .; + + /DISCARD/ : { + *(*); + } +} Index: uspace/lib/c/arch/mips32/include/atomic.h =================================================================== --- uspace/lib/c/arch/mips32/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,87 @@ +/* + * 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 libcmips32eb + */ + +#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 */ /* nop is inserted automatically by compiler */ + " nop\n" + : "=&r" (tmp), + "+m" (val->count), + "=&r" (v) + : "r" (i), + "i" (0) + ); + + return v; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/config.h =================================================================== --- uspace/lib/c/arch/mips32/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/ddi.h =================================================================== --- uspace/lib/c/arch/mips32/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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 pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + return *port; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + return *port; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/mips32/include/faddr.h =================================================================== --- uspace/lib/c/arch/mips32/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/fibril.h =================================================================== --- uspace/lib/c/arch/mips32/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,90 @@ +/* + * 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 libcmips32eb + */ + +#ifndef LIBC_mips32_FIBRIL_H_ +#define LIBC_mips32_FIBRIL_H_ + +#include + +/* 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) \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = ((sysarg_t)(ptls)) + 0x7000 + sizeof(tcb_t); + + +/* +16 is just for sure that the called function + * have space to store it's arguments + */ +#define SP_DELTA (8+16) + +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; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/mips32/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,76 @@ +/* + * 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 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_mips32_INTTYPES_H_ +#define LIBC_mips32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "x" + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/istate.h =================================================================== --- uspace/lib/c/arch/mips32/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,88 @@ +/* + * 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 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips32__ISTATE_H_ +#define LIBC_mips32__ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t at; + uint32_t v0; + uint32_t v1; + uint32_t a0; + uint32_t a1; + uint32_t a2; + uint32_t a3; + uint32_t t0; + uint32_t t1; + uint32_t t2; + uint32_t t3; + uint32_t t4; + uint32_t t5; + uint32_t t6; + uint32_t t7; + uint32_t t8; + uint32_t t9; + uint32_t gp; + uint32_t sp; + uint32_t ra; + + uint32_t lo; + uint32_t hi; + + uint32_t status; /* cp0_status */ + uint32_t epc; /* cp0_epc */ + uint32_t k1; /* We use it as thread-local pointer */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->epc; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/limits.h =================================================================== --- uspace/lib/c/arch/mips32/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,52 @@ +/* + * 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 libcmips32 + * @{ + */ +/** @file + * @ingroup libcmips32eb + */ + +#ifndef LIBC_mips32__LIMITS_H_ +#define LIBC_mips32__LIMITS_H_ + +#define LONG_MIN MIN_INT32 +#define LONG_MAX MAX_INT32 +#define ULONG_MIN MIN_UINT32 +#define ULONG_MAX MAX_UINT32 + +#define SIZE_MIN MIN_UINT32 +#define SIZE_MAX MAX_UINT32 +#define SSIZE_MIN MIN_INT32 +#define SSIZE_MAX MAX_INT32 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/include/syscall.h =================================================================== --- uspace/lib/c/arch/mips32/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/thread.h =================================================================== --- uspace/lib/c/arch/mips32/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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 libcmips32eb + */ + +#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 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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 libcmips32eb + */ + +/* 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 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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 libcmips32eb + */ + +#ifndef LIBC_mips32_TYPES_H_ +#define LIBC_mips32_TYPES_H_ + +#define __32_BITS__ + +typedef unsigned int sysarg_t; + +typedef char int8_t; +typedef short int int16_t; +typedef long int int32_t; +typedef long long int int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned long int uint32_t; +typedef unsigned long long int uint64_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips32/src/entry.s =================================================================== --- uspace/lib/c/arch/mips32/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,65 @@ +# +# 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. +# + +.text +.section .init, "ax" +.global __entry +.global __entry_driver +.set noreorder +.option pic2 + +## User-space task entry point +# +# $a0 ($4) contains the PCB pointer +# +.ent __entry +__entry: + .frame $sp, 32, $31 + .cpload $25 + + # Mips o32 may store its arguments on stack, make space (16 bytes), + # so that it could work with -O0 + # Make space additional 16 bytes for the stack frame + + addiu $sp, -32 + .cprestore 16 # Allow PIC code + + # Pass pcb_ptr to __main() as the first argument. pcb_ptr is already + # in $a0. As the first argument is passed in $a0, no operation + # is needed. + + jal __main + nop + + jal __exit + nop +.end + +# Alignment of output section data to 0x4000 +.section .data +.align 14 Index: uspace/lib/c/arch/mips32/src/fibril.S =================================================================== --- uspace/lib/c/arch/mips32/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,55 @@ +# +# Copyright (c) 2003-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. +# + +.text + +.set noat +.set noreorder + +#include + +.global context_save +.global context_restore + +context_save: + CONTEXT_SAVE_ARCH_CORE $a0 + + # context_save returns 1 + j $ra + li $v0, 1 + +context_restore: + CONTEXT_RESTORE_ARCH_CORE $a0 + + # Just for the jump into first function, but one instruction + # should not bother us + move $t9, $ra + # context_restore returns 0 + j $ra + xor $v0, $v0 + Index: uspace/lib/c/arch/mips32/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/mips32/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * 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 mips32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include +#include + +#include + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; (void) fp; + return false; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + (void) st; (void) fp; (void) prev; + return ENOTSUP; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + (void) st; (void) fp; (void) ra; + return ENOTSUP; +} + +/** @} + */ Index: uspace/lib/c/arch/mips32/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/mips32/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,42 @@ +# +# 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. +# + +.text + +.set noat +.set noreorder + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: +stacktrace_fp_get: +stacktrace_pc_get: + j $ra + xor $v0, $v0 Index: uspace/lib/c/arch/mips32/src/syscall.c =================================================================== --- uspace/lib/c/arch/mips32/src/syscall.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/src/syscall.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,68 @@ +/* + * 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 libcmips32eb + */ + +#include + +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 sysarg_t __mips_reg_a0 asm("$4") = p1; + register sysarg_t __mips_reg_a1 asm("$5") = p2; + register sysarg_t __mips_reg_a2 asm("$6") = p3; + register sysarg_t __mips_reg_a3 asm("$7") = p4; + register sysarg_t __mips_reg_t0 asm("$8") = p5; + register sysarg_t __mips_reg_t1 asm("$9") = p6; + register sysarg_t __mips_reg_v0 asm("$2") = id; + + asm volatile ( + "syscall\n" + : "=r" (__mips_reg_v0) + : "r" (__mips_reg_a0), + "r" (__mips_reg_a1), + "r" (__mips_reg_a2), + "r" (__mips_reg_a3), + "r" (__mips_reg_t0), + "r" (__mips_reg_t1), + "r" (__mips_reg_v0) + : "%ra" /* We are a function call, although C does not + * know it */ + ); + + return __mips_reg_v0; +} + + /** @} + */ + Index: uspace/lib/c/arch/mips32/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/mips32/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,59 @@ +# +# 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. +# + +.text + +.set noat +.set noreorder +.option pic2 + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +.ent __thread_entry +__thread_entry: + .frame $sp, 32, $31 + .cpload $25 + + # + # v0 contains address of uarg. + # + add $4, $2, 0 + # Mips o32 may store its arguments on stack, make space + addiu $sp, -32 + .cprestore 16 + + jal __thread_main + nop + + # + # Not reached. + # +.end __thread_entry Index: uspace/lib/c/arch/mips32/src/tls.c =================================================================== --- uspace/lib/c/arch/mips32/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,50 @@ +/* + * 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 libcmips32eb + */ + +#include +#include + +tcb_t * __alloc_tls(void **data, size_t size) +{ + return tls_alloc_variant_1(data, size); +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + tls_free_variant_1(tcb, size); +} + +/** @} + */ Index: uspace/lib/c/arch/mips32eb/Makefile.common =================================================================== --- uspace/lib/c/arch/mips32eb/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,34 @@ +# +# 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. +# + +GCC_CFLAGS += -mips3 + +ENDIANESS = BE + +BFD_ARCH = mips +BFD_NAME = elf32-tradbigmips Index: uspace/lib/c/arch/mips32eb/Makefile.inc =================================================================== --- uspace/lib/c/arch/mips32eb/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,38 @@ +# +# 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. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/syscall.c \ + arch/$(UARCH)/src/fibril.S \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/mips32eb/_link.ld.in =================================================================== --- uspace/lib/c/arch/mips32eb/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../mips32/_link.ld.in Index: uspace/lib/c/arch/mips32eb/include/atomic.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/atomic.h Index: uspace/lib/c/arch/mips32eb/include/config.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/config.h Index: uspace/lib/c/arch/mips32eb/include/ddi.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/ddi.h Index: uspace/lib/c/arch/mips32eb/include/faddr.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/faddr.h Index: uspace/lib/c/arch/mips32eb/include/fibril.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/fibril.h Index: uspace/lib/c/arch/mips32eb/include/inttypes.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/inttypes.h Index: uspace/lib/c/arch/mips32eb/include/istate.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/istate.h Index: uspace/lib/c/arch/mips32eb/include/limits.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/limits.h Index: uspace/lib/c/arch/mips32eb/include/syscall.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/syscall.h Index: uspace/lib/c/arch/mips32eb/include/thread.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/thread.h Index: uspace/lib/c/arch/mips32eb/include/tls.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/tls.h Index: uspace/lib/c/arch/mips32eb/include/types.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../../mips32/include/types.h Index: uspace/lib/c/arch/mips32eb/src =================================================================== --- uspace/lib/c/arch/mips32eb/src (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/mips32eb/src (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,1 @@ +../mips32/src Index: uspace/lib/c/arch/ppc32/Makefile.common =================================================================== --- uspace/lib/c/arch/ppc32/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,35 @@ +# +# 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. +# + +GCC_CFLAGS += -mcpu=powerpc -msoft-float -m32 +AFLAGS = -a32 + +ENDIANESS = BE + +BFD_NAME = elf32-powerpc +BFD_ARCH = powerpc:common Index: uspace/lib/c/arch/ppc32/Makefile.inc =================================================================== --- uspace/lib/c/arch/ppc32/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,38 @@ +# +# 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. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/syscall.c \ + arch/$(UARCH)/src/fibril.S \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/ppc32/_link.ld.in =================================================================== --- uspace/lib/c/arch/ppc32/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,48 @@ +STARTUP(LIBC_PATH/arch/UARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000 + SIZEOF_HEADERS; + + .init : { + *(.init); + } :text + .text : { + *(.text); + *(.rodata*); + } :text + + . = . + 0x1000; + + .data : { + *(.data); + *(.sdata); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { + *(.sbss); + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/c/arch/ppc32/include/atomic.h =================================================================== --- uspace/lib/c/arch/ppc32/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/config.h =================================================================== --- uspace/lib/c/arch/ppc32/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/ddi.h =================================================================== --- uspace/lib/c/arch/ppc32/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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 pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; +} + +static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; +} + +static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; +} + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + return *port; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + return *port; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + return *port; +} + +#endif Index: uspace/lib/c/arch/ppc32/include/faddr.h =================================================================== --- uspace/lib/c/arch/ppc32/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/fibril.h =================================================================== --- uspace/lib/c/arch/ppc32/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,83 @@ +/* + * 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 + +/* 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) \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = ((sysarg_t) (ptls)) + 0x7000 + sizeof(tcb_t); + +#define SP_DELTA 16 + +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; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/inttypes.h =================================================================== --- uspace/lib/c/arch/ppc32/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,76 @@ +/* + * 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 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_ppc32_INTTYPES_H_ +#define LIBC_ppc32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/istate.h =================================================================== --- uspace/lib/c/arch/ppc32/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,99 @@ +/* + * 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 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_ISTATE_H_ +#define LIBC_ppc32_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t r0; + 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 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; + uint32_t pc; + uint32_t srr1; + uint32_t lr; + uint32_t ctr; + uint32_t xer; + uint32_t dar; + uint32_t r12; + uint32_t sp; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->pc; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->sp; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/limits.h =================================================================== --- uspace/lib/c/arch/ppc32/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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_ppc32_LIMITS_H_ +#define LIBC_ppc32_LIMITS_H_ + +#define LONG_MIN MIN_INT32 +#define LONG_MAX MAX_INT32 +#define ULONG_MIN MIN_UINT32 +#define ULONG_MAX MAX_UINT32 + +#define SIZE_MIN MIN_UINT32 +#define SIZE_MAX MAX_UINT32 +#define SSIZE_MIN MIN_INT32 +#define SSIZE_MAX MAX_INT32 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/ppc32/include/regname.h =================================================================== --- uspace/lib/c/arch/ppc32/include/regname.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/regname.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/stackarg.h =================================================================== --- uspace/lib/c/arch/ppc32/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/syscall.h =================================================================== --- uspace/lib/c/arch/ppc32/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/thread.h =================================================================== --- uspace/lib/c/arch/ppc32/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/tls.h =================================================================== --- uspace/lib/c/arch/ppc32/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/types.h =================================================================== --- uspace/lib/c/arch/ppc32/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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__ + +typedef unsigned int sysarg_t; + +typedef char int8_t; +typedef short int int16_t; +typedef int int32_t; +typedef long long int int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long int uint64_t; + +typedef int32_t ssize_t; +typedef uint32_t size_t; + +typedef uint32_t uintptr_t; +typedef uint32_t atomic_count_t; +typedef int32_t atomic_signed_t; + +#endif + +/** @} + */ + Index: uspace/lib/c/arch/ppc32/src/entry.s =================================================================== --- uspace/lib/c/arch/ppc32/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,52 @@ +# +# 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. +# + +.section .init, "ax" + +.org 0 + +.globl __entry + +## User-space task entry point +# +# r6 contains the PCB pointer +# +__entry: + # + # Create the first stack frame. + # + li %r3, 0 + stw %r3, 0(%r1) + stwu %r1, -16(%r1) + + # Pass the PCB pointer to __main() as the first argument. + # The first argument is passed in r3. + mr %r3, %r6 + bl __main + + bl __exit Index: uspace/lib/c/arch/ppc32/src/fibril.S =================================================================== --- uspace/lib/c/arch/ppc32/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,62 @@ +# +# 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. +# + +.text + +.global context_save +.global context_restore + +#include +#include + +context_save: + CONTEXT_SAVE_ARCH_CORE r3 + + mflr r4 + stw r4, OFFSET_PC(r3) + + mfcr r4 + stw r4, OFFSET_CR(r3) + + # context_save returns 1 + li r3, 1 + blr + + +context_restore: + CONTEXT_RESTORE_ARCH_CORE r3 + + lwz r4, OFFSET_CR(r3) + mtcr r4 + + lwz r4, OFFSET_PC(r3) + mtlr r4 + + # context_restore returns 0 + li r3, 0 + blr Index: uspace/lib/c/arch/ppc32/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/ppc32/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * 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 ppc32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 4 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/c/arch/ppc32/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/ppc32/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,46 @@ +# +# 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. +# + +.text + +#include + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + blr + +stacktrace_fp_get: + mr r3, sp + blr + +stacktrace_pc_get: + mflr r3 + blr Index: uspace/lib/c/arch/ppc32/src/syscall.c =================================================================== --- uspace/lib/c/arch/ppc32/src/syscall.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/src/syscall.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,66 @@ +/* + * 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 ppc32 + * @brief ppc32 architecture dependent parts of libc + * @ingroup lc + * @{ + */ +/** @file + */ + +#include + +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 sysarg_t __ppc32_reg_r3 asm("3") = p1; + register sysarg_t __ppc32_reg_r4 asm("4") = p2; + register sysarg_t __ppc32_reg_r5 asm("5") = p3; + register sysarg_t __ppc32_reg_r6 asm("6") = p4; + register sysarg_t __ppc32_reg_r7 asm("7") = p5; + register sysarg_t __ppc32_reg_r8 asm("8") = p6; + register sysarg_t __ppc32_reg_r9 asm("9") = id; + + asm volatile ( + "sc\n" + : "=r" (__ppc32_reg_r3) + : "r" (__ppc32_reg_r3), + "r" (__ppc32_reg_r4), + "r" (__ppc32_reg_r5), + "r" (__ppc32_reg_r6), + "r" (__ppc32_reg_r7), + "r" (__ppc32_reg_r8), + "r" (__ppc32_reg_r9) + ); + + return __ppc32_reg_r3; +} + +/** @} + */ Index: uspace/lib/c/arch/ppc32/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/ppc32/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,46 @@ +# +# 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. +# + +.text + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +__thread_entry: + # + # Create the first stack frame. + # + li %r4, 0 + stw %r4, 0(%r1) + stwu %r1, -16(%r1) + + b __thread_main + +.end __thread_entry Index: uspace/lib/c/arch/ppc32/src/tls.c =================================================================== --- uspace/lib/c/arch/ppc32/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/ppc32/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,49 @@ +/* + * 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 libcppc32 + * @{ + */ +/** @file + */ + +#include +#include + +tcb_t * __alloc_tls(void **data, size_t size) +{ + return tls_alloc_variant_1(data, size); +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + tls_free_variant_1(tcb, size); +} + +/** @} + */ Index: uspace/lib/c/arch/sparc64/Makefile.common =================================================================== --- uspace/lib/c/arch/sparc64/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/Makefile.common (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,47 @@ +# +# 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. +# + +GCC_CFLAGS += -mcpu=ultrasparc -m64 +LFLAGS = -no-check-sections + +ENDIANESS = BE + +BFD_NAME = elf64-sparc +BFD_ARCH = sparc + +ifeq ($(PROCESSOR),us) + DEFS += -DSUN4U +endif + +ifeq ($(PROCESSOR),us3) + DEFS += -DSUN4U +endif + +ifeq ($(PROCESSOR),sun4v) + DEFS += -DSUN4V +endif Index: uspace/lib/c/arch/sparc64/Makefile.inc =================================================================== --- uspace/lib/c/arch/sparc64/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/Makefile.inc (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,37 @@ +# +# 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. +# + +ARCH_SOURCES = \ + arch/$(UARCH)/src/entry.s \ + arch/$(UARCH)/src/thread_entry.s \ + arch/$(UARCH)/src/fibril.S \ + arch/$(UARCH)/src/tls.c \ + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S + +.PRECIOUS: arch/$(UARCH)/src/entry.o Index: uspace/lib/c/arch/sparc64/_link.ld.in =================================================================== --- uspace/lib/c/arch/sparc64/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/_link.ld.in (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,52 @@ +STARTUP(LIBC_PATH/arch/UARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x4000 + SIZEOF_HEADERS; + + .init : { + *(.init); + } :text + .text : { + *(.text); + *(.rodata*); + } :text + + . = . + 0x4000; + + .got : { + _gp = .; + *(.got*); + } :data + .data : { + *(.data); + *(.sdata); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + _tls_alignment = ALIGNOF(.tdata); + .bss : { + *(.sbss); + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x4000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/c/arch/sparc64/include/atomic.h =================================================================== --- uspace/lib/c/arch/sparc64/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/atomic.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/config.h =================================================================== --- uspace/lib/c/arch/sparc64/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/config.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/ddi.h =================================================================== --- uspace/lib/c/arch/sparc64/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/ddi.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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 pio_write_8(ioport8_t *port, uint8_t v) +{ + *port = v; + memory_barrier(); +} + +static inline void pio_write_16(ioport16_t *port, uint16_t v) +{ + *port = v; + memory_barrier(); +} + +static inline void pio_write_32(ioport32_t *port, uint32_t v) +{ + *port = v; + memory_barrier(); +} + +static inline uint8_t pio_read_8(ioport8_t *port) +{ + uint8_t rv; + + rv = *port; + memory_barrier(); + + return rv; +} + +static inline uint16_t pio_read_16(ioport16_t *port) +{ + uint16_t rv; + + rv = *port; + memory_barrier(); + + return rv; +} + +static inline uint32_t pio_read_32(ioport32_t *port) +{ + uint32_t rv; + + rv = *port; + memory_barrier(); + + return rv; +} + +#endif Index: uspace/lib/c/arch/sparc64/include/faddr.h =================================================================== --- uspace/lib/c/arch/sparc64/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/faddr.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/fibril.h =================================================================== --- uspace/lib/c/arch/sparc64/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/fibril.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,82 @@ +/* + * 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; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/inttypes.h =================================================================== --- uspace/lib/c/arch/sparc64/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/inttypes.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,76 @@ +/* + * 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 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_sparc64_INTTYPES_H_ +#define LIBC_sparc64_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "lld" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "llo" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "llu" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "llx" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "llX" + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/istate.h =================================================================== --- uspace/lib/c/arch/sparc64/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/istate.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,63 @@ +/* + * 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 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_ISTATE_H_ +#define LIBC_sparc64_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + /* TODO */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + /* TODO */ + return 0; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/limits.h =================================================================== --- uspace/lib/c/arch/sparc64/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/limits.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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_LIMITS_H_ +#define LIBC_sparc64_LIMITS_H_ + +#define LONG_MIN MIN_INT64 +#define LONG_MAX MAX_INT64 +#define ULONG_MIN MIN_UINT64 +#define ULONG_MAX MAX_UINT64 + +#define SIZE_MIN MIN_UINT64 +#define SIZE_MAX MAX_UINT64 +#define SSIZE_MIN MIN_INT64 +#define SSIZE_MAX MAX_INT64 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/include/stack.h =================================================================== --- uspace/lib/c/arch/sparc64/include/stack.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/stack.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/stackarg.h =================================================================== --- uspace/lib/c/arch/sparc64/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/stackarg.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/syscall.h =================================================================== --- uspace/lib/c/arch/sparc64/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/syscall.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/thread.h =================================================================== --- uspace/lib/c/arch/sparc64/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/thread.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/tls.h =================================================================== --- uspace/lib/c/arch/sparc64/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/tls.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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/types.h =================================================================== --- uspace/lib/c/arch/sparc64/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/include/types.h (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -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__ + +typedef unsigned long sysarg_t; + +typedef signed char int8_t; +typedef short int int16_t; +typedef int int32_t; +typedef long int int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long int uint64_t; + +typedef int64_t ssize_t; +typedef uint64_t size_t; + +typedef uint64_t uintptr_t; +typedef uint64_t atomic_count_t; +typedef int64_t atomic_signed_t; + +#endif + +/** @} + */ Index: uspace/lib/c/arch/sparc64/src/entry.s =================================================================== --- uspace/lib/c/arch/sparc64/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/src/entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,55 @@ +# +# 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. +# + +.section .init, "ax" + +.org 0 + +.globl __entry + +## User-space task entry point +# +# %o0 contains uarg +# %o1 contains pcb_ptr +# +__entry: + # + # Create the first stack frame. + # + save %sp, -176, %sp + flushw + add %g0, -0x7ff, %fp + + # Pass pcb_ptr as the first argument to __main() + mov %i1, %o0 + sethi %hi(_gp), %l7 + call __main + or %l7, %lo(_gp), %l7 + + call __exit + nop Index: uspace/lib/c/arch/sparc64/src/fibril.S =================================================================== --- uspace/lib/c/arch/sparc64/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/src/fibril.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,56 @@ +# +# 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. +# + +#include + +.text + +.global context_save +.global context_restore + +context_save: + # + # We rely on the kernel to flush our active register windows to memory + # should a thread switch occur. + # + CONTEXT_SAVE_ARCH_CORE %o0 + retl + mov 1, %o0 ! context_save_arch returns 1 + +context_restore: + # + # Flush all active windows. + # This is essential, because CONTEXT_RESTORE_ARCH_CORE overwrites %sp of + # CWP - 1 with the value written to %fp of CWP. Flushing all active + # windows mitigates this problem as CWP - 1 becomes the overlap window. + # + flushw + + CONTEXT_RESTORE_ARCH_CORE %o0 + retl + xor %o0, %o0, %o0 ! context_restore_arch returns 0 Index: uspace/lib/c/arch/sparc64/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/sparc64/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/src/stacktrace.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * 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 sparc64 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV (14 * 8) +#define FRAME_OFFSET_RA (15 * 8) + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + uintptr_t bprev; + int rc; + + rc = (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, &bprev); + if (rc == EOK) + *prev = bprev + STACK_BIAS; + return rc; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/c/arch/sparc64/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/sparc64/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/src/stacktrace_asm.S (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +# +# 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. +# + +#include + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp + # Flush all other windows to memory so that we can read their contents. + flushw + ret + restore + +stacktrace_fp_get: + # Add the stack bias to %sp to get the actual address. + retl + add %sp, STACK_BIAS, %o0 + +stacktrace_pc_get: + retl + mov %o7, %o0 Index: uspace/lib/c/arch/sparc64/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/sparc64/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/src/thread_entry.s (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +# +# 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. +# + +.text + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +__thread_entry: + # + # Create the first stack frame. + # + + #save %sp, -176, %sp + #flushw + #add %g0, -0x7ff, %fp + + sethi %hi(_gp), %l7 + call __thread_main ! %o0 contains address of uarg + or %l7, %lo(_gp), %l7 + + ! not reached + +.end __thread_entry Index: uspace/lib/c/arch/sparc64/src/tls.c =================================================================== --- uspace/lib/c/arch/sparc64/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/arch/sparc64/src/tls.c (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) @@ -0,0 +1,51 @@ +/* + * 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 libcsparc64 sparc64 + * @ingroup lc + * @{ + */ +/** @file + * + */ + +#include +#include + +tcb_t * __alloc_tls(void **data, size_t size) +{ + return tls_alloc_variant_2(data, size); +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + tls_free_variant_2(tcb, size); +} + +/** @} + */