Index: uspace/lib/libc/Makefile =================================================================== --- uspace/lib/libc/Makefile (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/Makefile (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,115 @@ +# +# 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. +# + +## Common compiler flags +# + +LIBC_PREFIX = . +SOFTINT_PREFIX = ../softint +CONSOLE_PREFIX = ../../srv/console + +## Setup toolchain +# + +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -I$(CONSOLE_PREFIX) + +## Sources +# + + +GENERIC_SOURCES = \ + generic/libc.c \ + generic/ddi.c \ + generic/as.c \ + generic/cap.c \ + generic/string.c \ + generic/thread.c \ + generic/task.c \ + generic/futex.c \ + generic/io/io.c \ + generic/io/printf.c \ + generic/io/stream.c \ + generic/io/sprintf.c \ + generic/io/snprintf.c \ + generic/io/vprintf.c \ + generic/io/vsprintf.c \ + generic/io/vsnprintf.c \ + generic/io/printf_core.c \ + malloc/malloc.c \ + generic/psthread.c \ + generic/sysinfo.c \ + generic/ipc.c \ + generic/async.c \ + generic/libadt/list.o \ + generic/libadt/hash_table.o \ + generic/time.c \ + generic/err.c \ + generic/stdlib.c \ + generic/mman.c + +ARCH_SOURCES += \ + arch/$(ARCH)/src/entry.s \ + arch/$(ARCH)/src/thread_entry.s + +GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) +ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES))) + +.PHONY: all clean depend kerninc + +all: kerninc libc.a arch/$(ARCH)/_link.ld + +kerninc: + ln -sfn ../../../../kernel/generic/include include/kernel + ln -sfn kernel/arch include/arch + ln -sfn ../arch/$(ARCH)/include include/libarch + +-include Makefile.depend + +clean: + -rm -f include/kernel include/arch include/libarch libc.a arch/$(ARCH)/_link.ld Makefile.depend + find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \; + +depend: kerninc + -makedepend $(DEFS) $(CFLAGS) -f - $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null + +libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS) + $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS) + +arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in + $(CC) $(DEFS) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@ + +%.o: %.S + $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ + +%.o: %.s + $(AS) $(AFLAGS) $< -o $@ + +%.o: %.c + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ Index: uspace/lib/libc/Makefile.toolchain =================================================================== --- uspace/lib/libc/Makefile.toolchain (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/Makefile.toolchain (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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. +# + +DEFS = -DARCH=$(ARCH) +CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include +LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a +AFLAGS = +#-Werror + +## Setup platform configuration +# + +include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc + +## Toolchain configuration +# + +ifeq ($(COMPILER),gcc_native) + CC = gcc + AS = as + LD = ld + AR = ar + OBJCOPY = objcopy + OBJDUMP = objdump +endif + +ifeq ($(COMPILER),icc_native) + CC = icc + AS = as + LD = ld + AR = ar + OBJCOPY = objcopy + OBJDUMP = objdump +endif + +ifeq ($(COMPILER),gcc_cross) + CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc + AS = $(TOOLCHAIN_DIR)/$(TARGET)-as + LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld + AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar + OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy + OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump +endif Index: uspace/lib/libc/arch/amd64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/amd64/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,42 @@ +# +# 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. +# + +## Toolchain configuration +# + +TARGET = amd64-linux-gnu +TOOLCHAIN_DIR = /usr/local/amd64/bin + +ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \ + arch/$(ARCH)/src/psthread.S \ + arch/$(ARCH)/src/thread.c + +LFLAGS += -N + +BFD_NAME = elf64-x86-64 +BFD_ARCH = i386:x86-64 Index: uspace/lib/libc/arch/amd64/_link.ld.in =================================================================== --- uspace/lib/libc/arch/amd64/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +STARTUP(../../lib/libc/arch/ARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000; + + .init ALIGN(0x1000) : SUBALIGN(0x1000) { + *(.init); + } :text + .text : { + *(.text); + *(.rodata*); + } :text + + .data ALIGN(0x1000) : SUBALIGN(0x1000) { + *(.data); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + } :data + .tbss : { + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + + .bss : { + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/libc/arch/amd64/include/atomic.h =================================================================== --- uspace/lib/libc/arch/amd64/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,80 @@ +/* + * 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_ + +static inline void atomic_inc(atomic_t *val) { + asm volatile ("lock incq %0\n" : "=m" (val->count)); +} + +static inline void atomic_dec(atomic_t *val) { + asm volatile ("lock decq %0\n" : "=m" (val->count)); +} + +static inline long atomic_postinc(atomic_t *val) +{ + long r; + + asm volatile ( + "movq $1, %0\n" + "lock xaddq %0, %1\n" + : "=r" (r), "=m" (val->count) + ); + + return r; +} + +static inline long atomic_postdec(atomic_t *val) +{ + long r; + + asm volatile ( + "movq $-1, %0\n" + "lock xaddq %0, %1\n" + : "=r" (r), "=m" (val->count) + ); + + return r; +} + +#define atomic_preinc(val) (atomic_postinc(val)+1) +#define atomic_predec(val) (atomic_postdec(val)-1) + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/amd64/include/config.h =================================================================== --- uspace/lib/libc/arch/amd64/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_CONFIG_H_ +#define LIBC_amd64_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1< directly - use instead." +#endif + +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif + +/** @} + */ + + Index: uspace/lib/libc/arch/amd64/include/faddr.h =================================================================== --- uspace/lib/libc/arch/amd64/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/amd64/include/limits.h =================================================================== --- uspace/lib/libc/arch/amd64/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/amd64/include/psthread.h =================================================================== --- uspace/lib/libc/arch/amd64/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_PSTHREAD_H_ +#define LIBC_amd64_PSTHREAD_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 + +/* 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/libc/arch/amd64/include/stackarg.h =================================================================== --- uspace/lib/libc/arch/amd64/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/amd64/include/syscall.h =================================================================== --- uspace/lib/libc/arch/amd64/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +/* + * 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_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/amd64/include/thread.h =================================================================== --- uspace/lib/libc/arch/amd64/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,61 @@ +/* + * 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_ + +#include + +typedef struct { + void *self; + void *pst_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/libc/arch/amd64/include/types.h =================================================================== --- uspace/lib/libc/arch/amd64/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,58 @@ +/* + * 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_ + +typedef unsigned long long sysarg_t; +typedef unsigned long size_t; +typedef signed long ssize_t; +typedef ssize_t off_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 uint64_t uintptr_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/amd64/src/entry.s =================================================================== --- uspace/lib/libc/arch/amd64/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,48 @@ +# +# 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 +.globl __entry_driver + +## User-space task entry point +# +# +__entry: + call __main + call __io_init + call main + call __exit + +__entry_driver: + call __main + call main + call __exit Index: uspace/lib/libc/arch/amd64/src/psthread.S =================================================================== --- uspace/lib/libc/arch/amd64/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,87 @@ +# +# 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 + movq %rdx, OFFSET_PC(%rdi) + movq %rsp, OFFSET_SP(%rdi) + + movq %rbx, OFFSET_RBX(%rdi) + movq %rbp, OFFSET_RBP(%rdi) + movq %r12, OFFSET_R12(%rdi) + movq %r13, OFFSET_R13(%rdi) + movq %r14, OFFSET_R14(%rdi) + movq %r15, OFFSET_R15(%rdi) + + # 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: + movq OFFSET_R15(%rdi), %r15 + movq OFFSET_R14(%rdi), %r14 + movq OFFSET_R13(%rdi), %r13 + movq OFFSET_R12(%rdi), %r12 + movq OFFSET_RBP(%rdi), %rbp + movq OFFSET_RBX(%rdi), %rbx + + movq OFFSET_SP(%rdi), %rsp # ctx->sp -> %rsp + + movq OFFSET_PC(%rdi), %rdx + movq %rdx,(%rsp) + + # Set thread local storage + movq OFFSET_TLS(%rdi), %rdi # Set arg1 to TLS addr + movq $1, %r8 + syscall + + xorq %rax,%rax # context_restore returns 0 + ret Index: uspace/lib/libc/arch/amd64/src/syscall.S =================================================================== --- uspace/lib/libc/arch/amd64/src/syscall.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/src/syscall.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,40 @@ +# +# 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 + +.globl __syscall + + +__syscall: + # rcx gets rewritten on syscall + movq %rcx, %r9 + syscall + ret + +.end __syscall Index: uspace/lib/libc/arch/amd64/src/thread.c =================================================================== --- uspace/lib/libc/arch/amd64/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,64 @@ +/* + * 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 + +/** Allocate TLS & TCB for initial module threads + * + * @param data Start of data section + * @return pointer to tcb_t structure + */ +tcb_t * __alloc_tls(void **data, size_t size) +{ + tcb_t *tcb; + + *data = malloc(sizeof(tcb_t) + size); + + tcb = (tcb_t *) (*data + size); + tcb->self = tcb; + + return tcb; +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + void *start = ((void *)tcb) - size; + free(start); +} + +/** @} + */ Index: uspace/lib/libc/arch/amd64/src/thread_entry.s =================================================================== --- uspace/lib/libc/arch/amd64/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/amd64/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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. +# + +.text + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +__thread_entry: + # + # RAX contains address of uarg + # + movq %rax, %rdi + call __thread_main + +.end __thread_entry Index: uspace/lib/libc/arch/arm32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/arm32/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +# +# 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. +# + +## Toolchain configuration +# + +TARGET = arm-linux-gnu +TOOLCHAIN_DIR = /usr/local/arm/bin +CFLAGS += -ffixed-r9 -mtp=soft +LFLAGS += -N ../../lib/softint/libsoftint.a +AFLAGS += + +ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \ + arch/$(ARCH)/src/psthread.S \ + arch/$(ARCH)/src/thread.c \ + arch/$(ARCH)/src/eabi.S + +BFD_NAME = elf32-little +BFD_ARCH = arm Index: uspace/lib/libc/arch/arm32/_link.ld.in =================================================================== --- uspace/lib/libc/arch/arm32/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,52 @@ +STARTUP(../../lib/libc/arch/ARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000; + + .init ALIGN(0x1000): SUBALIGN(0x1000) { + *(.init); + } : text + .text : { + *(.text); + *(.rodata*); + } :text + + .data ALIGN(0x1000) : SUBALIGN(0x1000) { + *(.opd); + *(.data .data.*); + *(.sdata); + } :data + + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + } :data + + .tbss : { + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + + .bss : { + *(.sbss); + *(.scommon); + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/libc/arch/arm32/include/atomic.h =================================================================== --- uspace/lib/libc/arch/arm32/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,136 @@ +/* + * 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_ + +/** Atomic addition. + * + * @param val Where to add. + * @param i Value to be added. + * + * @return Value after addition. + */ +static inline long atomic_add(atomic_t *val, int i) +{ + int ret; + volatile long * mem = &(val->count); + + asm volatile ( + "1:\n" + "ldr r2, [%1]\n" + "add r3, r2, %2\n" + "str r3, %0\n" + "swp r3, r3, [%1]\n" + "cmp r3, r2\n" + "bne 1b\n" + + : "=m" (ret) + : "r" (mem), "r" (i) + : "r3", "r2" + ); + + 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 long 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 long 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 long 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 long atomic_postdec(atomic_t *val) +{ + return atomic_add(val, -1) + 1; +} + + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/config.h =================================================================== --- uspace/lib/libc/arch/arm32/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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) +#define PAGE_COLOR_BITS 0 /* dummy */ + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/endian.h =================================================================== --- uspace/lib/libc/arch/arm32/include/endian.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/endian.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,48 @@ +/* + * 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 libcarm32 + * @{ + */ +/** @file + * @brief Endianness definition. + */ + +#ifndef LIBC_arm32_ENDIAN_H_ +#define LIBC_arm32_ENDIAN_H_ + +#ifndef LIBC_ENDIAN_H_ +# error "Never use directly - use instead." +#endif + +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/faddr.h =================================================================== --- uspace/lib/libc/arch/arm32/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/arm32/include/limits.h =================================================================== --- uspace/lib/libc/arch/arm32/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +/* + * 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 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/psthread.h =================================================================== --- uspace/lib/libc/arch/arm32/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,90 @@ +/* + * 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 psthread related declarations. + */ + +#ifndef LIBC_arm32_PSTHREAD_H_ +#define LIBC_arm32_PSTHREAD_H_ + +#include +#include +#include "thread.h" + +/** 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) \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = ((sysarg_t)(ptls)) + sizeof(tcb_t) + ARM_TP_OFFSET; + + +/** Thread 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; + uint32_t r10; + uint32_t r11; +} context_t; + + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/stackarg.h =================================================================== --- uspace/lib/libc/arch/arm32/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/arm32/include/syscall.h =================================================================== --- uspace/lib/libc/arch/arm32/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +/* + * 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_SYSCALL_H_ +#define LIBC_arm32_SYSCALL_H_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/thread.h =================================================================== --- uspace/lib/libc/arch/arm32/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2007 Pavel Jancik, 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 Uspace threads and TLS. + */ + +#ifndef LIBC_arm32_THREAD_H_ +#define LIBC_arm32_THREAD_H_ + +#include + +/** Stack initial size. */ +#define THREAD_INITIAL_STACK_PAGES_NO 1 + +/** Offsets for accessing __thread variables are shifted 8 bytes higher. */ +#define ARM_TP_OFFSET (-8) + +/** TCB (Thread Control Block) struct. + * + * TLS starts just after this struct. + */ +typedef struct { + /** psthread data. */ + void *pst_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/libc/arch/arm32/include/types.h =================================================================== --- uspace/lib/libc/arch/arm32/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,59 @@ +/* + * 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_ + +typedef unsigned int sysarg_t; +typedef unsigned int size_t; +typedef signed int ssize_t; +typedef ssize_t off_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 uint32_t uintptr_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/src/eabi.S =================================================================== --- uspace/lib/libc/arch/arm32/src/eabi.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/src/eabi.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/arm32/src/entry.s =================================================================== --- uspace/lib/libc/arch/arm32/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,49 @@ +# +# 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 +.global __entry_driver + +## User-space task entry point +# +# +__entry: + bl __main + bl __io_init + bl main + bl __exit + +__entry_driver: + bl __main + bl main + bl __exit + Index: uspace/lib/libc/arch/arm32/src/psthread.S =================================================================== --- uspace/lib/libc/arch/arm32/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/arm32/src/syscall.c =================================================================== --- uspace/lib/libc/arch/arm32/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,74 @@ +/* + * 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 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") = id; + + asm volatile ( "swi" + : "=r" (__arm_reg_r0) + : "r" (__arm_reg_r0), + "r" (__arm_reg_r1), + "r" (__arm_reg_r2), + "r" (__arm_reg_r3), + "r" (__arm_reg_r4) + ); + + return __arm_reg_r0; +} + +/** @} + */ Index: uspace/lib/libc/arch/arm32/src/thread.c =================================================================== --- uspace/lib/libc/arch/arm32/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,67 @@ +/* + * 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 + * @brief Uspace threads and TLS. + */ + +#include +#include + +/** Allocates TLS & TCB. + * + * @param data Start of data section (output parameter). + * @param size Size of (tbss + tdata) sections. + * @return Pointer to the allocated #tcb_t structure. + */ +tcb_t * __alloc_tls(void **data, size_t size) +{ + tcb_t *result; + + result = malloc(sizeof(tcb_t) + size); + *data = ((void *)result) + sizeof(tcb_t); + return result; +} + +/** Deallocates TLS & TCB. + * + * @param tcb TCB structure to be deallocated (along with corresponding TLS). + * @param size Not used. + */ +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + free(tcb); +} + +/** @} + */ Index: uspace/lib/libc/arch/arm32/src/thread_entry.s =================================================================== --- uspace/lib/libc/arch/arm32/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/arm32/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,37 @@ +# +# 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: + b __thread_main Index: uspace/lib/libc/arch/ia32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ia32/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,42 @@ +# +# 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. +# + +## Toolchain configuration +# + +TARGET = i686-pc-linux-gnu +TOOLCHAIN_DIR = /usr/local/i686/bin + +ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \ + arch/$(ARCH)/src/psthread.S \ + arch/$(ARCH)/src/thread.c + +LFLAGS += -N + +BFD_NAME = elf32-i386 +BFD_ARCH = i386 Index: uspace/lib/libc/arch/ia32/_link.ld.in =================================================================== --- uspace/lib/libc/arch/ia32/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,45 @@ +STARTUP(../../lib/libc/arch/ARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000; + + .init ALIGN(0x1000) : SUBALIGN(0x1000) { + *(.init); + } :text + .text : { + *(.text); + *(.rodata*); + } :text + + .data ALIGN(0x1000) : SUBALIGN(0x1000) { + *(.data); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + } :data + .tbss : { + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + .bss : { + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/libc/arch/ia32/include/atomic.h =================================================================== --- uspace/lib/libc/arch/ia32/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,78 @@ +/* + * 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_ + +static inline void atomic_inc(atomic_t *val) { + asm volatile ("lock incl %0\n" : "=m" (val->count)); +} + +static inline void atomic_dec(atomic_t *val) { + asm volatile ("lock decl %0\n" : "=m" (val->count)); +} + +static inline long atomic_postinc(atomic_t *val) +{ + long r; + + asm volatile ( + "movl $1, %0\n" + "lock xaddl %0, %1\n" + : "=r" (r), "=m" (val->count) + ); + + return r; +} + +static inline long atomic_postdec(atomic_t *val) +{ + long r; + + asm volatile ( + "movl $-1, %0\n" + "lock xaddl %0, %1\n" + : "=r" (r), "=m" (val->count) + ); + + return r; +} + +#define atomic_preinc(val) (atomic_postinc(val)+1) +#define atomic_predec(val) (atomic_postdec(val)-1) + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/include/config.h =================================================================== --- uspace/lib/libc/arch/ia32/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcia32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32_CONFIG_H_ +#define LIBC_ia32_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1< directly - use instead." +#endif + +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/include/faddr.h =================================================================== --- uspace/lib/libc/arch/ia32/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/ia32/include/limits.h =================================================================== --- uspace/lib/libc/arch/ia32/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/include/psthread.h =================================================================== --- uspace/lib/libc/arch/ia32/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,64 @@ +/* + * 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_PSTHREAD_H_ +#define LIBC_ia32_PSTHREAD_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) + +/* 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/libc/arch/ia32/include/stackarg.h =================================================================== --- uspace/lib/libc/arch/ia32/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,66 @@ +/* + * 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 libcia32 + * @{ + */ +/** @file + */ + +/* + * Variable argument list manipulation macros + * for architectures using stack to pass arguments. + */ + +#ifndef LIBC_ia32_STACKARG_H_ +#define LIBC_ia32_STACKARG_H_ + +#include + +/* dont allow to define it second time in stdarg.h */ +#define __VARARGS_DEFINED + +typedef struct va_list { + int pos; + uint8_t *last; +} va_list; + +#define va_start(ap, lst) \ + (ap).pos = sizeof(lst); \ + (ap).last = (uint8_t *) &(lst) + +#define va_arg(ap, type) \ + (*((type *)((ap).last + ((ap).pos += sizeof(type) ) - sizeof(type)))) + +#define va_end(ap) + + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/include/syscall.h =================================================================== --- uspace/lib/libc/arch/ia32/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +/* + * 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 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/include/thread.h =================================================================== --- uspace/lib/libc/arch/ia32/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,61 @@ +/* + * 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_ + +#include + +typedef struct { + void *self; + void *pst_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/libc/arch/ia32/include/types.h =================================================================== --- uspace/lib/libc/arch/ia32/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,58 @@ +/* + * 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_ + +typedef unsigned int sysarg_t; +typedef unsigned int size_t; +typedef signed int ssize_t; +typedef ssize_t off_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 uint32_t uintptr_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/src/entry.s =================================================================== --- uspace/lib/libc/arch/ia32/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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. +# + +.section .init, "ax" + +.org 0 + +.globl __entry +.globl __entry_driver + +## User-space task entry point +# +# +__entry: + mov %ss, %ax + mov %ax, %ds + mov %ax, %es + mov %ax, %fs + # Do not set %gs, it contains descriptor that can see TLS + + call __main + call __io_init + call main + call __exit + +__entry_driver: + mov %ss, %ax + mov %ax, %ds + mov %ax, %es + mov %ax, %fs + # Do not set %gs, it contains descriptor that can see TLS + + call __main + call main + call __exit Index: uspace/lib/libc/arch/ia32/src/psthread.S =================================================================== --- uspace/lib/libc/arch/ia32/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,84 @@ +# +# 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 + + +## 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 kernel_context variable to save context to + + movl %esp,0(%edx) # %esp -> ctx->sp + movl %eax,4(%edx) # %eip -> ctx->pc + movl %ebx,8(%edx) # %ebx -> ctx->ebx + movl %esi,12(%edx) # %esi -> ctx->esi + movl %edi,16(%edx) # %edi -> ctx->edi + movl %ebp,20(%edx) # %ebp -> ctx->ebp + + # Save TLS + movl %gs:0, %eax + movl %eax, 24(%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 kernel_context variable to restore context from + movl 0(%eax),%esp # ctx->sp -> %esp + movl 4(%eax),%edx # ctx->pc -> %edx + movl 8(%eax),%ebx # ctx->ebx -> %ebx + movl 12(%eax),%esi # ctx->esi -> %esi + movl 16(%eax),%edi # ctx->edi -> %edi + movl 20(%eax),%ebp # ctx->ebp -> %ebp + + movl %edx,0(%esp) # ctx->pc -> saver's return %eip + + # Set thread local storage + pushl %edi + movl 24(%eax), %eax # Set arg1 to TLS addr + movl $1, %edi # Syscall 1 + int $0x30 + popl %edi + + xorl %eax,%eax # context_restore returns 0 + ret Index: uspace/lib/libc/arch/ia32/src/syscall.c =================================================================== --- uspace/lib/libc/arch/ia32/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,59 @@ +/* + * 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 ia32 + * @brief ia32 architecture dependent parts of libc + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, + const sysarg_t p4, const syscall_t id) +{ + sysarg_t ret; + + asm volatile ( + "int $0x30\n" + : "=a" (ret) + : "a" (p1), + "c" (p2), + "d" (p3), + "S" (p4), + "D" (id) + ); + + return ret; +} + +/** @} + */ Index: uspace/lib/libc/arch/ia32/src/thread.c =================================================================== --- uspace/lib/libc/arch/ia32/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../amd64/src/thread.c Index: uspace/lib/libc/arch/ia32/src/thread_entry.s =================================================================== --- uspace/lib/libc/arch/ia32/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia32/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,53 @@ +# +# 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 + + # + # EAX contains address of uarg. + # + pushl %eax + call __thread_main + + # + # Not reached. + # + +.end __thread_entry Index: uspace/lib/libc/arch/ia64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ia64/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,43 @@ +# +# 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. +# + +## Toolchain configuration +# + +TARGET = ia64-pc-linux-gnu +TOOLCHAIN_DIR = /usr/local/ia64/bin +CFLAGS += -fno-unwind-tables -DMALLOC_ALIGNMENT_16 +LFLAGS += -N ../../lib/softint/libsoftint.a +AFLAGS += + +ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \ + arch/$(ARCH)/src/psthread.S \ + arch/$(ARCH)/src/thread.c + +BFD_NAME = elf64-little +BFD_ARCH = ia64-elf64 Index: uspace/lib/libc/arch/ia64/_link.ld.in =================================================================== --- uspace/lib/libc/arch/ia64/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,52 @@ +STARTUP(../../lib/libc/arch/ARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x4000; + + .init ALIGN(0x4000): SUBALIGN(0x4000) { + *(.init); + } : text + .text : { + *(.text); + *(.rodata*); + } :text + + .got ALIGN(0x4000) : SUBALIGN(0x4000) { + _gp = .; + *(.got*); + } :data + .data : { + *(.opd); + *(.data .data.*); + *(.sdata); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + } :data + .tbss : { + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + .bss : { + *(.sbss); + *(.scommon); + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x4000); + _heap = .; + + /DISCARD/ : { + *(*); + } +} Index: uspace/lib/libc/arch/ia64/include/atomic.h =================================================================== --- uspace/lib/libc/arch/ia64/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,66 @@ +/* + * 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_ + +/** Atomic addition. + * + * @param val Atomic value. + * @param imm Value to add. + * + * @return Value before addition. + */ +static inline long atomic_add(atomic_t *val, int imm) +{ + long v; + + asm volatile ("fetchadd8.rel %0 = %1, %2\n" : "=r" (v), "+m" (val->count) : "i" (imm)); + + return v; +} + +static inline void atomic_inc(atomic_t *val) { atomic_add(val, 1); } +static inline void atomic_dec(atomic_t *val) { atomic_add(val, -1); } + +static inline long atomic_preinc(atomic_t *val) { return atomic_add(val, 1) + 1; } +static inline long atomic_predec(atomic_t *val) { return atomic_add(val, -1) - 1; } + +static inline long atomic_postinc(atomic_t *val) { return atomic_add(val, 1); } +static inline long atomic_postdec(atomic_t *val) { return atomic_add(val, -1); } + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/config.h =================================================================== --- uspace/lib/libc/arch/ia64/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcia64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_CONFIG_H_ +#define LIBC_ia64_CONFIG_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1< directly - use instead." +#endif + +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/faddr.h =================================================================== --- uspace/lib/libc/arch/ia64/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 f Function pointer. + * + */ +#define FADDR(f) (*((uintptr_t *)(f))); + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/limits.h =================================================================== --- uspace/lib/libc/arch/ia64/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/psthread.h =================================================================== --- uspace/lib/libc/arch/ia64/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,139 @@ +/* + * 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_PSTHREAD_H_ +#define LIBC_ia64_PSTHREAD_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 + +#ifdef context_set +#undef context_set +#endif + +#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; + + __r128 f2 __attribute__ ((aligned(16))); + __r128 f3; + __r128 f4; + __r128 f5; + + __r128 f16; + __r128 f17; + __r128 f18; + __r128 f19; + __r128 f20; + __r128 f21; + __r128 f22; + __r128 f23; + __r128 f24; + __r128 f25; + __r128 f26; + __r128 f27; + __r128 f28; + __r128 f29; + __r128 f30; + __r128 f31; + +} context_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/stack.h =================================================================== --- uspace/lib/libc/arch/ia64/include/stack.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/stack.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/ia64/include/stackarg.h =================================================================== --- uspace/lib/libc/arch/ia64/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/ia64/include/syscall.h =================================================================== --- uspace/lib/libc/arch/ia64/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +/* + * 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_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/thread.h =================================================================== --- uspace/lib/libc/arch/ia64/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,63 @@ +/* + * 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_ia64THREAD_H_ +#define LIBC_ia64THREAD_H_ + +#define THREAD_INITIAL_STACK_PAGES_NO 2 + +/* This structure must be exactly 16 bytes long */ +typedef struct { + void *dtv; /* unused in static linking*/ + void *pst_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/libc/arch/ia64/include/types.h =================================================================== --- uspace/lib/libc/arch/ia64/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,68 @@ +/* + * 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_ + +typedef unsigned long long sysarg_t; +typedef unsigned long size_t; +typedef signed long ssize_t; +typedef ssize_t off_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 uint64_t uintptr_t; + +typedef unsigned char __r8; /* Reserve byte */ +typedef unsigned short __r16; +typedef unsigned int __r32; +typedef unsigned long __r64; + +typedef struct __r128{ + __r64 lo; + __r64 hi; +} __r128; + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/src/entry.s =================================================================== --- uspace/lib/libc/arch/ia64/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,57 @@ +# +# 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 +.globl __entry_driver + +## User-space task entry point +# +# +__entry: + alloc loc0 = ar.pfs, 0, 1, 2, 0 + mov r1 = _gp + br.call.sptk.many b0 = __main +0: + br.call.sptk.many b0 = __io_init +1: + br.call.sptk.many b0 = main +2: + br.call.sptk.many b0 = __exit + +__entry_driver: + alloc loc0 = ar.pfs, 0, 1, 2, 0 + mov r1 = _gp + br.call.sptk.many b0 = __main +0: + br.call.sptk.many b0 = main +1: + br.call.sptk.many b0 = __exit Index: uspace/lib/libc/arch/ia64/src/psthread.S =================================================================== --- uspace/lib/libc/arch/ia64/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/ia64/src/syscall.S =================================================================== --- uspace/lib/libc/arch/ia64/src/syscall.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/src/syscall.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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, 5, 0, 0, 0 ;; + break SYSCALL_IMM + mov ar.pfs = r14 ;; + br.ret.sptk.many b0 Index: uspace/lib/libc/arch/ia64/src/thread.c =================================================================== --- uspace/lib/libc/arch/ia64/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,65 @@ +/* + * 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 + +/** Allocate TLS & TCB for initial module threads + * + * @param data Start of data section + * @return pointer to tcb_t structure + */ +extern char _tdata_start; +extern char _tbss_end; +tcb_t * __alloc_tls(void **data, size_t size) +{ + tcb_t *tcb; + +/* ASSERT(sizeof(tcb_t) == 16); */ + + tcb = malloc(sizeof(tcb_t) + size); + *data = ((void *) tcb) + 16; + + return tcb; +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + free(tcb); +} + +/** @} + */ Index: uspace/lib/libc/arch/ia64/src/thread_entry.s =================================================================== --- uspace/lib/libc/arch/ia64/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ia64/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 + + mov 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/libc/arch/mips32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/mips32/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +# +# 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. +# + +## Toolchain configuration +# + +TARGET = mipsel-linux-gnu +TOOLCHAIN_DIR = /usr/local/mipsel/bin +CFLAGS += -mips3 + +-include ../../Makefile.config +ifeq ($(CONFIG_MIPS_FPU),y) + CFLAGS += -DCONFIG_MIPS_FPU +endif + +ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \ + arch/$(ARCH)/src/psthread.S \ + arch/$(ARCH)/src/thread.c + + +BFD_ARCH = mips +BFD_NAME = elf32-little Index: uspace/lib/libc/arch/mips32/_link.ld.in =================================================================== --- uspace/lib/libc/arch/mips32/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,56 @@ +STARTUP(../../lib/libc/arch/ARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x4000; + + .init ALIGN(0x4000) : SUBALIGN(0x4000) { + *(.init); + } :text + .text : { + *(.text); + *(.rodata*); + } :text + + .data : { + *(.data); + *(.data.rel*); + } :data + + .got : { + _gp = .; + *(.got); + } :data + + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + } :data + .tbss : { + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + + .sbss : { + *(.scommon); + *(.sbss); + } + .bss : { + *(.bss); + *(COMMON); + } :data + + . = ALIGN(0x4000); + _heap = .; + + /DISCARD/ : { + *(*); + } +} Index: uspace/lib/libc/arch/mips32/include/atomic.h =================================================================== --- uspace/lib/libc/arch/mips32/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,77 @@ +/* + * 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 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 long atomic_add(atomic_t *val, int i) +{ + long tmp, v; + + asm volatile ( + "1:\n" + " ll %0, %1\n" + " addiu %0, %0, %3\n" /* same as addi, 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 */ + : "=r" (tmp), "=m" (val->count), "=r" (v) + : "i" (i), "i" (0) + ); + + return v; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/include/config.h =================================================================== --- uspace/lib/libc/arch/mips32/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcmips32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips32_CONFIG_H_ +#define LIBC_mips32_CONFIG_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1< directly - use instead." +#endif + +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/include/faddr.h =================================================================== --- uspace/lib/libc/arch/mips32/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/mips32/include/limits.h =================================================================== --- uspace/lib/libc/arch/mips32/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +/* + * 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 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/include/psthread.h =================================================================== --- uspace/lib/libc/arch/mips32/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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_PSTHREAD_H_ +#define LIBC_mips32_PSTHREAD_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/libc/arch/mips32/include/stackarg.h =================================================================== --- uspace/lib/libc/arch/mips32/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,62 @@ +/* + * 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_STACKARG_H_ +#define LIBC_mips32_STACKARG_H_ + +/* dont allow to define it second time in stdarg.h */ +#define __VARARGS_DEFINED + +#include + +/** + * va_arg macro for MIPS32 - problem is that 64 bit values must be aligned on an 8-byte boundary (32bit values not) + * To satisfy this, paddings must be sometimes inserted. + */ + +typedef uint8_t* va_list; + +#define va_start(ap, lst) \ + ((ap) = (va_list)&(lst) + sizeof(lst)) + +#define va_arg(ap, type) \ + (((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((uint32_t)((ap) + 2*4 - 1) & (~3)) : ((uint32_t)((ap) + 2*8 -1) & (~7)) )))[-1]) + +#define va_end(ap) + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/include/syscall.h =================================================================== --- uspace/lib/libc/arch/mips32/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +/* + * 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_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/include/thread.h =================================================================== --- uspace/lib/libc/arch/mips32/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips32 + * @{ + */ +/** @file + * @ingroup libcmips32eb + */ + +/* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */ + +#ifndef LIBC_mips32THREAD_H_ +#define LIBC_mips32THREAD_H_ + +/* 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 *pst_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/libc/arch/mips32/include/types.h =================================================================== --- uspace/lib/libc/arch/mips32/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,59 @@ +/* + * 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_ + +typedef unsigned int sysarg_t; +typedef unsigned int size_t; +typedef signed int ssize_t; +typedef ssize_t off_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 uint32_t uintptr_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/src/entry.s =================================================================== --- uspace/lib/libc/arch/mips32/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,89 @@ +# +# 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 +# +# +.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 + + jal __main + nop + + jal __io_init + nop + + jal main + nop + + jal __exit + nop +.end + +.ent __entry_driver +__entry_driver: + .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 + + jal __main + nop + + jal main + nop + + jal __exit + nop +.end +# Alignment of output section data to 0x4000 +.section .data +.align 14 Index: uspace/lib/libc/arch/mips32/src/psthread.S =================================================================== --- uspace/lib/libc/arch/mips32/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,161 @@ +# +# 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 +#include + +.global context_save +.global context_restore + +.macro CONTEXT_STORE r + sw $s0,OFFSET_S0(\r) + sw $s1,OFFSET_S1(\r) + sw $s2,OFFSET_S2(\r) + sw $s3,OFFSET_S3(\r) + sw $s4,OFFSET_S4(\r) + sw $s5,OFFSET_S5(\r) + sw $s6,OFFSET_S6(\r) + sw $s7,OFFSET_S7(\r) + sw $s8,OFFSET_S8(\r) + sw $gp,OFFSET_GP(\r) + sw $k1,OFFSET_TLS(\r) + +#ifdef CONFIG_MIPS_FPU + mfc1 $t0,$20 + sw $t0, OFFSET_F20(\r) + + mfc1 $t0,$21 + sw $t0, OFFSET_F21(\r) + + mfc1 $t0,$22 + sw $t0, OFFSET_F22(\r) + + mfc1 $t0,$23 + sw $t0, OFFSET_F23(\r) + + mfc1 $t0,$24 + sw $t0, OFFSET_F24(\r) + + mfc1 $t0,$25 + sw $t0, OFFSET_F25(\r) + + mfc1 $t0,$26 + sw $t0, OFFSET_F26(\r) + + mfc1 $t0,$27 + sw $t0, OFFSET_F27(\r) + + mfc1 $t0,$28 + sw $t0, OFFSET_F28(\r) + + mfc1 $t0,$29 + sw $t0, OFFSET_F29(\r) + + mfc1 $t0,$30 + sw $t0, OFFSET_F30(\r) +#endif + + sw $ra,OFFSET_PC(\r) + sw $sp,OFFSET_SP(\r) +.endm + +.macro CONTEXT_LOAD r + lw $s0,OFFSET_S0(\r) + lw $s1,OFFSET_S1(\r) + lw $s2,OFFSET_S2(\r) + lw $s3,OFFSET_S3(\r) + lw $s4,OFFSET_S4(\r) + lw $s5,OFFSET_S5(\r) + lw $s6,OFFSET_S6(\r) + lw $s7,OFFSET_S7(\r) + lw $s8,OFFSET_S8(\r) + lw $gp,OFFSET_GP(\r) + lw $k1,OFFSET_TLS(\r) + +#ifdef CONFIG_MIPS_FPU + lw $t0, OFFSET_F20(\r) + mtc1 $t0,$20 + + lw $t0, OFFSET_F21(\r) + mtc1 $t0,$21 + + lw $t0, OFFSET_F22(\r) + mtc1 $t0,$22 + + lw $t0, OFFSET_F23(\r) + mtc1 $t0,$23 + + lw $t0, OFFSET_F24(\r) + mtc1 $t0,$24 + + lw $t0, OFFSET_F25(\r) + mtc1 $t0,$25 + + lw $t0, OFFSET_F26(\r) + mtc1 $t0,$26 + + lw $t0, OFFSET_F27(\r) + mtc1 $t0,$27 + + lw $t0, OFFSET_F28(\r) + mtc1 $t0,$28 + + lw $t0, OFFSET_F29(\r) + mtc1 $t0,$29 + + lw $t0, OFFSET_F30(\r) + mtc1 $t0,$30 +#endif + + lw $ra,OFFSET_PC(\r) + lw $sp,OFFSET_SP(\r) +.endm + +context_save: + CONTEXT_STORE $a0 + + # context_save returns 1 + j $ra + li $v0, 1 + +context_restore: + CONTEXT_LOAD $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/libc/arch/mips32/src/syscall.c =================================================================== --- uspace/lib/libc/arch/mips32/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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. + */ + + /** @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 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_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_v0) + : "%ra" /* We are a function call, although C does not + * know it */ + ); + + return __mips_reg_v0; +} + + /** @} + */ + Index: uspace/lib/libc/arch/mips32/src/thread.c =================================================================== --- uspace/lib/libc/arch/mips32/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,60 @@ +/* + * 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 + +/** Allocate TLS & TCB for initial module threads + * + * @param data (out) Start of TLS section + * @param size Size of tdata+tbss section + * @return pointer to tcb_t structure + */ +tcb_t * __alloc_tls(void **data, size_t size) +{ + tcb_t *result; + + result = malloc(sizeof(tcb_t) + size); + *data = ((void *)result) + sizeof(tcb_t); + return result; +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + free(tcb); +} + +/** @} + */ Index: uspace/lib/libc/arch/mips32/src/thread_entry.s =================================================================== --- uspace/lib/libc/arch/mips32/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/mips32eb/Makefile.inc =================================================================== --- uspace/lib/libc/arch/mips32eb/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,43 @@ +# +# 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. +# + +## Toolchain configuration +# + +TARGET = mips-sgi-irix5 +TOOLCHAIN_DIR = /usr/local/mips/bin +CFLAGS += -mips3 + +ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \ + arch/$(ARCH)/src/psthread.S \ + arch/$(ARCH)/src/thread.c + +LFLAGS += -N + +BFD_ARCH = mips +BFD_NAME = elf32-big Index: uspace/lib/libc/arch/mips32eb/_link.ld.in =================================================================== --- uspace/lib/libc/arch/mips32eb/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../mips32/_link.ld.in Index: uspace/lib/libc/arch/mips32eb/include/atomic.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/atomic.h Index: uspace/lib/libc/arch/mips32eb/include/config.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/config.h Index: uspace/lib/libc/arch/mips32eb/include/context_offset.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/context_offset.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/context_offset.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/context_offset.h Index: uspace/lib/libc/arch/mips32eb/include/endian.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/endian.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/endian.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,50 @@ +/* + * 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 libcmips32eb mipseb32 + * @brief mipseb32 architecture dependent parts of libc + * @ingroup lc + * @{ + */ +/** @file + */ + + +#ifndef LIBC_mips32eb_ENDIAN_H_ +#define LIBC_mips32eb_ENDIAN_H_ + +#ifndef LIBC_ENDIAN_H_ +# error "Never use directly - use instead." +#endif + +#define __BYTE_ORDER __BIG_ENDIAN + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32eb/include/faddr.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/faddr.h Index: uspace/lib/libc/arch/mips32eb/include/limits.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/limits.h Index: uspace/lib/libc/arch/mips32eb/include/psthread.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/psthread.h Index: uspace/lib/libc/arch/mips32eb/include/stackarg.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/stackarg.h Index: uspace/lib/libc/arch/mips32eb/include/syscall.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/syscall.h Index: uspace/lib/libc/arch/mips32eb/include/thread.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/thread.h Index: uspace/lib/libc/arch/mips32eb/include/types.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../../mips32/include/types.h Index: uspace/lib/libc/arch/mips32eb/src =================================================================== --- uspace/lib/libc/arch/mips32eb/src (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/mips32eb/src (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +../mips32/src Index: uspace/lib/libc/arch/ppc32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ppc32/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +# +# 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. +# + +## Toolchain configuration +# + +TARGET = ppc-linux-gnu +TOOLCHAIN_DIR = /usr/local/ppc/bin + +ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \ + arch/$(ARCH)/src/psthread.S \ + arch/$(ARCH)/src/thread.c + +CFLAGS += -mcpu=powerpc -msoft-float -m32 +AFLAGS += -a32 +LFLAGS += -N + +BFD_NAME = elf32-powerpc +BFD_ARCH = powerpc:common Index: uspace/lib/libc/arch/ppc32/_link.ld.in =================================================================== --- uspace/lib/libc/arch/ppc32/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +STARTUP(../../lib/libc/arch/ARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000; + + .init ALIGN(0x1000) : SUBALIGN(0x1000) { + *(.init); + } :text + .text : { + *(.text); + *(.rodata*); + } :text + + .data ALIGN(0x1000) : SUBALIGN(0x1000) { + *(.data); + *(.sdata); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + } :data + .tbss : { + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + .bss : { + *(.sbss); + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/libc/arch/ppc32/include/atomic.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,95 @@ +/* + * 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_ + +static inline void atomic_inc(atomic_t *val) +{ + long 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) +{ + long 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 long atomic_postinc(atomic_t *val) +{ + atomic_inc(val); + return val->count - 1; +} + +static inline long atomic_postdec(atomic_t *val) +{ + atomic_dec(val); + return val->count + 1; +} + +static inline long atomic_preinc(atomic_t *val) +{ + atomic_inc(val); + return val->count; +} + +static inline long atomic_predec(atomic_t *val) +{ + atomic_dec(val); + return val->count; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/include/config.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_CONFIG_H_ +#define LIBC_ppc32_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1< directly - use instead." +#endif + +#define __BYTE_ORDER __BIG_ENDIAN + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/include/faddr.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/ppc32/include/limits.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/include/psthread.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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_PSTHREAD_H_ +#define LIBC_ppc32_PSTHREAD_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/libc/arch/ppc32/include/regname.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/regname.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/regname.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/ppc32/include/stackarg.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/ppc32/include/syscall.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +/* + * 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_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/include/thread.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,71 @@ +/* + * 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_ + +#define PPC_TP_OFFSET 0x7000 + +typedef struct { + void *pst_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/libc/arch/ppc32/include/types.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,59 @@ +/* + * 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_ + +typedef unsigned int sysarg_t; +typedef unsigned int size_t; +typedef signed int ssize_t; +typedef ssize_t off_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 uint32_t uintptr_t; + +#endif + +/** @} + */ + Index: uspace/lib/libc/arch/ppc32/src/entry.s =================================================================== --- uspace/lib/libc/arch/ppc32/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,48 @@ +# +# 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 +.globl __entry_driver + +## User-space task entry point +# +# +__entry: + bl __main + bl __io_init + bl main + bl __exit + +__entry_driver: + bl __main + bl main + bl __exit Index: uspace/lib/libc/arch/ppc32/src/psthread.S =================================================================== --- uspace/lib/libc/arch/ppc32/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,110 @@ +# +# 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 + +.macro CONTEXT_STORE r + stw sp, OFFSET_SP(\r) + stw r2, OFFSET_R2(\r) + stw r13, OFFSET_R13(\r) + stw r14, OFFSET_R14(\r) + stw r15, OFFSET_R15(\r) + stw r16, OFFSET_R16(\r) + stw r17, OFFSET_R17(\r) + stw r18, OFFSET_R18(\r) + stw r19, OFFSET_R19(\r) + stw r20, OFFSET_R20(\r) + stw r21, OFFSET_R21(\r) + stw r22, OFFSET_R22(\r) + stw r23, OFFSET_R23(\r) + stw r24, OFFSET_R24(\r) + stw r25, OFFSET_R25(\r) + stw r26, OFFSET_R26(\r) + stw r27, OFFSET_R27(\r) + stw r28, OFFSET_R28(\r) + stw r29, OFFSET_R29(\r) + stw r30, OFFSET_R30(\r) + stw r31, OFFSET_R31(\r) +.endm + +.macro CONTEXT_LOAD r + lwz sp, OFFSET_SP(\r) + lwz r2, OFFSET_R2(\r) + lwz r13, OFFSET_R13(\r) + lwz r14, OFFSET_R14(\r) + lwz r15, OFFSET_R15(\r) + lwz r16, OFFSET_R16(\r) + lwz r17, OFFSET_R17(\r) + lwz r18, OFFSET_R18(\r) + lwz r19, OFFSET_R19(\r) + lwz r20, OFFSET_R20(\r) + lwz r21, OFFSET_R21(\r) + lwz r22, OFFSET_R22(\r) + lwz r23, OFFSET_R23(\r) + lwz r24, OFFSET_R24(\r) + lwz r25, OFFSET_R25(\r) + lwz r26, OFFSET_R26(\r) + lwz r27, OFFSET_R27(\r) + lwz r28, OFFSET_R28(\r) + lwz r29, OFFSET_R29(\r) + lwz r30, OFFSET_R30(\r) + lwz r31, OFFSET_R31(\r) +.endm + +context_save: + CONTEXT_STORE 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_LOAD 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/libc/arch/ppc32/src/syscall.c =================================================================== --- uspace/lib/libc/arch/ppc32/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,61 @@ +/* + * 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 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") = 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) + ); + + return __ppc32_reg_r3; +} + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/src/thread.c =================================================================== --- uspace/lib/libc/arch/ppc32/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,59 @@ +/* + * 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 + +/** Allocate TLS & TCB for initial module threads + * + * @param data Start of data section + * @return pointer to tcb_t structure + * + */ +tcb_t * __alloc_tls(void **data, size_t size) +{ + tcb_t *result; + + result = malloc(sizeof(tcb_t) + size); + *data = ((void *)result) + sizeof(tcb_t); + return result; +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + free(tcb); +} + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/src/thread_entry.s =================================================================== --- uspace/lib/libc/arch/ppc32/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc32/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,39 @@ +# +# 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: + b __thread_main + +.end __thread_entry Index: uspace/lib/libc/arch/ppc64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ppc64/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +# +# 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. +# + +## Toolchain configuration +# + +TARGET = ppc64-linux-gnu +TOOLCHAIN_DIR = /usr/local/ppc64/bin + +ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \ + arch/$(ARCH)/src/psthread.S \ + arch/$(ARCH)/src/thread.c + +CFLAGS += -mcpu=powerpc64 -msoft-float -m64 +AFLAGS += -a64 +LFLAGS += -N + +BFD_NAME = elf64-powerpc +BFD_ARCH = powerpc:common64 Index: uspace/lib/libc/arch/ppc64/_link.ld.in =================================================================== --- uspace/lib/libc/arch/ppc64/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,49 @@ +STARTUP(../../lib/libc/arch/ARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x1000; + + .init ALIGN(0x1000) : SUBALIGN(0x1000) { + *(.init); + } :text + .text : { + *(.text); + *(.toc); + *(.rodata*); + } :text + + .data ALIGN(0x1000) : SUBALIGN(0x1000) { + *(.opd); + *(.data*); + *(.sdata); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + } :data + .tbss : { + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + .bss : { + *(.sbss); + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x1000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/libc/arch/ppc64/include/atomic.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,95 @@ +/* + * 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 libcppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc64_ATOMIC_H_ +#define LIBC_ppc64_ATOMIC_H_ + +static inline void atomic_inc(atomic_t *val) +{ + long 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) +{ + long 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 long atomic_postinc(atomic_t *val) +{ + atomic_inc(val); + return val->count - 1; +} + +static inline long atomic_postdec(atomic_t *val) +{ + atomic_dec(val); + return val->count + 1; +} + +static inline long atomic_preinc(atomic_t *val) +{ + atomic_inc(val); + return val->count; +} + +static inline long atomic_predec(atomic_t *val) +{ + atomic_dec(val); + return val->count; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/include/config.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc64_CONFIG_H_ +#define LIBC_ppc64_CONFIG_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1< directly - use instead." +#endif + +#define __BYTE_ORDER __BIG_ENDIAN + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/include/faddr.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc64_FADDR_H_ +#define LIBC_ppc64_FADDR_H_ + +#include + +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/include/limits.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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 libcppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc64_LIMITS_H_ +#define LIBC_ppc64_LIMITS_H_ + +#define LONG_MIN MIN_INT64 +#define LONG_MAX MAX_INT64 +#define ULONG_MIN MIN_UINT64 +#define ULONG_MAX MAX_UINT64 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/include/psthread.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc64_PSTHREAD_H_ +#define LIBC_ppc64_PSTHREAD_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 { + uint64_t sp; + uint64_t pc; + + uint64_t tls; + uint64_t r13; + uint64_t r14; + uint64_t r15; + uint64_t r16; + uint64_t r17; + uint64_t r18; + uint64_t r19; + uint64_t r20; + uint64_t r21; + uint64_t r22; + uint64_t r23; + uint64_t r24; + uint64_t r25; + uint64_t r26; + uint64_t r27; + uint64_t r28; + uint64_t r29; + uint64_t r30; + uint64_t r31; + + uint64_t cr; +} __attribute__ ((packed)) context_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/include/regname.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/regname.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/regname.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc64_REGNAME_H_ +#define LIBC_ppc64_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/libc/arch/ppc64/include/stackarg.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_STACKARG_H_ +#define LIBC_STACKARG_H_ + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/include/syscall.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,44 @@ +/* + * 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_ppc64_SYSCALL_H_ +#define LIBC_ppc64_SYSCALL_H_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/include/thread.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,71 @@ +/* + * 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 libcppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc64_THREAD_H_ +#define LIBC_ppc64_THREAD_H_ + +#define PPC_TP_OFFSET 0x7000 + +typedef struct { + void *pst_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/libc/arch/ppc64/include/types.h =================================================================== --- uspace/lib/libc/arch/ppc64/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,58 @@ +/* + * 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 libcppc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc64_TYPES_H_ +#define LIBC_ppc64_TYPES_H_ + +typedef unsigned long sysarg_t; +typedef unsigned long size_t; +typedef signed long ssize_t; +typedef ssize_t off_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 uint64_t uintptr_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/src/entry.s =================================================================== --- uspace/lib/libc/arch/ppc64/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,48 @@ +# +# 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 +.globl __entry_driver + +## User-space task entry point +# +# +__entry: + bl __main + bl __io_init + bl main + bl __exit + +__entry_driver: + bl __main + bl main + bl __exit Index: uspace/lib/libc/arch/ppc64/src/psthread.S =================================================================== --- uspace/lib/libc/arch/ppc64/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,110 @@ +# +# 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 + +.macro CONTEXT_STORE r + stw sp, OFFSET_SP(\r) + stw r2, OFFSET_R2(\r) + stw r13, OFFSET_R13(\r) + stw r14, OFFSET_R14(\r) + stw r15, OFFSET_R15(\r) + stw r16, OFFSET_R16(\r) + stw r17, OFFSET_R17(\r) + stw r18, OFFSET_R18(\r) + stw r19, OFFSET_R19(\r) + stw r20, OFFSET_R20(\r) + stw r21, OFFSET_R21(\r) + stw r22, OFFSET_R22(\r) + stw r23, OFFSET_R23(\r) + stw r24, OFFSET_R24(\r) + stw r25, OFFSET_R25(\r) + stw r26, OFFSET_R26(\r) + stw r27, OFFSET_R27(\r) + stw r28, OFFSET_R28(\r) + stw r29, OFFSET_R29(\r) + stw r30, OFFSET_R30(\r) + stw r31, OFFSET_R31(\r) +.endm + +.macro CONTEXT_LOAD r + lwz sp, OFFSET_SP(\r) + lwz r2, OFFSET_R2(\r) + lwz r13, OFFSET_R13(\r) + lwz r14, OFFSET_R14(\r) + lwz r15, OFFSET_R15(\r) + lwz r16, OFFSET_R16(\r) + lwz r17, OFFSET_R17(\r) + lwz r18, OFFSET_R18(\r) + lwz r19, OFFSET_R19(\r) + lwz r20, OFFSET_R20(\r) + lwz r21, OFFSET_R21(\r) + lwz r22, OFFSET_R22(\r) + lwz r23, OFFSET_R23(\r) + lwz r24, OFFSET_R24(\r) + lwz r25, OFFSET_R25(\r) + lwz r26, OFFSET_R26(\r) + lwz r27, OFFSET_R27(\r) + lwz r28, OFFSET_R28(\r) + lwz r29, OFFSET_R29(\r) + lwz r30, OFFSET_R30(\r) + lwz r31, OFFSET_R31(\r) +.endm + +context_save: + CONTEXT_STORE 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_LOAD 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/libc/arch/ppc64/src/syscall.c =================================================================== --- uspace/lib/libc/arch/ppc64/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/src/syscall.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,61 @@ +/* + * 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 libcppc64 ppc64 + * @brief ppc64 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 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") = 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) + ); + + return __ppc32_reg_r3; +} + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/src/thread.c =================================================================== --- uspace/lib/libc/arch/ppc64/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,60 @@ +/* + * 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 libcppc64 + * @{ + */ +/** @file + */ + +#include +#include + +/** Allocate TLS & TCB for initial module threads + * + * @param data Start of data section + * @return pointer to tcb_t structure + * + */ +tcb_t * __alloc_tls(void **data, size_t size) +{ + tcb_t *tcb; + + *data = malloc(sizeof(tcb_t) + size); + tcb = (tcb_t *) (*data + size); + return tcb; +} + +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + void *start = ((void *) tcb) - size; + free(start); +} + +/** @} + */ Index: uspace/lib/libc/arch/ppc64/src/thread_entry.s =================================================================== --- uspace/lib/libc/arch/ppc64/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/ppc64/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,39 @@ +# +# 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: + b __thread_main + +.end __thread_entry Index: uspace/lib/libc/arch/sparc64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/sparc64/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/Makefile.inc (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,42 @@ +# +# 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. +# + +## Toolchain configuration +# + +TARGET = sparc64-linux-gnu +TOOLCHAIN_DIR = /usr/local/sparc64/bin + +ARCH_SOURCES += arch/$(ARCH)/src/psthread.S \ + arch/$(ARCH)/src/thread.c + +CFLAGS += -mcpu=ultrasparc -m64 +LFLAGS += -no-check-sections -N + +BFD_NAME = elf64-sparc +BFD_ARCH = sparc Index: uspace/lib/libc/arch/sparc64/_link.ld.in =================================================================== --- uspace/lib/libc/arch/sparc64/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/_link.ld.in (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,51 @@ +STARTUP(../../lib/libc/arch/ARCH/src/entry.o) +ENTRY(__entry) + +PHDRS { + text PT_LOAD FLAGS(5); + data PT_LOAD FLAGS(6); +} + +SECTIONS { + . = 0x4000; + + .init ALIGN(0x4000) : SUBALIGN(0x4000) { + *(.init); + } :text + .text : { + *(.text); + *(.rodata*); + } :text + + .got ALIGN(0x4000) : SUBALIGN(0x4000) { + _gp = .; + *(.got*); + } :data + .data ALIGN(0x4000) : SUBALIGN(0x4000) { + *(.data); + *(.sdata); + } :data + .tdata : { + _tdata_start = .; + *(.tdata); + _tdata_end = .; + } :data + .tbss : { + _tbss_start = .; + *(.tbss); + _tbss_end = .; + } :data + .bss : { + *(.sbss); + *(COMMON); + *(.bss); + } :data + + . = ALIGN(0x4000); + _heap = .; + + /DISCARD/ : { + *(*); + } + +} Index: uspace/lib/libc/arch/sparc64/include/atomic.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,97 @@ +/* + * 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_ + +#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 long atomic_add(atomic_t *val, int i) +{ + uint64_t a, b; + + do { + volatile uintptr_t x = (uint64_t) &val->count; + + a = *((uint64_t *) x); + b = a + i; + asm volatile ("casx %0, %2, %1\n" : "+m" (*((uint64_t *)x)), "+r" (b) : "r" (a)); + } while (a != b); + + return a; +} + +static inline long atomic_preinc(atomic_t *val) +{ + return atomic_add(val, 1) + 1; +} + +static inline long atomic_postinc(atomic_t *val) +{ + return atomic_add(val, 1); +} + +static inline long atomic_predec(atomic_t *val) +{ + return atomic_add(val, -1) - 1; +} + +static inline long 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/libc/arch/sparc64/include/config.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/config.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_CONFIG_H_ +#define LIBC_sparc64_CONFIG_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1 << PAGE_WIDTH) +#define PAGE_COLOR_BITS 0 /**< Only one page color. */ + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/include/context_offset.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/context_offset.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/context_offset.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,21 @@ +/* This file is automatically generated by gencontext.c. */ +/* struct context */ +#define OFFSET_SP 0x0 +#define OFFSET_PC 0x8 +#define OFFSET_I0 0x10 +#define OFFSET_I1 0x18 +#define OFFSET_I2 0x20 +#define OFFSET_I3 0x28 +#define OFFSET_I4 0x30 +#define OFFSET_I5 0x38 +#define OFFSET_FP 0x40 +#define OFFSET_I7 0x48 +#define OFFSET_L0 0x50 +#define OFFSET_L1 0x58 +#define OFFSET_L2 0x60 +#define OFFSET_L3 0x68 +#define OFFSET_L4 0x70 +#define OFFSET_L5 0x78 +#define OFFSET_L6 0x80 +#define OFFSET_L7 0x88 +#define OFFSET_TP 0x90 Index: uspace/lib/libc/arch/sparc64/include/endian.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/endian.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/endian.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +/* + * 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_ENDIAN_H_ +#define LIBC_sparc64_ENDIAN_H_ + +#ifndef LIBC_ENDIAN_H_ +# error "Never use directly - use instead." +#endif + +#define __BYTE_ORDER __BIG_ENDIAN + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/include/faddr.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/faddr.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/sparc64/include/limits.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/include/psthread.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,84 @@ +/* + * 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_PSTHREAD_H_ +#define LIBC_sparc64_PSTHREAD_H_ + +#include +#include +#include + +#define SP_DELTA STACK_WINDOW_SAVE_AREA_SIZE + +#ifdef context_set +#undef context_set +#endif + +#define context_set(c, _pc, stack, size, ptls) \ + (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 = ptls + +/* + * 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/libc/arch/sparc64/include/stack.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/stack.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/stack.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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. + */ + +/** @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) + +/** + * By convention, the actual top of the stack is %sp + STACK_BIAS. + */ +#define STACK_BIAS 2047 + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/include/stackarg.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/stackarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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/libc/arch/sparc64/include/syscall.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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_SYSCALL_H_ +#define LIBC_sparc64_SYSCALL_H_ + +#include +#include + +static inline sysarg_t +__syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, const sysarg_t p4, 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; + + asm volatile ( + "ta %5\n" + : "=r" (a1) + : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "i" (id) + : "memory" + ); + + return a1; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/include/thread.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,63 @@ +/* + * 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_THREAD_H_ +#define LIBC_sparc64_THREAD_H_ + +typedef struct { + void *self; + void *pst_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/libc/arch/sparc64/include/types.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,58 @@ +/* + * 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_ + +typedef unsigned long sysarg_t; +typedef unsigned long size_t; +typedef signed long ssize_t; +typedef ssize_t off_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 uint64_t uintptr_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/src/entry.s =================================================================== --- uspace/lib/libc/arch/sparc64/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/src/entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,57 @@ +# +# 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 +.globl __entry_driver + +## User-space task entry point +# +# +__entry: + sethi %hi(_gp), %l7 + call __main + or %l7, %lo(_gp), %l7 + call __io_init + nop + call main + nop + call __exit + nop + +__entry_driver: + sethi %hi(_gp), %l7 + call __main + or %l7, %lo(_gp), %l7 + call main + nop + call __exit + nop Index: uspace/lib/libc/arch/sparc64/src/psthread.S =================================================================== --- uspace/lib/libc/arch/sparc64/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/src/psthread.S (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,97 @@ +# +# 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 + +.macro CONTEXT_STORE r + stx %sp, [\r + OFFSET_SP] + stx %o7, [\r + OFFSET_PC] + stx %i0, [\r + OFFSET_I0] + stx %i1, [\r + OFFSET_I1] + stx %i2, [\r + OFFSET_I2] + stx %i3, [\r + OFFSET_I3] + stx %i4, [\r + OFFSET_I4] + stx %i5, [\r + OFFSET_I5] + stx %fp, [\r + OFFSET_FP] + stx %i7, [\r + OFFSET_I7] + stx %l0, [\r + OFFSET_L0] + stx %l1, [\r + OFFSET_L1] + stx %l2, [\r + OFFSET_L2] + stx %l3, [\r + OFFSET_L3] + stx %l4, [\r + OFFSET_L4] + stx %l5, [\r + OFFSET_L5] + stx %l6, [\r + OFFSET_L6] + stx %l7, [\r + OFFSET_L7] + stx %g7, [\r + OFFSET_TP] +.endm + +.macro CONTEXT_LOAD r + ldx [\r + OFFSET_SP], %sp + ldx [\r + OFFSET_PC], %o7 + ldx [\r + OFFSET_I0], %i0 + ldx [\r + OFFSET_I1], %i1 + ldx [\r + OFFSET_I2], %i2 + ldx [\r + OFFSET_I3], %i3 + ldx [\r + OFFSET_I4], %i4 + ldx [\r + OFFSET_I5], %i5 + ldx [\r + OFFSET_FP], %fp + ldx [\r + OFFSET_I7], %i7 + ldx [\r + OFFSET_L0], %l0 + ldx [\r + OFFSET_L1], %l1 + ldx [\r + OFFSET_L2], %l2 + ldx [\r + OFFSET_L3], %l3 + ldx [\r + OFFSET_L4], %l4 + ldx [\r + OFFSET_L5], %l5 + ldx [\r + OFFSET_L6], %l6 + ldx [\r + OFFSET_L7], %l7 + ldx [\r + OFFSET_TP], %g7 +.endm + +context_save: + CONTEXT_STORE %o0 + retl + mov 1, %o0 ! context_save_arch returns 1 + +context_restore: + # + # Flush all active windows. + # This is essential, because CONTEXT_LOAD 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_LOAD %o0 + retl + xor %o0, %o0, %o0 ! context_restore_arch returns 0 Index: uspace/lib/libc/arch/sparc64/src/thread.c =================================================================== --- uspace/lib/libc/arch/sparc64/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/src/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcsparc64 sparc64 + * @ingroup lc + * @{ + */ +/** @file + * + */ + +#include +#include + +/* + * sparc64 uses thread-local storage data structures, variant II, as described + * in: + * Drepper U.: ELF Handling For Thread-Local Storage, 2005 + */ + +/** Allocate TLS variant II data structures for a thread. + * + * Only static model is supported. + * + * @param data Pointer to pointer to thread local data. This is actually an + * output argument. + * @param size Size of thread local data. + * @return Pointer to TCB structure. + */ +tcb_t * __alloc_tls(void **data, size_t size) +{ + tcb_t *tcb; + + *data = malloc(sizeof(tcb_t) + size); + + tcb = (tcb_t *) (*data + size); + tcb->self = tcb; + + return tcb; +} + +/** Free TLS variant II data structures of a thread. + * + * Only static model is supported. + * + * @param tcb Pointer to TCB structure. + * @param size Size of thread local data. + */ +void __free_tls_arch(tcb_t *tcb, size_t size) +{ + void *start = ((void *) tcb) - size; + free(start); +} + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/src/thread_entry.s =================================================================== --- uspace/lib/libc/arch/sparc64/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/arch/sparc64/src/thread_entry.s (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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. +# + +.text + +.globl __thread_entry + +## User-space thread entry point for all but the first threads. +# +# +__thread_entry: + 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/libc/generic/as.c =================================================================== --- uspace/lib/libc/generic/as.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/as.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,186 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include + +/** + * Either 4*256M on 32-bit architecures or 16*256M on 64-bit architectures. + */ +#define MAX_HEAP_SIZE (sizeof(uintptr_t)<<28) + +/** Create address space area. + * + * @param address Virtual address where to place new address space area. + * @param size Size of the area. + * @param flags Flags describing type of the area. + * + * @return address on success, (void *) -1 otherwise. + */ +void *as_area_create(void *address, size_t size, int flags) +{ + return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address, + (sysarg_t) size, (sysarg_t) flags); +} + +/** Resize address space area. + * + * @param address Virtual address pointing into already existing address space + * area. + * @param size New requested size of the area. + * @param flags Currently unused. + * + * @return Zero on success or a code from @ref errno.h on failure. + */ +int as_area_resize(void *address, size_t size, int flags) +{ + return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address, + (sysarg_t) size, (sysarg_t) flags); +} + +/** Destroy address space area. + * + * @param address Virtual address pointing into the address space area being + * destroyed. + * + * @return Zero on success or a code from @ref errno.h on failure. + */ +int as_area_destroy(void *address) +{ + return __SYSCALL1(SYS_AS_AREA_DESTROY, (sysarg_t ) address); +} + +static size_t heapsize = 0; +static size_t maxheapsize = (size_t) (-1); + +static void * last_allocated = 0; + +/* Start of heap linker symbol */ +extern char _heap; + +/** Sbrk emulation + * + * @param incr New area that should be allocated or negative, + if it should be shrinked + * @return Pointer to newly allocated area + */ +void *sbrk(ssize_t incr) +{ + int rc; + void *res; + + /* Check for invalid values */ + if (incr < 0 && -incr > heapsize) + return NULL; + + /* Check for too large value */ + if (incr > 0 && incr+heapsize < heapsize) + return NULL; + + /* Check for too small values */ + if (incr < 0 && incr+heapsize > heapsize) + return NULL; + + /* Check for user limit */ + if ((maxheapsize != (size_t) (-1)) && (heapsize + incr) > maxheapsize) + return NULL; + + rc = as_area_resize(&_heap, heapsize + incr, 0); + if (rc != 0) + return NULL; + + /* Compute start of new area */ + res = (void *) &_heap + heapsize; + + heapsize += incr; + + return res; +} + +/** Set maximum heap size and return pointer just after the heap */ +void *set_maxheapsize(size_t mhs) +{ + maxheapsize = mhs; + /* Return pointer to area not managed by sbrk */ + return ((void *) &_heap + maxheapsize); +} + +/** Return pointer to some unmapped area, where fits new as_area + * + * @param sz Requested size of the allocation. + * + * @return Pointer to the beginning + * + * TODO: make some first_fit/... algorithm, we are now just incrementing + * the pointer to last area + */ +void *as_get_mappable_page(size_t sz) +{ + void *res; + uint64_t asz; + int i; + + if (!sz) + return NULL; + + asz = 1 << (fnzb64(sz - 1) + 1); + + /* Set heapsize to some meaningful value */ + if (maxheapsize == -1) + set_maxheapsize(MAX_HEAP_SIZE); + + /* + * Make sure we allocate from naturally aligned address. + */ + i = 0; + if (!last_allocated) { + last_allocated = (void *) ALIGN_UP((void *) &_heap + + maxheapsize, asz); + } else { + last_allocated = (void *) ALIGN_UP(((uintptr_t) + last_allocated) + (int) (i > 0), asz); + } + + res = last_allocated; + last_allocated += ALIGN_UP(sz, PAGE_SIZE); + + return res; +} + +/** @} + */ Index: uspace/lib/libc/generic/async.c =================================================================== --- uspace/lib/libc/generic/async.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/async.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,811 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +/** + * Asynchronous library + * + * The aim of this library is facilitating writing programs utilizing + * the asynchronous nature of HelenOS IPC, yet using a normal way + * of programming. + * + * You should be able to write very simple multithreaded programs, + * the async framework will automatically take care of most synchronization + * problems. + * + * Default semantics: + * - send() - send asynchronously. If the kernel refuses to send more + * messages, [ try to get responses from kernel, if nothing + * found, might try synchronous ] + * + * Example of use: + * + * 1) Multithreaded client application + * create_thread(thread1); + * create_thread(thread2); + * ... + * + * thread1() { + * conn = ipc_connect_me_to(); + * c1 = send(conn); + * c2 = send(conn); + * wait_for(c1); + * wait_for(c2); + * } + * + * + * 2) Multithreaded server application + * main() { + * async_manager(); + * } + * + * + * client_connection(icallid, *icall) { + * if (want_refuse) { + * ipc_answer_fast(icallid, ELIMIT, 0, 0); + * return; + * } + * ipc_answer_fast(icallid, 0, 0, 0); + * + * callid = async_get_call(&call); + * handle(callid, call); + * ipc_answer_fast(callid, 1, 2, 3); + * + * callid = async_get_call(&call); + * .... + * } + * + * TODO: Detaching/joining dead psthreads? + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +atomic_t async_futex = FUTEX_INITIALIZER; +static hash_table_t conn_hash_table; +static LIST_INITIALIZE(timeout_list); + +typedef struct { + struct timeval expires; /**< Expiration time for waiting thread */ + int inlist; /**< If true, this struct is in timeout list */ + link_t link; + + pstid_t ptid; /**< Thread waiting for this message */ + int active; /**< If this thread is currently active */ + int timedout; /**< If true, we timed out */ +} awaiter_t; + +typedef struct { + awaiter_t wdata; + + int done; /**< If reply was received */ + ipc_call_t *dataptr; /**< Pointer where the answer data + * is stored */ + ipcarg_t retval; +} amsg_t; + +typedef struct { + link_t link; + ipc_callid_t callid; + ipc_call_t call; +} msg_t; + +typedef struct { + awaiter_t wdata; + + link_t link; /**< Hash table link */ + ipcarg_t in_phone_hash; /**< Incoming phone hash. */ + link_t msg_queue; /**< Messages that should be delivered to this thread */ + /* Structures for connection opening packet */ + ipc_callid_t callid; + ipc_call_t call; + ipc_callid_t close_callid; /* Identification of closing packet */ + void (*cthread)(ipc_callid_t,ipc_call_t *); +} connection_t; + +/** Identifier of incoming connection handled by current thread */ +__thread connection_t *PS_connection; +/** If true, it is forbidden to use async_req functions and + * all preemption is disabled */ +__thread int in_interrupt_handler; + +static void default_client_connection(ipc_callid_t callid, ipc_call_t *call); +static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call); +static async_client_conn_t client_connection = default_client_connection; +static async_client_conn_t interrupt_received = default_interrupt_received; + +/** Add microseconds to give timeval */ +static void tv_add(struct timeval *tv, suseconds_t usecs) +{ + tv->tv_sec += usecs / 1000000; + tv->tv_usec += usecs % 1000000; + if (tv->tv_usec > 1000000) { + tv->tv_sec++; + tv->tv_usec -= 1000000; + } +} + +/** Subtract 2 timevals, return microseconds difference */ +static suseconds_t tv_sub(struct timeval *tv1, struct timeval *tv2) +{ + suseconds_t result; + + result = tv1->tv_usec - tv2->tv_usec; + result += (tv1->tv_sec - tv2->tv_sec) * 1000000; + + return result; +} + +/** Compare timeval + * + * @return 1 if tv1 > tv2, otherwise 0 + */ +static int tv_gt(struct timeval *tv1, struct timeval *tv2) +{ + if (tv1->tv_sec > tv2->tv_sec) + return 1; + if (tv1->tv_sec == tv2->tv_sec && tv1->tv_usec > tv2->tv_usec) + return 1; + return 0; +} +static int tv_gteq(struct timeval *tv1, struct timeval *tv2) +{ + if (tv1->tv_sec > tv2->tv_sec) + return 1; + if (tv1->tv_sec == tv2->tv_sec && tv1->tv_usec >= tv2->tv_usec) + return 1; + return 0; +} + +/* Hash table functions */ +#define CONN_HASH_TABLE_CHAINS 32 + +static hash_index_t conn_hash(unsigned long *key) +{ + assert(key); + return ((*key) >> 4) % CONN_HASH_TABLE_CHAINS; +} + +static int conn_compare(unsigned long key[], hash_count_t keys, link_t *item) +{ + connection_t *hs; + + hs = hash_table_get_instance(item, connection_t, link); + + return key[0] == hs->in_phone_hash; +} + +static void conn_remove(link_t *item) +{ + free(hash_table_get_instance(item, connection_t, link)); +} + + +/** Operations for NS hash table. */ +static hash_table_operations_t conn_hash_table_ops = { + .hash = conn_hash, + .compare = conn_compare, + .remove_callback = conn_remove +}; + +/** Insert sort timeout msg into timeouts list + * + */ +static void insert_timeout(awaiter_t *wd) +{ + link_t *tmp; + awaiter_t *cur; + + wd->timedout = 0; + wd->inlist = 1; + + tmp = timeout_list.next; + while (tmp != &timeout_list) { + cur = list_get_instance(tmp, awaiter_t, link); + if (tv_gteq(&cur->expires, &wd->expires)) + break; + tmp = tmp->next; + } + list_append(&wd->link, tmp); +} + +/*************************************************/ + +/** Try to route a call to an appropriate connection thread + * + */ +static int route_call(ipc_callid_t callid, ipc_call_t *call) +{ + connection_t *conn; + msg_t *msg; + link_t *hlp; + unsigned long key; + + futex_down(&async_futex); + + key = call->in_phone_hash; + hlp = hash_table_find(&conn_hash_table, &key); + if (!hlp) { + futex_up(&async_futex); + return 0; + } + conn = hash_table_get_instance(hlp, connection_t, link); + + msg = malloc(sizeof(*msg)); + msg->callid = callid; + msg->call = *call; + list_append(&msg->link, &conn->msg_queue); + + if (IPC_GET_METHOD(*call) == IPC_M_PHONE_HUNGUP) + conn->close_callid = callid; + + /* If the call is waiting for event, run it */ + if (!conn->wdata.active) { + /* If in timeout list, remove it */ + if (conn->wdata.inlist) { + conn->wdata.inlist = 0; + list_remove(&conn->wdata.link); + } + conn->wdata.active = 1; + psthread_add_ready(conn->wdata.ptid); + } + + futex_up(&async_futex); + + return 1; +} + +/** Return new incoming message for current(thread-local) connection */ +ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs) +{ + msg_t *msg; + ipc_callid_t callid; + connection_t *conn; + + assert(PS_connection); + /* GCC 4.1.0 coughs on PS_connection-> dereference, + * GCC 4.1.1 happilly puts the rdhwr instruction in delay slot. + * I would never expect to find so many errors in + * compiler *($&$(*&$ + */ + conn = PS_connection; + + futex_down(&async_futex); + + if (usecs) { + gettimeofday(&conn->wdata.expires, NULL); + tv_add(&conn->wdata.expires, usecs); + } else { + conn->wdata.inlist = 0; + } + /* If nothing in queue, wait until something appears */ + while (list_empty(&conn->msg_queue)) { + if (usecs) + insert_timeout(&conn->wdata); + + conn->wdata.active = 0; + psthread_schedule_next_adv(PS_TO_MANAGER); + /* Futex is up after getting back from async_manager + * get it again */ + futex_down(&async_futex); + if (usecs && conn->wdata.timedout && \ + list_empty(&conn->msg_queue)) { + /* If we timed out-> exit */ + futex_up(&async_futex); + return 0; + } + } + + msg = list_get_instance(conn->msg_queue.next, msg_t, link); + list_remove(&msg->link); + callid = msg->callid; + *call = msg->call; + free(msg); + + futex_up(&async_futex); + return callid; +} + +/** Thread function that gets created on new connection + * + * This function is defined as a weak symbol - to be redefined in + * user code. + */ +static void default_client_connection(ipc_callid_t callid, ipc_call_t *call) +{ + ipc_answer_fast(callid, ENOENT, 0, 0); +} +static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call) +{ +} + +/** Wrapper for client connection thread + * + * When new connection arrives, thread with this function is created. + * It calls client_connection and does final cleanup. + * + * @param arg Connection structure pointer + */ +static int connection_thread(void *arg) +{ + unsigned long key; + msg_t *msg; + int close_answered = 0; + + /* Setup thread local connection pointer */ + PS_connection = (connection_t *)arg; + PS_connection->cthread(PS_connection->callid, &PS_connection->call); + + /* Remove myself from connection hash table */ + futex_down(&async_futex); + key = PS_connection->in_phone_hash; + hash_table_remove(&conn_hash_table, &key, 1); + futex_up(&async_futex); + + /* Answer all remaining messages with ehangup */ + while (!list_empty(&PS_connection->msg_queue)) { + msg = list_get_instance(PS_connection->msg_queue.next, msg_t, link); + list_remove(&msg->link); + if (msg->callid == PS_connection->close_callid) + close_answered = 1; + ipc_answer_fast(msg->callid, EHANGUP, 0, 0); + free(msg); + } + if (PS_connection->close_callid) + ipc_answer_fast(PS_connection->close_callid, 0, 0, 0); + + return 0; +} + +/** Create new thread for a new connection + * + * Creates new thread for connection, fills in connection + * structures and inserts it into the hash table, so that + * later we can easily do routing of messages to particular + * threads. + * + * @param in_phone_hash Identification of the incoming connection + * @param callid Callid of the IPC_M_CONNECT_ME_TO packet + * @param call Call data of the opening packet + * @param cthread Thread function that should be called upon + * opening the connection + * @return New thread id + */ +pstid_t async_new_connection(ipcarg_t in_phone_hash,ipc_callid_t callid, ipc_call_t *call, void (*cthread)(ipc_callid_t, ipc_call_t *)) +{ + connection_t *conn; + unsigned long key; + + conn = malloc(sizeof(*conn)); + if (!conn) { + ipc_answer_fast(callid, ENOMEM, 0, 0); + return NULL; + } + conn->in_phone_hash = in_phone_hash; + list_initialize(&conn->msg_queue); + conn->callid = callid; + conn->close_callid = 0; + if (call) + conn->call = *call; + conn->wdata.active = 1; /* We will activate it asap */ + conn->cthread = cthread; + + conn->wdata.ptid = psthread_create(connection_thread, conn); + if (!conn->wdata.ptid) { + free(conn); + ipc_answer_fast(callid, ENOMEM, 0, 0); + return NULL; + } + /* Add connection to hash table */ + key = conn->in_phone_hash; + futex_down(&async_futex); + hash_table_insert(&conn_hash_table, &key, &conn->link); + futex_up(&async_futex); + + psthread_add_ready(conn->wdata.ptid); + + return conn->wdata.ptid; +} + +/** Handle call that was received */ +static void handle_call(ipc_callid_t callid, ipc_call_t *call) +{ + /* Unrouted call - do some default behaviour */ + if ((callid & IPC_CALLID_NOTIFICATION)) { + in_interrupt_handler = 1; + (*interrupt_received)(callid,call); + in_interrupt_handler = 0; + return; + } + + switch (IPC_GET_METHOD(*call)) { + case IPC_M_CONNECT_ME_TO: + /* Open new connection with thread etc. */ + async_new_connection(IPC_GET_ARG3(*call), callid, call, client_connection); + return; + } + + /* Try to route call through connection tables */ + if (route_call(callid, call)) + return; + + /* Unknown call from unknown phone - hang it up */ + ipc_answer_fast(callid, EHANGUP, 0, 0); +} + +/** Fire all timeouts that expired + * + */ +static void handle_expired_timeouts(void) +{ + struct timeval tv; + awaiter_t *waiter; + link_t *cur; + + gettimeofday(&tv,NULL); + futex_down(&async_futex); + + cur = timeout_list.next; + while (cur != &timeout_list) { + waiter = list_get_instance(cur,awaiter_t,link); + if (tv_gt(&waiter->expires, &tv)) + break; + cur = cur->next; + list_remove(&waiter->link); + waiter->inlist = 0; + waiter->timedout = 1; + /* Redundant condition? The thread should not + * be active when it gets here. + */ + if (!waiter->active) { + waiter->active = 1; + psthread_add_ready(waiter->ptid); + } + } + + futex_up(&async_futex); +} + +/** Endless loop dispatching incoming calls and answers */ +static int async_manager_worker(void) +{ + ipc_call_t call; + ipc_callid_t callid; + int timeout; + awaiter_t *waiter; + struct timeval tv; + + while (1) { + if (psthread_schedule_next_adv(PS_FROM_MANAGER)) { + futex_up(&async_futex); + /* async_futex is always held + * when entering manager thread + */ + continue; + } + futex_down(&async_futex); + if (!list_empty(&timeout_list)) { + waiter = list_get_instance(timeout_list.next,awaiter_t,link); + gettimeofday(&tv,NULL); + if (tv_gteq(&tv, &waiter->expires)) { + futex_up(&async_futex); + handle_expired_timeouts(); + continue; + } else + timeout = tv_sub(&waiter->expires, &tv); + } else + timeout = SYNCH_NO_TIMEOUT; + futex_up(&async_futex); + + callid = ipc_wait_cycle(&call, timeout, SYNCH_FLAGS_NONE); + + if (!callid) { + handle_expired_timeouts(); + continue; + } + + if (callid & IPC_CALLID_ANSWERED) { + continue; + } + + handle_call(callid, &call); + } + + return 0; +} + +/** Function to start async_manager as a standalone thread + * + * When more kernel threads are used, one async manager should + * exist per thread. The particular implementation may change, + * currently one async_manager is started automatically per kernel + * thread except main thread. + */ +static int async_manager_thread(void *arg) +{ + futex_up(&async_futex); + /* async_futex is always locked when entering + * manager */ + async_manager_worker(); + + return 0; +} + +/** Add one manager to manager list */ +void async_create_manager(void) +{ + pstid_t ptid; + + ptid = psthread_create(async_manager_thread, NULL); + psthread_add_manager(ptid); +} + +/** Remove one manager from manager list */ +void async_destroy_manager(void) +{ + psthread_remove_manager(); +} + +/** Initialize internal structures needed for async manager */ +int _async_init(void) +{ + if (!hash_table_create(&conn_hash_table, CONN_HASH_TABLE_CHAINS, 1, &conn_hash_table_ops)) { + printf("%s: cannot create hash table\n", "async"); + return ENOMEM; + } + + return 0; +} + +/** IPC handler for messages in async framework + * + * Notify thread that is waiting for this message, that it arrived + */ +static void reply_received(void *private, int retval, + ipc_call_t *data) +{ + amsg_t *msg = (amsg_t *) private; + + msg->retval = retval; + + futex_down(&async_futex); + /* Copy data after futex_down, just in case the + * call was detached + */ + if (msg->dataptr) + *msg->dataptr = *data; + + write_barrier(); + /* Remove message from timeout list */ + if (msg->wdata.inlist) + list_remove(&msg->wdata.link); + msg->done = 1; + if (! msg->wdata.active) { + msg->wdata.active = 1; + psthread_add_ready(msg->wdata.ptid); + } + futex_up(&async_futex); +} + +/** Send message and return id of the sent message + * + * The return value can be used as input for async_wait() to wait + * for completion. + */ +aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, + ipc_call_t *dataptr) +{ + amsg_t *msg; + + if (in_interrupt_handler) { + printf("Cannot send asynchronous request in interrupt handler.\n"); + _exit(1); + } + + msg = malloc(sizeof(*msg)); + msg->done = 0; + msg->dataptr = dataptr; + + msg->wdata.active = 1; /* We may sleep in next method, but it + * will use it's own mechanism */ + ipc_call_async_2(phoneid,method,arg1,arg2,msg,reply_received,1); + + return (aid_t) msg; +} + +/** Send message and return id of the sent message + * + * The return value can be used as input for async_wait() to wait + * for completion. + */ +aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, + ipcarg_t arg3, ipc_call_t *dataptr) +{ + amsg_t *msg; + + if (in_interrupt_handler) { + printf("Cannot send asynchronous request in interrupt handler.\n"); + _exit(1); + } + + msg = malloc(sizeof(*msg)); + msg->done = 0; + msg->dataptr = dataptr; + + msg->wdata.active = 1; /* We may sleep in next method, but it + * will use it's own mechanism */ + ipc_call_async_3(phoneid,method,arg1,arg2,arg3, msg,reply_received,1); + + return (aid_t) msg; +} + +/** Wait for a message sent by async framework + * + * @param amsgid Message ID to wait for + * @param retval Pointer to variable where will be stored retval + * of the answered message. If NULL, it is ignored. + * + */ +void async_wait_for(aid_t amsgid, ipcarg_t *retval) +{ + amsg_t *msg = (amsg_t *) amsgid; + + futex_down(&async_futex); + if (msg->done) { + futex_up(&async_futex); + goto done; + } + + msg->wdata.ptid = psthread_get_id(); + msg->wdata.active = 0; + msg->wdata.inlist = 0; + /* Leave locked async_futex when entering this function */ + psthread_schedule_next_adv(PS_TO_MANAGER); + /* futex is up automatically after psthread_schedule_next...*/ +done: + if (retval) + *retval = msg->retval; + free(msg); +} + +/** Wait for a message sent by async framework with timeout + * + * @param amsgid Message ID to wait for + * @param retval Pointer to variable where will be stored retval + * of the answered message. If NULL, it is ignored. + * @param timeout Timeout in usecs + * @return 0 on success, ETIMEOUT if timeout expired + * + */ +int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout) +{ + amsg_t *msg = (amsg_t *) amsgid; + + /* TODO: Let it go through the event read at least once */ + if (timeout < 0) + return ETIMEOUT; + + futex_down(&async_futex); + if (msg->done) { + futex_up(&async_futex); + goto done; + } + + gettimeofday(&msg->wdata.expires, NULL); + tv_add(&msg->wdata.expires, timeout); + + msg->wdata.ptid = psthread_get_id(); + msg->wdata.active = 0; + insert_timeout(&msg->wdata); + + /* Leave locked async_futex when entering this function */ + psthread_schedule_next_adv(PS_TO_MANAGER); + /* futex is up automatically after psthread_schedule_next...*/ + + if (!msg->done) + return ETIMEOUT; + +done: + if (retval) + *retval = msg->retval; + free(msg); + + return 0; +} + +/** Wait specified time, but in the meantime handle incoming events + * + * @param timeout Time in microseconds to wait + */ +void async_usleep(suseconds_t timeout) +{ + amsg_t *msg; + + if (in_interrupt_handler) { + printf("Cannot call async_usleep in interrupt handler.\n"); + _exit(1); + } + + msg = malloc(sizeof(*msg)); + if (!msg) + return; + + msg->wdata.ptid = psthread_get_id(); + msg->wdata.active = 0; + + gettimeofday(&msg->wdata.expires, NULL); + tv_add(&msg->wdata.expires, timeout); + + futex_down(&async_futex); + insert_timeout(&msg->wdata); + /* Leave locked async_futex when entering this function */ + psthread_schedule_next_adv(PS_TO_MANAGER); + /* futex is up automatically after psthread_schedule_next...*/ + free(msg); +} + +/** Set function that is called, IPC_M_CONNECT_ME_TO is received + * + * @param conn Function that will form new psthread. + */ +void async_set_client_connection(async_client_conn_t conn) +{ + client_connection = conn; +} +void async_set_interrupt_received(async_client_conn_t conn) +{ + interrupt_received = conn; +} + +/* Primitive functions for simple communication */ +void async_msg_3(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3) +{ + ipc_call_async_3(phoneid, method, arg1, arg2, arg3, NULL, NULL, !in_interrupt_handler); +} + +void async_msg_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2) +{ + ipc_call_async_2(phoneid, method, arg1, arg2, NULL, NULL, !in_interrupt_handler); +} + +/** @} + */ Index: uspace/lib/libc/generic/cap.c =================================================================== --- uspace/lib/libc/generic/cap.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/cap.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,75 @@ +/* + * 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 libc + * @{ + */ +/** + * @file cap.c + * @brief Functions to grant/revoke capabilities to/from a task. + */ + +#include +#include +#include +#include + +/** Grant capabilities to a task. + * + * @param id Destination task ID. + * @param caps Capabilities to grant. + * + * @return Zero on success or a value from @ref errno.h on failure. + */ +int cap_grant(task_id_t id, unsigned int caps) +{ + sysarg64_t arg; + + arg.value = (unsigned long long) id; + + return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) &arg, (sysarg_t) caps); +} + +/** Revoke capabilities from a task. + * + * @param id Destination task ID. + * @param caps Capabilities to revoke. + * + * @return Zero on success or a value from @ref errno.h on failure. + */ +int cap_revoke(task_id_t id, unsigned int caps) +{ + sysarg64_t arg; + + arg.value = (unsigned long long) id; + + return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) &arg, (sysarg_t) caps); +} + +/** @} + */ Index: uspace/lib/libc/generic/ddi.c =================================================================== --- uspace/lib/libc/generic/ddi.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/ddi.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,91 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +/** Map piece of physical memory to task. + * + * Caller of this function must have the CAP_MEM_MANAGER capability. + * + * @param pf Physical address of the starting frame. + * @param vp Virtual address of the sterting page. + * @param pages Number of pages to map. + * @param flags Flags for the new address space area. + * + * @return 0 on success, EPERM if the caller lacks the CAP_MEM_MANAGER capability, + * ENOENT if there is no task with specified ID and ENOMEM if there + * was some problem in creating address space area. + */ +int physmem_map(void *pf, void *vp, unsigned long pages, int flags) +{ + return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages, flags); +} + +/** Enable I/O space range to task. + * + * Caller of this function must have the IO_MEM_MANAGER capability. + * + * @param id Task ID. + * @param ioaddr Starting address of the I/O range. + * @param size Size of the range. + * + * @return 0 on success, EPERM if the caller lacks the CAP_IO_MANAGER capability, + * ENOENT if there is no task with specified ID and ENOMEM if there + * was some problem in allocating memory. + */ +int iospace_enable(task_id_t id, void *ioaddr, unsigned long size) +{ + ddi_ioarg_t arg; + + arg.task_id = id; + arg.ioaddr = ioaddr; + arg.size = size; + + return __SYSCALL1(SYS_IOSPACE_ENABLE, (sysarg_t) &arg); +} + +/** Interrupt control + * + * @param enable 1 - enable interrupts, 0 - disable interrupts + */ +int preemption_control(int enable) +{ + return __SYSCALL1(SYS_PREEMPT_CONTROL, (sysarg_t) enable); +} + +/** @} + */ Index: uspace/lib/libc/generic/err.c =================================================================== --- uspace/lib/libc/generic/err.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/err.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include + +/* TODO +void errx(int __status, __const char *__format, ...) +{ + _exit(0); +} +*/ + +/** @} + */ Index: uspace/lib/libc/generic/futex.c =================================================================== --- uspace/lib/libc/generic/futex.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/futex.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,177 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include + +/* + * Note about race conditions. + * Because of non-atomic nature of operations performed sequentially on the futex + * counter and the futex wait queue, there is a race condition: + * + * (wq->missed_wakeups == 1) && (futex->count = 1) + * + * Scenario 1 (wait queue timeout vs. futex_up()): + * 1. assume wq->missed_wakeups == 0 && futex->count == -1 + * (ie. thread A sleeping, thread B in the critical section) + * 2. A receives timeout and gets removed from the wait queue + * 3. B wants to leave the critical section and calls futex_up() + * 4. B thus changes futex->count from -1 to 0 + * 5. B has to call SYS_FUTEX_WAKEUP syscall to wake up the sleeping thread + * 6. B finds the wait queue empty and changes wq->missed_wakeups from 0 to 1 + * 7. A fixes futex->count (i.e. the number of waiting threads) by changing it from 0 to 1 + * + * Scenario 2 (conditional down operation vs. futex_up) + * 1. assume wq->missed_wakeups == 0 && futex->count == 0 + * (i.e. thread A is in the critical section) + * 2. thread B performs futex_trydown() operation and changes futex->count from 0 to -1 + * B is now obliged to call SYS_FUTEX_SLEEP syscall + * 3. A wants to leave the critical section and does futex_up() + * 4. A thus changes futex->count from -1 to 0 and must call SYS_FUTEX_WAKEUP syscall + * 5. B finds the wait queue empty and immediatelly aborts the conditional sleep + * 6. No thread is queueing in the wait queue so wq->missed_wakeups changes from 0 to 1 + * 6. B fixes futex->count (i.e. the number of waiting threads) by changing it from 0 to 1 + * + * Both scenarios allow two threads to be in the critical section simultaneously. + * One without kernel intervention and the other through wq->missed_wakeups being 1. + * + * To mitigate this problem, futex_down_timeout() detects that the syscall didn't sleep + * in the wait queue, fixes the futex counter and RETRIES the whole operation again. + * + */ + +/** Initialize futex counter. + * + * @param futex Futex. + * @param val Initialization value. + */ +void futex_initialize(atomic_t *futex, int val) +{ + atomic_set(futex, val); +} + +int futex_down(atomic_t *futex) +{ + return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE); +} + +int futex_trydown(atomic_t *futex) +{ + return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING); +} + +/** Try to down the futex. + * + * @param futex Futex. + * @param usec Microseconds to wait. Zero value means sleep without timeout. + * @param flags Select mode of operation. See comment for waitq_sleep_timeout(). + * + * @return ENOENT if there is no such virtual address. One of ESYNCH_OK_ATOMIC + * and ESYNCH_OK_BLOCKED on success or ESYNCH_TIMEOUT if the lock was + * not acquired because of a timeout or ESYNCH_WOULD_BLOCK if the + * operation could not be carried out atomically (if requested so). + */ +int futex_down_timeout(atomic_t *futex, uint32_t usec, int flags) +{ + int rc; + + while (atomic_predec(futex) < 0) { + rc = __SYSCALL3(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count, (sysarg_t) usec, (sysarg_t) flags); + + switch (rc) { + case ESYNCH_OK_ATOMIC: + /* + * Because of a race condition between timeout and futex_up() + * and between conditional futex_down_timeout() and futex_up(), + * we have to give up and try again in this special case. + */ + atomic_inc(futex); + break; + + case ESYNCH_TIMEOUT: + atomic_inc(futex); + return ESYNCH_TIMEOUT; + break; + + case ESYNCH_WOULD_BLOCK: + /* + * The conditional down operation should be implemented this way. + * The userspace-only variant tends to accumulate missed wakeups + * in the kernel futex wait queue. + */ + atomic_inc(futex); + return ESYNCH_WOULD_BLOCK; + break; + + case ESYNCH_OK_BLOCKED: + /* + * Enter the critical section. + * The futex counter has already been incremented for us. + */ + return ESYNCH_OK_BLOCKED; + break; + default: + return rc; + } + } + + /* + * Enter the critical section. + */ + return ESYNCH_OK_ATOMIC; +} + +/** Up the futex. + * + * @param futex Futex. + * + * @return ENOENT if there is no such virtual address. Otherwise zero. + */ +int futex_up(atomic_t *futex) +{ + long val; + + val = atomic_postinc(futex); + if (val < 0) + return __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->count); + + return 0; +} + +/** @} + */ Index: uspace/lib/libc/generic/io/file.c =================================================================== --- uspace/lib/libc/generic/io/file.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/file.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,288 @@ +/* + * Copyright (c) 2007 Michal Konopa + * Copyright (c) 2007 Martin Jelen + * Copyright (c) 2007 Peter Majer + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING 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 file.c + * @brief The user library for working with the file system + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../../../fs/dir.h" +#include "../../../share/message.h" +#include "../../../share/shared_proto.h" + +#define CONNECT_SLEEP_INTERVAL 10000 +#define CONNECT_SLEEP_TIMEOUT 100000 + +/** +* +*/ +static int fs_phone; + +static file_t *file_connect(); +static int file_disconnect(file_t *file); + +/** + * Connect to the FS task and share memory with it for further data and + * extended memory transfers + */ +file_t *file_connect() { + file_t *result; + + size_t size; + void *share = NULL; + int retval; + + size = ALIGN_UP(BLOCK_SIZE * sizeof(char), PAGE_SIZE); + share = mmap(share, size, AS_AREA_READ | AS_AREA_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0); + if ((int) share < 0) { + f_err = F_MMAP_FAILURE; + return NULL; + } + + retval = async_req_2(fs_phone, FS_NEW_CONSUMER, task_get_id(), 0, NULL, NULL); + if (retval < 0) { + f_err = F_COMM_FAILURE; + return NULL; + } + + int flags = 0; + flags = AS_AREA_READ | AS_AREA_WRITE; + retval = async_req_3(fs_phone, IPC_M_AS_AREA_SEND, (uintptr_t)share, size, flags, NULL, NULL, NULL); + if (retval < 0) { + f_err = F_COMM_FAILURE; + return NULL; + } + + /* Allocating structure for extended message. */ + message_params_t *params = malloc(sizeof(message_params_t)); + memset((void*) params, 0, sizeof(message_params_t)); + + result = malloc(sizeof(file_t)); + result->share = share; + result->size = size; + result->params = params; + + f_err = F_OK; + return result; +} + +/** + * Disconnect from the FS task, unsharing memory and freeing the file data structure + */ +int file_disconnect(file_t *file) { + int retval = send_request(fs_phone, FS_DROP_CONSUMER, file->params, file->share); + if (retval < 0) + return -1; + + /* Unmapping share area. */ + retval = munmap(file->share, file->size); + if (retval < 0) + return -1; + + file->size = ALIGN_UP(BLOCK_SIZE * sizeof(char), PAGE_SIZE); + file->share = mmap(file->share, file->size, AS_AREA_READ | AS_AREA_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0); + if ((int) (file->share) < 0) + return -1; + + free(file); + f_err = F_OK; + return F_OK; +} + +/** + * List contents of the current directory + */ +dir_item_t *ls(unsigned int *length) { + dir_item_t *result; + unsigned short entries_num; + + file_t *shared_file = file_connect(); + if (shared_file == NULL) + return NULL; + + /* We want lookup our work directory. */ + retval = send_request(fs_phone, FS_DSUM, shared_file->params, shared_file->share); + if (retval < 0) { + f_err = F_READ_ERROR; + return NULL; + } + + entries_num = retval; + *length = entries_num; + + result = malloc(entries_num * sizeof (dir_item_t)); + + int entry; + for (entry = 0; entry < entries_num; entry++) { + shared_file->params->entry_number = entry; + retval = send_request(fs_phone, FS_READENTRY, shared_file->params, shared_file->share); + if (retval < 0) { + f_err = F_READ_ERROR; + return NULL; + } + + memcpy(&(result[entry].inode_num), shared_file->share, sizeof(unsigned short)); + memcpy(result[entry].name, (void *)(shared_file->share+sizeof(unsigned short)), retval-sizeof(unsigned short)); + + /* Do not show empty entries. */ + if (!result[entry].inode_num) + continue; + + } + return result; +} + +/** + * Change the current working directory for the task + */ +int chdir(char * new_dir) +{ + file_t *shared_file = file_connect(); + + if (shared_file == NULL) { + f_err = F_READ_ERROR; + return F_READ_ERROR; + } + memcpy(shared_file->params->fname, new_dir, 30); + + int retval = send_request(fs_phone, FS_CHDIR, shared_file->params, shared_file->share); + if (retval < 0) { + f_err = F_READ_ERROR; + return F_READ_ERROR; + } + + retval = file_disconnect(shared_file); + f_err = F_OK; + return F_OK; +} + +/** + * Open a file for reading and/or writing + */ +file_t *fopen(char *name, int mode) +{ + file_t *file = file_connect(); + + /* We want to work with the specified file. */ + memcpy(file->params->fname, name, 30); + + int retval = send_request(fs_phone, FS_OPEN, file->params, file->share); + if (retval < 0) + return NULL; + + file->handle = retval; + + return file; +} + +/** + * Read status information about a file + */ +int fstat(file_t *file) +{ + memcpy(file->params->fname, file->base_info.name, 30); + file->params->fd = file->handle; + + int retval = send_request(fs_phone, FS_FSTAT, file->params, file->share); + if (retval < 0) + return -1; + + memcpy((void *)(&file->stat), file->share, sizeof(stat_t)); + + f_err = F_OK; + return F_OK; +} + +/** + * Read data from a file + */ +int fread(file_t *file, void* buffer, unsigned int size) +{ + file->params->nbytes = size; + + int retval = send_request(fs_phone, FS_READ, file->params, file->share); + if (retval < 0) + return -1; + + f_err = F_OK; + return F_OK; +} + +/** + * Seek to a position within a file + */ +int fseek(file_t *file, int offset, int whence) +{ + file->params->offset = 0; + file->params->whence = 0; /* from beginning of the file */ + + int retval = send_request(fs_phone, FS_SEEK, file->params, file->share); + if (retval < 0) + return -1; + + f_err = F_OK; + return F_OK; +} + +/** + * Close a file + */ +int fclose(file_t *file) +{ + int retval = send_request(fs_phone, FS_CLOSE, file->params, file->share); + if (retval < 0) + return -1; + + if (file != NULL) + file_disconnect(file); + + f_err = F_OK; + return F_OK; +} + +/** + *@} + */ Index: uspace/lib/libc/generic/io/io.c =================================================================== --- uspace/lib/libc/generic/io/io.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/io.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,107 @@ +/* + * 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 + */ + +#include +#include +#include +#include + +const static char nl = '\n'; + +int puts(const char *str) +{ + size_t count; + + if (str == NULL) + return putnchars("(NULL)", 6); + + for (count = 0; str[count] != 0; count++); + if (write(1, (void *) str, count) == count) { + if (write(1, &nl, 1) == 1) + return 0; + } + + return EOF; +} + +/** Put count chars from buffer to stdout without adding newline + * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed! + * @param count + * @return 0 on succes, EOF on fail + */ +int putnchars(const char *buf, size_t count) +{ + if (write(1, (void *) buf, count) == count) + return 0; + + return EOF; +} + +/** Same as puts, but does not print newline at end + * + */ +int putstr(const char *str) +{ + size_t count; + + if (str == NULL) + return putnchars("(NULL)", 6); + + for (count = 0; str[count] != 0; count++); + if (write(1, (void *) str, count) == count) + return 0; + + return EOF; +} + +int putchar(int c) +{ + unsigned char ch = c; + if (write(1, (void *) &ch, 1) == 1) + return c; + + return EOF; +} + +int getchar(void) +{ + unsigned char c; + if (read(0, (void *) &c, 1) == 1) + return c; + + return EOF; +} + +/** @} + */ Index: uspace/lib/libc/generic/io/printf.c =================================================================== --- uspace/lib/libc/generic/io/printf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/printf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,58 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include + +/** Print formatted text. + * @param fmt format string + * \see For more details about format string see printf_core. + */ +int printf(const char *fmt, ...) +{ + int ret; + va_list args; + + va_start(args, fmt); + + ret = vprintf(fmt, args); + + va_end(args); + + return ret; +} + +/** @} + */ Index: uspace/lib/libc/generic/io/printf_core.c =================================================================== --- uspace/lib/libc/generic/io/printf_core.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/printf_core.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,683 @@ +/* + * Copyright (c) 2001-2004 Jakub Jermar + * 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 libc + * @{ + */ +/** + * @file + * @brief Printing functions. + */ + +#include +#include +#include +#include +#include + +#define __PRINTF_FLAG_PREFIX 0x00000001 /**< show prefixes 0x or 0*/ +#define __PRINTF_FLAG_SIGNED 0x00000002 /**< signed / unsigned number */ +#define __PRINTF_FLAG_ZEROPADDED 0x00000004 /**< print leading zeroes */ +#define __PRINTF_FLAG_LEFTALIGNED 0x00000010 /**< align to left */ +#define __PRINTF_FLAG_SHOWPLUS 0x00000020 /**< always show + sign */ +#define __PRINTF_FLAG_SPACESIGN 0x00000040 /**< print space instead of plus */ +#define __PRINTF_FLAG_BIGCHARS 0x00000080 /**< show big characters */ +#define __PRINTF_FLAG_NEGATIVE 0x00000100 /**< number has - sign */ + +#define PRINT_NUMBER_BUFFER_SIZE (64+5) /**< Buffer big enought for 64 bit number + * printed in base 2, sign, prefix and + * 0 to terminate string.. (last one is only for better testing + * end of buffer by zero-filling subroutine) + */ +/** Enumeration of possible arguments types. + */ +typedef enum { + PrintfQualifierByte = 0, + PrintfQualifierShort, + PrintfQualifierInt, + PrintfQualifierLong, + PrintfQualifierLongLong, + PrintfQualifierSizeT, + PrintfQualifierPointer +} qualifier_t; + +static char digits_small[] = "0123456789abcdef"; /**< Small hexadecimal characters */ +static char digits_big[] = "0123456789ABCDEF"; /**< Big hexadecimal characters */ + +/** Print count chars from buffer without adding newline + * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed! + * @param count + * @param ps output method and its data + * @return number of printed characters + */ +static int printf_putnchars(const char * buf, size_t count, struct printf_spec *ps) +{ + return ps->write((void *)buf, count, ps->data); +} + +/** Print string without added newline + * @param str string to print + * @param ps write function specification and support data + * @return number of printed characters + */ +static int printf_putstr(const char * str, struct printf_spec *ps) +{ + size_t count; + + if (str == NULL) + return printf_putnchars("(NULL)", 6, ps); + + for (count = 0; str[count] != 0; count++); + + if (ps->write((void *) str, count, ps->data) == count) + return 0; + + return EOF; +} + +/** Print one character to output + * @param c one character + * @param ps output method + * @return number of printed characters + */ +static int printf_putchar(int c, struct printf_spec *ps) +{ + unsigned char ch = c; + + return ps->write((void *) &ch, 1, ps->data); +} + +/** Print one formatted character + * @param c character to print + * @param width + * @param flags + * @return number of printed characters + */ +static int print_char(char c, int width, uint64_t flags, struct printf_spec *ps) +{ + int counter = 0; + + if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { + while (--width > 0) { /* one space is consumed by character itself hence predecrement */ + if (printf_putchar(' ', ps) > 0) + ++counter; + } + } + + if (printf_putchar(c, ps) > 0) + counter++; + + while (--width > 0) { /* one space is consumed by character itself hence predecrement */ + if (printf_putchar(' ', ps) > 0) + ++counter; + } + + return ++counter; +} + +/** Print one string + * @param s string + * @param width + * @param precision + * @param flags + * @return number of printed characters + */ + +static int print_string(char *s, int width, int precision, uint64_t flags, struct printf_spec *ps) +{ + int counter = 0; + size_t size; + int retval; + + if (s == NULL) { + return printf_putstr("(NULL)", ps); + } + + size = strlen(s); + + /* print leading spaces */ + + if (precision == 0) + precision = size; + + width -= precision; + + if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { + while (width-- > 0) { + if (printf_putchar(' ', ps) == 1) + counter++; + } + } + + while (precision > size) { + precision--; + if (printf_putchar(' ', ps) == 1) + ++counter; + } + + if ((retval = printf_putnchars(s, precision, ps)) < 0) { + return -counter; + } + + counter += retval; + + while (width-- > 0) { + if (printf_putchar(' ', ps) == 1) + ++counter; + } + + return counter; +} + + +/** Print number in given base + * + * Print significant digits of a number in given + * base. + * + * @param num Number to print. + * @param width + * @param precision + * @param base Base to print the number in (should + * be in range 2 .. 16). + * @param flags output modifiers + * @return number of printed characters + * + */ +static int print_number(uint64_t num, int width, int precision, int base , uint64_t flags, struct printf_spec *ps) +{ + char *digits = digits_small; + char d[PRINT_NUMBER_BUFFER_SIZE]; /* this is good enough even for base == 2, prefix and sign */ + char *ptr = &d[PRINT_NUMBER_BUFFER_SIZE - 1]; + int size = 0; /* size of number with all prefixes and signs */ + int number_size; /* size of plain number */ + char sgn; + int retval; + int counter = 0; + + if (flags & __PRINTF_FLAG_BIGCHARS) + digits = digits_big; + + *ptr-- = 0; /* Put zero at end of string */ + + if (num == 0) { + *ptr-- = '0'; + size++; + } else { + do { + *ptr-- = digits[num % base]; + size++; + } while (num /= base); + } + + number_size = size; + + /* Collect sum of all prefixes/signs/... to calculate padding and leading zeroes */ + if (flags & __PRINTF_FLAG_PREFIX) { + switch(base) { + case 2: /* Binary formating is not standard, but usefull */ + size += 2; + break; + case 8: + size++; + break; + case 16: + size += 2; + break; + } + } + + sgn = 0; + if (flags & __PRINTF_FLAG_SIGNED) { + if (flags & __PRINTF_FLAG_NEGATIVE) { + sgn = '-'; + size++; + } else if (flags & __PRINTF_FLAG_SHOWPLUS) { + sgn = '+'; + size++; + } else if (flags & __PRINTF_FLAG_SPACESIGN) { + sgn = ' '; + size++; + } + } + + if (flags & __PRINTF_FLAG_LEFTALIGNED) { + flags &= ~__PRINTF_FLAG_ZEROPADDED; + } + + /* if number is leftaligned or precision is specified then zeropadding is ignored */ + if (flags & __PRINTF_FLAG_ZEROPADDED) { + if ((precision == 0) && (width > size)) { + precision = width - size + number_size; + } + } + + /* print leading spaces */ + if (number_size > precision) /* We must print whole number not only a part */ + precision = number_size; + + width -= precision + size - number_size; + + if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { + while (width-- > 0) { + if (printf_putchar(' ', ps) == 1) + counter++; + } + } + + /* print sign */ + if (sgn) { + if (printf_putchar(sgn, ps) == 1) + counter++; + } + + /* print prefix */ + + if (flags & __PRINTF_FLAG_PREFIX) { + switch(base) { + case 2: /* Binary formating is not standard, but usefull */ + if (printf_putchar('0', ps) == 1) + counter++; + if (flags & __PRINTF_FLAG_BIGCHARS) { + if (printf_putchar('B', ps) == 1) + counter++; + } else { + if (printf_putchar('b', ps) == 1) + counter++; + } + break; + case 8: + if (printf_putchar('o', ps) == 1) + counter++; + break; + case 16: + if (printf_putchar('0', ps) == 1) + counter++; + if (flags & __PRINTF_FLAG_BIGCHARS) { + if (printf_putchar('X', ps) == 1) + counter++; + } else { + if (printf_putchar('x', ps) == 1) + counter++; + } + break; + } + } + + /* print leading zeroes */ + precision -= number_size; + while (precision-- > 0) { + if (printf_putchar('0', ps) == 1) + counter++; + } + + + /* print number itself */ + + if ((retval = printf_putstr(++ptr, ps)) > 0) { + counter += retval; + } + + /* print ending spaces */ + + while (width-- > 0) { + if (printf_putchar(' ', ps) == 1) + counter++; + } + + return counter; +} + + +/** Print formatted string. + * + * Print string formatted according to the fmt parameter + * and variadic arguments. Each formatting directive + * must have the following form: + * + * \% [ FLAGS ] [ WIDTH ] [ .PRECISION ] [ TYPE ] CONVERSION + * + * FLAGS:@n + * - "#" Force to print prefix. + * For conversion \%o the prefix is 0, for %x and \%X prefixes are 0x and 0X + * and for conversion \%b the prefix is 0b. + * + * - "-" Align to left. + * + * - "+" Print positive sign just as negative. + * + * - " " If the printed number is positive and "+" flag is not set, print space in + * place of sign. + * + * - "0" Print 0 as padding instead of spaces. Zeroes are placed between sign and the + * rest of the number. This flag is ignored if "-" flag is specified. + * + * WIDTH:@n + * - Specify minimal width of printed argument. If it is bigger, width is ignored. + * If width is specified with a "*" character instead of number, width is taken from + * parameter list. And integer parameter is expected before parameter for processed + * conversion specification. If this value is negative its absolute value is taken + * and the "-" flag is set. + * + * PRECISION:@n + * - Value precision. For numbers it specifies minimum valid numbers. + * Smaller numbers are printed with leading zeroes. Bigger numbers are not affected. + * Strings with more than precision characters are cut off. + * Just as with width, an "*" can be used used instead of a number. + * An integer value is then expected in parameters. When both width and precision + * are specified using "*", the first parameter is used for width and the second one + * for precision. + * + * TYPE:@n + * - "hh" Signed or unsigned char.@n + * - "h" Signed or usigned short.@n + * - "" Signed or usigned int (default value).@n + * - "l" Signed or usigned long int.@n + * - "ll" Signed or usigned long long int.@n + * - "z" Type size_t.@n + * + * + * CONVERSION:@n + * - % Print percentile character itself. + * + * - c Print single character. + * + * - s Print zero terminated string. If a NULL value is passed as value, "(NULL)" is printed instead. + * + * - P, p Print value of a pointer. Void * value is expected and it is printed in hexadecimal notation with prefix + * (as with '\%#X' or '\%#x' for 32bit or '\%#X' or '\%#x' for 64bit long pointers). + * + * - b Print value as unsigned binary number. Prefix is not printed by default. (Nonstandard extension.) + * + * - o Print value as unsigned octal number. Prefix is not printed by default. + * + * - d,i Print signed decimal number. There is no difference between d and i conversion. + * + * - u Print unsigned decimal number. + * + * - X, x Print hexadecimal number with upper- or lower-case. Prefix is not printed by default. + * + * All other characters from fmt except the formatting directives + * are printed in verbatim. + * + * @param fmt Formatting NULL terminated string. + * @return Number of printed characters or negative value on failure. + */ +int printf_core(const char *fmt, struct printf_spec *ps, va_list ap) +{ + int i = 0, j = 0; /* i is index of currently processed char from fmt, j is index to the first not printed nonformating character */ + int end; + int counter; /* counter of printed characters */ + int retval; /* used to store return values from called functions */ + char c; + qualifier_t qualifier; /* type of argument */ + int base; /* base in which will be parameter (numbers only) printed */ + uint64_t number; /* argument value */ + size_t size; /* byte size of integer parameter */ + int width, precision; + uint64_t flags; + + counter = 0; + + while ((c = fmt[i])) { + /* control character */ + if (c == '%' ) { + /* print common characters if any processed */ + if (i > j) { + if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) < 0) { /* error */ + goto minus_out; + } + counter += retval; + } + + j = i; + /* parse modifiers */ + flags = 0; + end = 0; + + do { + ++i; + switch (c = fmt[i]) { + case '#': flags |= __PRINTF_FLAG_PREFIX; break; + case '-': flags |= __PRINTF_FLAG_LEFTALIGNED; break; + case '+': flags |= __PRINTF_FLAG_SHOWPLUS; break; + case ' ': flags |= __PRINTF_FLAG_SPACESIGN; break; + case '0': flags |= __PRINTF_FLAG_ZEROPADDED; break; + default: end = 1; + }; + + } while (end == 0); + + /* width & '*' operator */ + width = 0; + if (isdigit(fmt[i])) { + while (isdigit(fmt[i])) { + width *= 10; + width += fmt[i++] - '0'; + } + } else if (fmt[i] == '*') { + /* get width value from argument list*/ + i++; + width = (int)va_arg(ap, int); + if (width < 0) { + /* negative width means to set '-' flag */ + width *= -1; + flags |= __PRINTF_FLAG_LEFTALIGNED; + } + } + + /* precision and '*' operator */ + precision = 0; + if (fmt[i] == '.') { + ++i; + if (isdigit(fmt[i])) { + while (isdigit(fmt[i])) { + precision *= 10; + precision += fmt[i++] - '0'; + } + } else if (fmt[i] == '*') { + /* get precision value from argument list*/ + i++; + precision = (int)va_arg(ap, int); + if (precision < 0) { + /* negative precision means to ignore it */ + precision = 0; + } + } + } + + switch (fmt[i++]) { + /** TODO: unimplemented qualifiers: + * t ptrdiff_t - ISO C 99 + */ + case 'h': /* char or short */ + qualifier = PrintfQualifierShort; + if (fmt[i] == 'h') { + i++; + qualifier = PrintfQualifierByte; + } + break; + case 'l': /* long or long long*/ + qualifier = PrintfQualifierLong; + if (fmt[i] == 'l') { + i++; + qualifier = PrintfQualifierLongLong; + } + break; + case 'z': /* size_t */ + qualifier = PrintfQualifierSizeT; + break; + default: + qualifier = PrintfQualifierInt; /* default type */ + --i; + } + + base = 10; + + switch (c = fmt[i]) { + + /* + * String and character conversions. + */ + case 's': + if ((retval = print_string(va_arg(ap, char*), width, precision, flags, ps)) < 0) { + goto minus_out; + } + + counter += retval; + j = i + 1; + goto next_char; + case 'c': + c = va_arg(ap, unsigned int); + if ((retval = print_char(c, width, flags, ps)) < 0) { + goto minus_out; + } + + counter += retval; + j = i + 1; + goto next_char; + + /* + * Integer values + */ + case 'P': /* pointer */ + flags |= __PRINTF_FLAG_BIGCHARS; + case 'p': + flags |= __PRINTF_FLAG_PREFIX; + base = 16; + qualifier = PrintfQualifierPointer; + break; + case 'b': + base = 2; + break; + case 'o': + base = 8; + break; + case 'd': + case 'i': + flags |= __PRINTF_FLAG_SIGNED; + case 'u': + break; + case 'X': + flags |= __PRINTF_FLAG_BIGCHARS; + case 'x': + base = 16; + break; + /* percentile itself */ + case '%': + j = i; + goto next_char; + /* + * Bad formatting. + */ + default: + /* Unknown format + * now, the j is index of '%' so we will + * print whole bad format sequence + */ + goto next_char; + } + + + /* Print integers */ + /* print number */ + switch (qualifier) { + case PrintfQualifierByte: + size = sizeof(unsigned char); + number = (uint64_t)va_arg(ap, unsigned int); + break; + case PrintfQualifierShort: + size = sizeof(unsigned short); + number = (uint64_t)va_arg(ap, unsigned int); + break; + case PrintfQualifierInt: + size = sizeof(unsigned int); + number = (uint64_t)va_arg(ap, unsigned int); + break; + case PrintfQualifierLong: + size = sizeof(unsigned long); + number = (uint64_t)va_arg(ap, unsigned long); + break; + case PrintfQualifierLongLong: + size = sizeof(unsigned long long); + number = (uint64_t)va_arg(ap, unsigned long long); + break; + case PrintfQualifierPointer: + size = sizeof(void *); + number = (uint64_t)(unsigned long)va_arg(ap, void *); + break; + case PrintfQualifierSizeT: + size = sizeof(size_t); + number = (uint64_t)va_arg(ap, size_t); + break; + default: /* Unknown qualifier */ + goto minus_out; + + } + + if (flags & __PRINTF_FLAG_SIGNED) { + if (number & (0x1 << (size*8 - 1))) { + flags |= __PRINTF_FLAG_NEGATIVE; + + if (size == sizeof(uint64_t)) { + number = -((int64_t)number); + } else { + number = ~number; + number &= (~((0xFFFFFFFFFFFFFFFFll) << (size * 8))); + number++; + } + } + } + + if ((retval = print_number(number, width, precision, base, flags, ps)) < 0 ) { + goto minus_out; + }; + + counter += retval; + j = i + 1; + } +next_char: + + ++i; + } + + if (i > j) { + if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) < 0) { /* error */ + goto minus_out; + } + counter += retval; + } + + return counter; +minus_out: + return -counter; +} + +/** @} + */ Index: uspace/lib/libc/generic/io/snprintf.c =================================================================== --- uspace/lib/libc/generic/io/snprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/snprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,59 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include + +/** Print formatted to the given buffer with limited size. + * @param str buffer + * @param size buffer size + * @param fmt format string + * \see For more details about format string see printf_core. + */ +int snprintf(char *str, size_t size, const char *fmt, ...) +{ + int ret; + va_list args; + + va_start(args, fmt); + ret = vsnprintf(str, size, fmt, args); + + va_end(args); + + return ret; +} + +/** @} + */ Index: uspace/lib/libc/generic/io/sprintf.c =================================================================== --- uspace/lib/libc/generic/io/sprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/sprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,58 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include + +/** Print formatted to the given buffer. + * @param str buffer + * @param fmt format string + * \see For more details about format string see printf_core. + */ +int sprintf(char *str, const char *fmt, ...) +{ + int ret; + va_list args; + + va_start(args, fmt); + ret = vsprintf(str, fmt, args); + + va_end(args); + + return ret; +} + +/** @} + */ Index: uspace/lib/libc/generic/io/stream.c =================================================================== --- uspace/lib/libc/generic/io/stream.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/stream.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,189 @@ +/* + * Copyright (c) 2006 Josef Cejka + * Copyright (c) 2006 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define FDS 32 + +typedef struct stream_t { + pwritefn_t w; + preadfn_t r; + void * param; + int phone; +} stream_t; + +static int console_phone = -1; +static stream_t streams[FDS]; + +static ssize_t write_stderr(void *param, const void *buf, size_t count) +{ + return count; +} + +static ssize_t read_stdin(void *param, void *buf, size_t count) +{ + ipcarg_t r0,r1; + size_t i = 0; + + while (i < count) { + if (async_req_2(streams[0].phone, CONSOLE_GETCHAR, 0, 0, &r0, &r1) < 0) { + return -1; + } + ((char *) buf)[i++] = r0; + } + return i; +} + +static ssize_t write_stdout(void *param, const void *buf, size_t count) +{ + int i; + + for (i = 0; i < count; i++) + async_msg(streams[1].phone, CONSOLE_PUTCHAR, ((const char *) buf)[i]); + + return count; +} + +static stream_t open_stdin(void) +{ + stream_t stream; + + if (console_phone < 0) { + while ((console_phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) { + usleep(10000); + } + } + + stream.r = read_stdin; + stream.w = NULL; + stream.param = 0; + stream.phone = console_phone; + + return stream; +} + +static stream_t open_stdout(void) +{ + stream_t stream; + + if (console_phone < 0) { + while ((console_phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) { + usleep(10000); + } + } + + stream.r = NULL; + stream.w = write_stdout; + stream.phone = console_phone; + stream.param = 0; + + return stream; +} + +static ssize_t write_null(void *param, const void *buf, size_t count) +{ + return count; +} + +fd_t open(const char *fname, int flags) +{ + int c = 0; + + while (((streams[c].w) || (streams[c].r)) && (c < FDS)) + c++; + + if (c == FDS) + return EMFILE; + + if (!strcmp(fname, "stdin")) { + streams[c] = open_stdin(); + return c; + } + + if (!strcmp(fname, "stdout")) { + streams[c] = open_stdout(); + return c; + } + + if (!strcmp(fname, "stderr")) { + streams[c].w = write_stderr; + return c; + } + + if (!strcmp(fname, "null")) { + streams[c].w = write_null; + return c; + } + + return -1; +} + + +ssize_t write(int fd, const void *buf, size_t count) +{ + if (fd < FDS && streams[fd].w) + return streams[fd].w(streams[fd].param, buf, count); + + return 0; +} + +ssize_t read(int fd, void *buf, size_t count) +{ + if (fd < FDS && streams[fd].r) + return streams[fd].r(streams[fd].param, buf, count); + + return 0; +} + +int get_fd_phone(int fd) +{ + if (fd >= FDS || fd < 0) + return -1; + return streams[fd].phone; +} + +/** @} + */ Index: uspace/lib/libc/generic/io/vprintf.c =================================================================== --- uspace/lib/libc/generic/io/vprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/vprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,76 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include + +static atomic_t printf_futex = FUTEX_INITIALIZER; + +static int vprintf_write(const char *str, size_t count, void *unused) +{ + return write(1, str, count); +} + +/** Print formatted text. + * @param fmt format string + * @param ap format parameters + * \see For more details about format string see printf_core. + */ +int vprintf(const char *fmt, va_list ap) +{ + struct printf_spec ps = { + (int (*)(void *, size_t, void *)) vprintf_write, + NULL + }; + /* + * Prevent other threads to execute printf_core() + */ + futex_down(&printf_futex); + /* + * Prevent other pseudo threads of the same thread + * to execute printf_core() + */ + async_serialize_start(); + int ret = printf_core(fmt, &ps, ap); + async_serialize_end(); + futex_up(&printf_futex); + return ret; +} + +/** @} + */ Index: uspace/lib/libc/generic/io/vsnprintf.c =================================================================== --- uspace/lib/libc/generic/io/vsnprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/vsnprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,109 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +struct vsnprintf_data { + size_t size; /* total space for string */ + size_t len; /* count of currently used characters */ + char *string; /* destination string */ +}; + +/** Write string to given buffer. + * Write at most data->size characters including trailing zero. According to C99 has snprintf to return number + * of characters that would have been written if enough space had been available. Hence the return value is not + * number of really printed characters but size of input string. Number of really used characters + * is stored in data->len. + * @param str source string to print + * @param count size of source string + * @param data structure with destination string, counter of used space and total string size. + * @return number of characters to print (not characters really printed!) + */ +static int vsnprintf_write(const char *str, size_t count, struct vsnprintf_data *data) +{ + size_t i; + i = data->size - data->len; + + if (i == 0) { + return count; + } + + if (i == 1) { + /* We have only one free byte left in buffer => write there trailing zero */ + data->string[data->size - 1] = 0; + data->len = data->size; + return count; + } + + if (i <= count) { + /* We have not enought space for whole string with the trailing zero => print only a part of string */ + memcpy((void *)(data->string + data->len), (void *)str, i - 1); + data->string[data->size - 1] = 0; + data->len = data->size; + return count; + } + + /* Buffer is big enought to print whole string */ + memcpy((void *)(data->string + data->len), (void *)str, count); + data->len += count; + /* Put trailing zero at end, but not count it into data->len so it could be rewritten next time */ + data->string[data->len] = 0; + + return count; +} + +/** Print formatted to the given buffer with limited size. + * @param str buffer + * @param size buffer size + * @param fmt format string + * \see For more details about format string see printf_core. + */ +int vsnprintf(char *str, size_t size, const char *fmt, va_list ap) +{ + struct vsnprintf_data data = {size, 0, str}; + struct printf_spec ps = {(int(*)(void *, size_t, void *)) vsnprintf_write, &data}; + + /* Print 0 at end of string - fix the case that nothing will be printed */ + if (size > 0) + str[0] = 0; + + /* vsnprintf_write ensures that str will be terminated by zero. */ + return printf_core(fmt, &ps, ap); +} + +/** @} + */ Index: uspace/lib/libc/generic/io/vsprintf.c =================================================================== --- uspace/lib/libc/generic/io/vsprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/io/vsprintf.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include + +/** Print formatted to the given buffer. + * @param str buffer + * @param fmt format string + * @param ap argument list + * \see For more details about format string see printf_core. + */ +int vsprintf(char *str, const char *fmt, va_list ap) +{ + return vsnprintf(str, (size_t) - 1, fmt, ap); +} + +/** @} + */ Index: uspace/lib/libc/generic/ipc.c =================================================================== --- uspace/lib/libc/generic/ipc.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/ipc.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,597 @@ +/* + * 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 libc + * @{ + * @} + */ + +/** @addtogroup libcipc IPC + * @brief HelenOS uspace IPC + * @{ + * @ingroup libc + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/** Structure used for keeping track of sent asynchronous calls and queing + * unsent calls. + */ +typedef struct { + link_t list; + + ipc_async_callback_t callback; + void *private; + union { + ipc_callid_t callid; + struct { + ipc_call_t data; + int phoneid; + } msg; + } u; + pstid_t ptid; /**< Pseudothread waiting for sending this call. */ +} async_call_t; + +LIST_INITIALIZE(dispatched_calls); + +/** List of asynchronous calls that were not accepted by kernel. + * + * It is protected by async_futex, because if the call cannot be sent into the + * kernel, the async framework is used automatically. + */ +LIST_INITIALIZE(queued_calls); + +static atomic_t ipc_futex = FUTEX_INITIALIZER; + +/** Make a fast synchronous call. + * + * Only one payload argument can be passed using this function. However, this + * function is faster than the generic ipc_call_sync_3(). + * + * @param phoneid Phone handle for the call. + * @param method Requested method. + * @param arg1 Service-defined payload argument. + * @param result If non-NULL, the return ARG1 will be stored there. + * + * @return Negative values represent errors returned by IPC. + * Otherwise the RETVAL of the answer is returned. + */ +int ipc_call_sync(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t *result) +{ + ipc_call_t resdata; + int callres; + + callres = __SYSCALL4(SYS_IPC_CALL_SYNC_FAST, phoneid, method, arg1, + (sysarg_t) &resdata); + if (callres) + return callres; + if (result) + *result = IPC_GET_ARG1(resdata); + return IPC_GET_RETVAL(resdata); +} + +/** Make a synchronous call transmitting 3 arguments of payload. + * + * @param phoneid Phone handle for the call. + * @param method Requested method. + * @param arg1 Service-defined payload argument. + * @param arg2 Service-defined payload argument. + * @param arg3 Service-defined payload argument. + * @param result1 If non-NULL, storage for the first return argument. + * @param result2 If non-NULL, storage for the second return argument. + * @param result3 If non-NULL, storage for the third return argument. + * + * @return Negative value means IPC error. + * Otherwise the RETVAL of the answer. + */ +int ipc_call_sync_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, + ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3) +{ + ipc_call_t data; + int callres; + + IPC_SET_METHOD(data, method); + IPC_SET_ARG1(data, arg1); + IPC_SET_ARG2(data, arg2); + IPC_SET_ARG3(data, arg3); + + callres = __SYSCALL3(SYS_IPC_CALL_SYNC, phoneid, (sysarg_t) &data, + (sysarg_t) &data); + if (callres) + return callres; + + if (result1) + *result1 = IPC_GET_ARG1(data); + if (result2) + *result2 = IPC_GET_ARG2(data); + if (result3) + *result3 = IPC_GET_ARG3(data); + return IPC_GET_RETVAL(data); +} + +/** Syscall to send asynchronous message. + * + * @param phoneid Phone handle for the call. + * @param data Call data with the request. + * + * @return Hash of the call or an error code. + */ +static ipc_callid_t _ipc_call_async(int phoneid, ipc_call_t *data) +{ + return __SYSCALL2(SYS_IPC_CALL_ASYNC, phoneid, (sysarg_t) data); +} + +/** Prolog to ipc_call_async_*() functions. + * + * @param private Argument for the answer/error callback. + * @param callback Answer/error callback. + * + * @return New, partially initialized async_call structure or NULL. + */ +static inline async_call_t *ipc_prepare_async(void *private, + ipc_async_callback_t callback) +{ + async_call_t *call; + + call = malloc(sizeof(*call)); + if (!call) { + if (callback) + callback(private, ENOMEM, NULL); + return NULL; + } + call->callback = callback; + call->private = private; + + return call; +} + +/** Epilogue of ipc_call_async_*() functions. + * + * @param callid Value returned by the SYS_IPC_CALL_ASYNC_* syscall. + * @param phoneid Phone handle through which the call was made. + * @param call async_call structure returned by ipc_prepare_async(). + * @param can_preempt If non-zero, the current pseudo thread can be preempted + * in this call. + */ +static inline void ipc_finish_async(ipc_callid_t callid, int phoneid, + async_call_t *call, int can_preempt) +{ + if (!call) { /* Nothing to do regardless if failed or not */ + futex_up(&ipc_futex); + return; + } + + if (callid == IPC_CALLRET_FATAL) { + futex_up(&ipc_futex); + /* Call asynchronous handler with error code */ + if (call->callback) + call->callback(call->private, ENOENT, NULL); + free(call); + return; + } + + if (callid == IPC_CALLRET_TEMPORARY) { + futex_up(&ipc_futex); + + call->u.msg.phoneid = phoneid; + + futex_down(&async_futex); + list_append(&call->list, &queued_calls); + + if (can_preempt) { + call->ptid = psthread_get_id(); + psthread_schedule_next_adv(PS_TO_MANAGER); + /* Async futex unlocked by previous call */ + } else { + call->ptid = 0; + futex_up(&async_futex); + } + return; + } + call->u.callid = callid; + /* Add call to the list of dispatched calls */ + list_append(&call->list, &dispatched_calls); + futex_up(&ipc_futex); + +} + +/** Make a fast asynchronous call. + * + * This function can only handle two arguments of payload. It is, however, + * faster than the more generic ipc_call_async_3(). + * + * Note that this function is a void function. + * During normal opertation, answering this call will trigger the callback. + * In case of fatal error, call the callback handler with the proper error code. + * If the call cannot be temporarily made, queue it. + * + * @param phoneid Phone handle for the call. + * @param method Requested method. + * @param arg1 Service-defined payload argument. + * @param arg2 Service-defined payload argument. + * @param private Argument to be passed to the answer/error callback. + * @param callback Answer or error callback. + * @param can_preempt If non-zero, the current pseudo thread will be preempted + * in case the kernel temporarily refuses to accept more + * asynchronous calls. + */ +void ipc_call_async_2(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, void *private, ipc_async_callback_t callback, + int can_preempt) +{ + async_call_t *call = NULL; + ipc_callid_t callid; + + if (callback) { + call = ipc_prepare_async(private, callback); + if (!call) + return; + } + + /* + * We need to make sure that we get callid before another thread + * accesses the queue again. + */ + futex_down(&ipc_futex); + callid = __SYSCALL4(SYS_IPC_CALL_ASYNC_FAST, phoneid, method, arg1, + arg2); + + if (callid == IPC_CALLRET_TEMPORARY) { + if (!call) { + call = ipc_prepare_async(private, callback); + if (!call) + return; + } + IPC_SET_METHOD(call->u.msg.data, method); + IPC_SET_ARG1(call->u.msg.data, arg1); + IPC_SET_ARG2(call->u.msg.data, arg2); + } + ipc_finish_async(callid, phoneid, call, can_preempt); +} + +/** Make an asynchronous call transmitting the entire payload. + * + * Note that this function is a void function. + * During normal opertation, answering this call will trigger the callback. + * In case of fatal error, call the callback handler with the proper error code. + * If the call cannot be temporarily made, queue it. + * + * @param phoneid Phone handle for the call. + * @param method Requested method. + * @param arg1 Service-defined payload argument. + * @param arg2 Service-defined payload argument. + * @param arg3 Service-defined payload argument. + * @param private Argument to be passed to the answer/error callback. + * @param callback Answer or error callback. + * @param can_preempt If non-zero, the current pseudo thread will be preempted + * in case the kernel temporarily refuses to accept more + * asynchronous calls. + * + */ +void ipc_call_async_3(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, void *private, ipc_async_callback_t callback, + int can_preempt) +{ + async_call_t *call; + ipc_callid_t callid; + + call = ipc_prepare_async(private, callback); + if (!call) + return; + + IPC_SET_METHOD(call->u.msg.data, method); + IPC_SET_ARG1(call->u.msg.data, arg1); + IPC_SET_ARG2(call->u.msg.data, arg2); + IPC_SET_ARG3(call->u.msg.data, arg3); + /* + * We need to make sure that we get callid before another thread accesses + * the queue again. + */ + futex_down(&ipc_futex); + callid = _ipc_call_async(phoneid, &call->u.msg.data); + + ipc_finish_async(callid, phoneid, call, can_preempt); +} + + +/** Answer a received call - fast version. + * + * The fast answer makes use of passing retval and first two arguments in + * registers. If you need to return more, use the ipc_answer() instead. + * + * @param callid Hash of the call being answered. + * @param retval Return value. + * @param arg1 First return argument. + * @param arg2 Second return argument. + * + * @return Zero on success or a value from @ref errno.h on failure. + */ +ipcarg_t ipc_answer_fast(ipc_callid_t callid, ipcarg_t retval, ipcarg_t arg1, + ipcarg_t arg2) +{ + return __SYSCALL4(SYS_IPC_ANSWER_FAST, callid, retval, arg1, arg2); +} + +/** Answer a received call - full version. + * + * @param callid Hash of the call being answered. + * @param call Call structure with the answer. + * Must be already initialized by the responder. + * + * @return Zero on success or a value from @ref errno.h on failure. + */ +ipcarg_t ipc_answer(ipc_callid_t callid, ipc_call_t *call) +{ + return __SYSCALL2(SYS_IPC_ANSWER, callid, (sysarg_t) call); +} + + +/** Try to dispatch queued calls from the async queue. */ +static void try_dispatch_queued_calls(void) +{ + async_call_t *call; + ipc_callid_t callid; + + /** @todo + * Integrate intelligently ipc_futex, so that it is locked during + * ipc_call_async_*(), until it is added to dispatched_calls. + */ + futex_down(&async_futex); + while (!list_empty(&queued_calls)) { + call = list_get_instance(queued_calls.next, async_call_t, list); + callid = _ipc_call_async(call->u.msg.phoneid, &call->u.msg.data); + if (callid == IPC_CALLRET_TEMPORARY) { + break; + } + list_remove(&call->list); + + futex_up(&async_futex); + if (call->ptid) + psthread_add_ready(call->ptid); + + if (callid == IPC_CALLRET_FATAL) { + if (call->callback) + call->callback(call->private, ENOENT, NULL); + free(call); + } else { + call->u.callid = callid; + futex_down(&ipc_futex); + list_append(&call->list, &dispatched_calls); + futex_up(&ipc_futex); + } + futex_down(&async_futex); + } + futex_up(&async_futex); +} + +/** Handle a received answer. + * + * Find the hash of the answer and call the answer callback. + * + * @todo Make it use hash table. + * + * @param callid Hash of the received answer. + * The answer has the same hash as the request OR'ed with + * the IPC_CALLID_ANSWERED bit. + * @param data Call data of the answer. + */ +static void handle_answer(ipc_callid_t callid, ipc_call_t *data) +{ + link_t *item; + async_call_t *call; + + callid &= ~IPC_CALLID_ANSWERED; + + futex_down(&ipc_futex); + for (item = dispatched_calls.next; item != &dispatched_calls; + item = item->next) { + call = list_get_instance(item, async_call_t, list); + if (call->u.callid == callid) { + list_remove(&call->list); + futex_up(&ipc_futex); + if (call->callback) + call->callback(call->private, + IPC_GET_RETVAL(*data), data); + free(call); + return; + } + } + futex_up(&ipc_futex); +} + + +/** Wait for a first call to come. + * + * @param call Storage where the incoming call data will be stored. + * @param usec Timeout in microseconds + * @param flags Flags passed to SYS_IPC_WAIT (blocking, nonblocking). + * + * @return Hash of the call. Note that certain bits have special + * meaning. IPC_CALLID_ANSWERED will be set in an answer + * and IPC_CALLID_NOTIFICATION is used for notifications. + * + */ +ipc_callid_t ipc_wait_cycle(ipc_call_t *call, uint32_t usec, int flags) +{ + ipc_callid_t callid; + + callid = __SYSCALL3(SYS_IPC_WAIT, (sysarg_t) call, usec, flags); + /* Handle received answers */ + if (callid & IPC_CALLID_ANSWERED) { + handle_answer(callid, call); + try_dispatch_queued_calls(); + } + + return callid; +} + +/** Wait some time for an IPC call. + * + * The call will return after an answer is received. + * + * @param call Storage where the incoming call data will be stored. + * @param usec Timeout in microseconds. + * + * @return Hash of the answer. + */ +ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *call, uint32_t usec) +{ + ipc_callid_t callid; + + do { + callid = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE); + } while (callid & IPC_CALLID_ANSWERED); + + return callid; +} + +/** Check if there is an IPC call waiting to be picked up. + * + * @param call Storage where the incoming call will be stored. + * @return Hash of the answer. + */ +ipc_callid_t ipc_trywait_for_call(ipc_call_t *call) +{ + ipc_callid_t callid; + + do { + callid = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT, + SYNCH_FLAGS_NON_BLOCKING); + } while (callid & IPC_CALLID_ANSWERED); + + return callid; +} + +/** Ask destination to do a callback connection. + * + * @param phoneid Phone handle used for contacting the other side. + * @param arg1 Service-defined argument. + * @param arg2 Service-defined argument. + * @param phonehash Storage where the library will store an opaque + * identifier of the phone that will be used for incoming + * calls. This identifier can be used for connection + * tracking. + * + * @return Zero on success or a negative error code. + */ +int ipc_connect_to_me(int phoneid, int arg1, int arg2, ipcarg_t *phonehash) +{ + return ipc_call_sync_3(phoneid, IPC_M_CONNECT_TO_ME, arg1, arg2, 0, 0, 0, + phonehash); +} + +/** Ask through phone for a new connection to some service. + * + * @param phoneid Phone handle used for contacting the other side. + * @param arg1 User defined argument. + * @param arg2 User defined argument. + * + * @return New phone handle on success or a negative error code. + */ +int ipc_connect_me_to(int phoneid, int arg1, int arg2) +{ + ipcarg_t newphid; + int res; + + res = ipc_call_sync_3(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, 0, 0, 0, + &newphid); + if (res) + return res; + return newphid; +} + +/** Hang up a phone. + * + * @param phoneid Handle of the phone to be hung up. + * + * @return Zero on success or a negative error code. + */ +int ipc_hangup(int phoneid) +{ + return __SYSCALL1(SYS_IPC_HANGUP, phoneid); +} + +/** Register IRQ notification. + * + * @param inr IRQ number. + * @param devno Device number of the device generating inr. + * @param method Use this method for notifying me. + * @param ucode Top-half pseudocode handler. + * + * @return Value returned by the kernel. + */ +int ipc_register_irq(int inr, int devno, int method, irq_code_t *ucode) +{ + return __SYSCALL4(SYS_IPC_REGISTER_IRQ, inr, devno, method, + (sysarg_t) ucode); +} + +/** Unregister IRQ notification. + * + * @param inr IRQ number. + * @param devno Device number of the device generating inr. + * + * @return Value returned by the kernel. + */ +int ipc_unregister_irq(int inr, int devno) +{ + return __SYSCALL2(SYS_IPC_UNREGISTER_IRQ, inr, devno); +} + +/** Forward a received call to another destination. + * + * @param callid Hash of the call to forward. + * @param phoneid Phone handle to use for forwarding. + * @param method New method for the forwarded call. + * @param arg1 New value of the first argument for the forwarded call. + * + * @return Zero on success or an error code. + * + * For non-system methods, the old method and arg1 are rewritten by the new + * values. For system methods, the new method and arg1 are written to the old + * arg1 and arg2, respectivelly. + */ +int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method, ipcarg_t arg1) +{ + return __SYSCALL4(SYS_IPC_FORWARD_FAST, callid, phoneid, method, arg1); +} + +/** @} + */ Index: uspace/lib/libc/generic/libadt/hash_table.c =================================================================== --- uspace/lib/libc/generic/libadt/hash_table.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/libadt/hash_table.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,179 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +/* + * This is an implementation of generic chained hash table. + */ + +#include +#include +#include +#include +#include +#include +#include + +/** Create chained hash table. + * + * @param h Hash table structure. Will be initialized by this call. + * @param m Number of slots in the hash table. + * @param max_keys Maximal number of keys needed to identify an item. + * @param op Hash table operations structure. + * @return true on success + */ +int hash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys, hash_table_operations_t *op) +{ + hash_count_t i; + + assert(h); + assert(op && op->hash && op->compare); + assert(max_keys > 0); + + h->entry = malloc(m * sizeof(link_t)); + if (!h->entry) { + printf("cannot allocate memory for hash table\n"); + return false; + } + memset((void *) h->entry, 0, m * sizeof(link_t)); + + for (i = 0; i < m; i++) + list_initialize(&h->entry[i]); + + h->entries = m; + h->max_keys = max_keys; + h->op = op; + return true; +} + +/** Insert item into hash table. + * + * @param h Hash table. + * @param key Array of all keys necessary to compute hash index. + * @param item Item to be inserted into the hash table. + */ +void hash_table_insert(hash_table_t *h, unsigned long key[], link_t *item) +{ + hash_index_t chain; + + assert(item); + assert(h && h->op && h->op->hash && h->op->compare); + + chain = h->op->hash(key); + assert(chain < h->entries); + + list_append(item, &h->entry[chain]); +} + +/** Search hash table for an item matching keys. + * + * @param h Hash table. + * @param key Array of all keys needed to compute hash index. + * + * @return Matching item on success, NULL if there is no such item. + */ +link_t *hash_table_find(hash_table_t *h, unsigned long key[]) +{ + link_t *cur; + hash_index_t chain; + + assert(h && h->op && h->op->hash && h->op->compare); + + chain = h->op->hash(key); + assert(chain < h->entries); + + for (cur = h->entry[chain].next; cur != &h->entry[chain]; cur = cur->next) { + if (h->op->compare(key, h->max_keys, cur)) { + /* + * The entry is there. + */ + return cur; + } + } + + return NULL; +} + +/** Remove all matching items from hash table. + * + * For each removed item, h->remove_callback() is called. + * + * @param h Hash table. + * @param key Array of keys that will be compared against items of the hash table. + * @param keys Number of keys in the 'key' array. + */ +void hash_table_remove(hash_table_t *h, unsigned long key[], hash_count_t keys) +{ + hash_index_t chain; + link_t *cur; + + assert(h && h->op && h->op->hash && h->op->compare && h->op->remove_callback); + assert(keys <= h->max_keys); + + if (keys == h->max_keys) { + + /* + * All keys are known, hash_table_find() can be used to find the entry. + */ + + cur = hash_table_find(h, key); + if (cur) { + list_remove(cur); + h->op->remove_callback(cur); + } + return; + } + + /* + * Fewer keys were passed. + * Any partially matching entries are to be removed. + */ + for (chain = 0; chain < h->entries; chain++) { + for (cur = h->entry[chain].next; cur != &h->entry[chain]; cur = cur->next) { + if (h->op->compare(key, keys, cur)) { + link_t *hlp; + + hlp = cur; + cur = cur->prev; + + list_remove(hlp); + h->op->remove_callback(hlp); + + continue; + } + } + } +} + +/** @} + */ Index: uspace/lib/libc/generic/libadt/list.c =================================================================== --- uspace/lib/libc/generic/libadt/list.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/libadt/list.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,89 @@ +/* + * Copyright (c) 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 libc + * @{ + */ +/** @file + */ + +#include + + +/** Check for membership + * + * Check whether link is contained in the list head. + * The membership is defined as pointer equivalence. + * + * @param link Item to look for. + * @param head List to look in. + * + * @return true if link is contained in head, false otherwise. + * + */ +int list_member(const link_t *link, const link_t *head) +{ + int found = false; + link_t *hlp = head->next; + + while (hlp != head) { + if (hlp == link) { + found = true; + break; + } + hlp = hlp->next; + } + + return found; +} + + +/** Concatenate two lists + * + * Concatenate lists head1 and head2, producing a single + * list head1 containing items from both (in head1, head2 + * order) and empty list head2. + * + * @param head1 First list and concatenated output + * @param head2 Second list and empty output. + * + */ +void list_concat(link_t *head1, link_t *head2) +{ + if (list_empty(head2)) + return; + + head2->next->prev = head1->prev; + head2->prev->next = head1; + head1->prev->next = head2->next; + head1->prev = head2->prev; + list_initialize(head2); +} + +/** @} + */ Index: uspace/lib/libc/generic/libc.c =================================================================== --- uspace/lib/libc/generic/libc.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/libc.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,82 @@ +/* + * 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 lc Libc + * @brief HelenOS C library + * @{ + * @} + */ +/** @addtogroup libc generic + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern char _heap; + +void _exit(int status) +{ + thread_exit(status); +} + +void __main(void) +{ + psthread_data_t *pt; + + (void) as_area_create(&_heap, 1, AS_AREA_WRITE | AS_AREA_READ); + _async_init(); + pt = psthread_setup(); + __tcb_set(pt->tcb); +} + +void __io_init(void) +{ + open("stdin", 0); + open("stdout", 0); + open("stderr", 0); +} + +void __exit(void) +{ + psthread_teardown(__tcb_get()->pst_data); + _exit(0); +} + +/** @} + */ Index: uspace/lib/libc/generic/mman.c =================================================================== --- uspace/lib/libc/generic/mman.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/mman.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,59 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include + +void *mmap(void *start, size_t length, int prot, int flags, int fd, + off_t offset) +{ + if (!start) + start = as_get_mappable_page(length); + +// if (! ((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE))) +// return MAP_FAILED; + if (! (flags & MAP_ANONYMOUS)) + return MAP_FAILED; + + return as_area_create(start, length, prot); +} + +int munmap(void *start, size_t length) +{ + return as_area_destroy(start); +} + +/** @} + */ Index: uspace/lib/libc/generic/psthread.c =================================================================== --- uspace/lib/libc/generic/psthread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/psthread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,308 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef PSTHREAD_INITIAL_STACK_PAGES_NO +#define PSTHREAD_INITIAL_STACK_PAGES_NO 1 +#endif + +static LIST_INITIALIZE(ready_list); +static LIST_INITIALIZE(serialized_list); +static LIST_INITIALIZE(manager_list); + +static void psthread_main(void); + +static atomic_t psthread_futex = FUTEX_INITIALIZER; +/** Count of real threads that are in async_serialized mode */ +static int serialized_threads; /* Protected by async_futex */ +/** Thread-local count of serialization. If >0, we must not preempt */ +static __thread int serialization_count; +/** Counter of threads residing in async_manager */ +static int threads_in_manager; + +/** Setup psthread information into TCB structure */ +psthread_data_t * psthread_setup() +{ + psthread_data_t *pt; + tcb_t *tcb; + + tcb = __make_tls(); + if (!tcb) + return NULL; + + pt = malloc(sizeof(*pt)); + if (!pt) { + __free_tls(tcb); + return NULL; + } + + tcb->pst_data = pt; + pt->tcb = tcb; + + return pt; +} + +void psthread_teardown(psthread_data_t *pt) +{ + __free_tls(pt->tcb); + free(pt); +} + +/** Function that is called on entry to new pseudo thread */ +void psthread_main(void) +{ + psthread_data_t *pt = __tcb_get()->pst_data; + + pt->retval = pt->func(pt->arg); + + pt->finished = 1; + if (pt->waiter) + list_append(&pt->waiter->link, &ready_list); + + psthread_schedule_next_adv(PS_FROM_DEAD); +} + +/** Schedule next userspace pseudo thread. + * + * If calling with PS_TO_MANAGER parameter, the async_futex should be + * held. + * + * @param ctype Type of switch. + * @return 0 if there is no ready pseudo thread, 1 otherwise. + */ +int psthread_schedule_next_adv(pschange_type ctype) +{ + psthread_data_t *srcpt, *dstpt; + int retval = 0; + + futex_down(&psthread_futex); + + if (ctype == PS_PREEMPT && list_empty(&ready_list)) + goto ret_0; + + if (ctype == PS_FROM_MANAGER) { + if (list_empty(&ready_list) && list_empty(&serialized_list)) + goto ret_0; + /* Do not preempt if there is not sufficient count of thread managers */ + if (list_empty(&serialized_list) && threads_in_manager <= serialized_threads) { + goto ret_0; + } + } + /* If we are going to manager and none exists, create it */ + if (ctype == PS_TO_MANAGER || ctype == PS_FROM_DEAD) { + while (list_empty(&manager_list)) { + futex_up(&psthread_futex); + async_create_manager(); + futex_down(&psthread_futex); + } + } + + if (ctype != PS_FROM_DEAD) { + /* Save current state */ + srcpt = __tcb_get()->pst_data; + if (!context_save(&srcpt->ctx)) { + if (serialization_count) + srcpt->flags &= ~PSTHREAD_SERIALIZED; + return 1; // futex_up already done here + } + + /* Save myself to correct run list */ + if (ctype == PS_PREEMPT) + list_append(&srcpt->link, &ready_list); + else if (ctype == PS_FROM_MANAGER) { + list_append(&srcpt->link, &manager_list); + threads_in_manager--; + } /* If ctype == PS_TO_MANAGER, don't save ourselves to any list, we should + * already be somewhere, or we will be lost */ + } else + srcpt = NULL; /* Avoid GCC warning, if ctype == PS_FROM_DEAD, srcpt is not used */ + + /* Choose new thread to run */ + if (ctype == PS_TO_MANAGER || ctype == PS_FROM_DEAD) { + dstpt = list_get_instance(manager_list.next,psthread_data_t, link); + if (serialization_count && ctype == PS_TO_MANAGER) { + serialized_threads++; + srcpt->flags |= PSTHREAD_SERIALIZED; + } + threads_in_manager++; + } else { + if (!list_empty(&serialized_list)) { + dstpt = list_get_instance(serialized_list.next, psthread_data_t, link); + serialized_threads--; + } else + dstpt = list_get_instance(ready_list.next, psthread_data_t, link); + } + list_remove(&dstpt->link); + + futex_up(&psthread_futex); + context_restore(&dstpt->ctx); + +ret_0: + futex_up(&psthread_futex); + return retval; +} + +/** Wait for uspace pseudo thread to finish. + * + * @param psthrid Pseudo thread to wait for. + * + * @return Value returned by the finished thread. + */ +int psthread_join(pstid_t psthrid) +{ + volatile psthread_data_t *pt; + volatile int retval; + + /* Handle psthrid = Kernel address -> it is wait for call */ + pt = (psthread_data_t *) psthrid; + + /* TODO */ + printf("join unsupported\n"); + _exit(1); + + retval = pt->retval; + + free(pt->stack); + psthread_teardown((void *)pt); + + return retval; +} + +/** Create a userspace pseudo thread. + * + * @param func Pseudo thread function. + * @param arg Argument to pass to func. + * + * @return 0 on failure, TLS of the new pseudo thread. + */ +pstid_t psthread_create(int (*func)(void *), void *arg) +{ + psthread_data_t *pt; + + pt = psthread_setup(); + if (!pt) + return 0; + pt->stack = (char *) malloc(PSTHREAD_INITIAL_STACK_PAGES_NO*getpagesize()); + + if (!pt->stack) { + psthread_teardown(pt); + return 0; + } + + pt->arg= arg; + pt->func = func; + pt->finished = 0; + pt->waiter = NULL; + pt->flags = 0; + + context_save(&pt->ctx); + context_set(&pt->ctx, FADDR(psthread_main), pt->stack, PSTHREAD_INITIAL_STACK_PAGES_NO*getpagesize(), pt->tcb); + + return (pstid_t )pt; +} + +/** Add a thread to ready list */ +void psthread_add_ready(pstid_t psthrid) +{ + psthread_data_t *pt; + + pt = (psthread_data_t *) psthrid; + futex_down(&psthread_futex); + if ((pt->flags & PSTHREAD_SERIALIZED)) + list_append(&pt->link, &serialized_list); + else + list_append(&pt->link, &ready_list); + futex_up(&psthread_futex); +} + +/** Add a thread to manager list */ +void psthread_add_manager(pstid_t psthrid) +{ + psthread_data_t *pt; + + pt = (psthread_data_t *) psthrid; + + futex_down(&psthread_futex); + list_append(&pt->link, &manager_list); + futex_up(&psthread_futex); +} + +/** Remove one manager from manager list */ +void psthread_remove_manager() +{ + futex_down(&psthread_futex); + if (list_empty(&manager_list)) { + futex_up(&psthread_futex); + return; + } + list_remove(manager_list.next); + futex_up(&psthread_futex); +} + +/** Return thread id of current running thread */ +pstid_t psthread_get_id(void) +{ + return (pstid_t)__tcb_get()->pst_data; +} + +/** Disable preemption + * + * If the thread wants to send several message in row and does not want + * to be preempted, it should start async_serialize_start() in the beginning + * of communication and async_serialize_end() in the end. If it is a + * true multithreaded application, it should protect the communication channel + * by a futex as well. Interrupt messages will can still be preempted. + */ +void psthread_inc_sercount(void) +{ + serialization_count++; +} + +void psthread_dec_sercount(void) +{ + serialization_count--; +} + +/** @} + */ Index: uspace/lib/libc/generic/stdlib.c =================================================================== --- uspace/lib/libc/generic/stdlib.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/stdlib.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libc + * @{ + */ +/** @file + */ + +#include + +static long glbl_seed = 1; + +long int random(void) +{ + return glbl_seed = ((1366*glbl_seed + 150889) % RAND_MAX); +} + +void srandom(unsigned int seed) +{ + glbl_seed = seed; +} + +/** @} + */ Index: uspace/lib/libc/generic/string.c =================================================================== --- uspace/lib/libc/generic/string.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/string.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,333 @@ +/* + * 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 + */ + +#include +#include +#include +#include +#include + + +/* Dummy implementation of mem/ functions */ + +void *memset(void *s, int c, size_t n) +{ + char *os = s; + + while (n--) + *(os++) = c; + + return s; +} + +struct along { + unsigned long n; +} __attribute__ ((packed)); + +static void *unaligned_memcpy(void *dst, const void *src, size_t n) +{ + int i, j; + struct along *adst = dst; + const struct along *asrc = src; + + for (i = 0; i < n / sizeof(unsigned long); i++) + adst[i].n = asrc[i].n; + + for (j = 0; j < n % sizeof(unsigned long); j++) + ((unsigned char *) (((unsigned long *) dst) + i))[j] = ((unsigned char *) (((unsigned long *) src) + i))[j]; + + return (char *) src; +} + +void *memcpy(void *dst, const void *src, size_t n) +{ + int i, j; + + if (((long) dst & (sizeof(long) - 1)) || ((long) src & (sizeof(long) - 1))) + return unaligned_memcpy(dst, src, n); + + for (i = 0; i < n / sizeof(unsigned long); i++) + ((unsigned long *) dst)[i] = ((unsigned long *) src)[i]; + + for (j = 0; j < n % sizeof(unsigned long); j++) + ((unsigned char *) (((unsigned long *) dst) + i))[j] = ((unsigned char *) (((unsigned long *) src) + i))[j]; + + return (char *) src; +} + +void *memmove(void *dst, const void *src, size_t n) +{ + int i, j; + + if (src > dst) + return memcpy(dst, src, n); + + for (j = (n % sizeof(unsigned long)) - 1; j >= 0; j--) + ((unsigned char *) ((unsigned long *) dst))[j] = ((unsigned char *) ((unsigned long *) src))[j]; + + for (i = n / sizeof(unsigned long) - 1; i >=0 ; i--) + ((unsigned long *) dst)[i] = ((unsigned long *) src)[i]; + + return (char *) src; +} + +/** Compare two memory areas. + * + * @param s1 Pointer to the first area to compare. + * @param s2 Pointer to the second area to compare. + * @param len Size of the first area in bytes. Both areas must have the same + * length. + * @return If len is 0, return zero. If the areas match, return zero. + * Otherwise return non-zero. + */ +int bcmp(const char *s1, const char *s2, size_t len) +{ + for (; len && *s1++ == *s2++; len--) + ; + return len; +} + +/** Count the number of characters in the string, not including terminating 0. + * @param str string + * @return number of characters in string. + */ +size_t strlen(const char *str) +{ + size_t counter = 0; + + while (str[counter] != 0) + counter++; + + return counter; +} + +int strcmp(const char *a, const char *b) +{ + int c = 0; + + while (a[c] && b[c] && (!(a[c] - b[c]))) + c++; + + return (a[c] - b[c]); + +} + + +/** Return pointer to the first occurence of character c in string + * @param str scanned string + * @param c searched character (taken as one byte) + * @return pointer to the matched character or NULL if it is not found in given string. + */ +char *strchr(const char *str, int c) +{ + while (*str != '\0') { + if (*str == (char) c) + return (char *) str; + str++; + } + + return NULL; +} + +/** Return pointer to the last occurence of character c in string + * @param str scanned string + * @param c searched character (taken as one byte) + * @return pointer to the matched character or NULL if it is not found in given string. + */ +char *strrchr(const char *str, int c) +{ + char *retval = NULL; + + while (*str != '\0') { + if (*str == (char) c) + retval = (char *) str; + str++; + } + + return (char *) retval; +} + +/** Convert string to a number. + * Core of strtol and strtoul functions. + * @param nptr pointer to string + * @param endptr if not NULL, function stores here pointer to the first invalid character + * @param base zero or number between 2 and 36 inclusive + * @param sgn its set to 1 if minus found + * @return result of conversion. + */ +static unsigned long _strtoul(const char *nptr, char **endptr, int base, char *sgn) +{ + unsigned char c; + unsigned long result = 0; + unsigned long a, b; + const char *str = nptr; + const char *tmpptr; + + while (isspace(*str)) + str++; + + if (*str == '-') { + *sgn = 1; + ++str; + } else if (*str == '+') + ++str; + + if (base) { + if ((base == 1) || (base > 36)) { + /* FIXME: set errno to EINVAL */ + return 0; + } + if ((base == 16) && (*str == '0') && ((str[1] == 'x') || (str[1] == 'X'))) { + str += 2; + } + } else { + base = 10; + + if (*str == '0') { + base = 8; + if ((str[1] == 'X') || (str[1] == 'x')) { + base = 16; + str += 2; + } + } + } + + tmpptr = str; + + while (*str) { + c = *str; + c = (c >= 'a' ? c - 'a' + 10 : (c >= 'A' ? c - 'A' + 10 : (c <= '9' ? c - '0' : 0xff))); + if (c > base) { + break; + } + + a = (result & 0xff) * base + c; + b = (result >> 8) * base + (a >> 8); + + if (b > (ULONG_MAX >> 8)) { + /* overflow */ + /* FIXME: errno = ERANGE*/ + return ULONG_MAX; + } + + result = (b << 8) + (a & 0xff); + ++str; + } + + if (str == tmpptr) { + /* no number was found => first invalid character is the first character of the string */ + /* FIXME: set errno to EINVAL */ + str = nptr; + result = 0; + } + + if (endptr) + *endptr = (char *) str; + + if (nptr == str) { + /*FIXME: errno = EINVAL*/ + return 0; + } + + return result; +} + +/** Convert initial part of string to long int according to given base. + * The number may begin with an arbitrary number of whitespaces followed by optional sign (`+' or `-'). + * If the base is 0 or 16, the prefix `0x' may be inserted and the number will be taken as hexadecimal one. + * If the base is 0 and the number begin with a zero, number will be taken as octal one (as with base 8). + * Otherwise the base 0 is taken as decimal. + * @param nptr pointer to string + * @param endptr if not NULL, function stores here pointer to the first invalid character + * @param base zero or number between 2 and 36 inclusive + * @return result of conversion. + */ +long int strtol(const char *nptr, char **endptr, int base) +{ + char sgn = 0; + unsigned long number = 0; + + number = _strtoul(nptr, endptr, base, &sgn); + + if (number > LONG_MAX) { + if ((sgn) && (number == (unsigned long) (LONG_MAX) + 1)) { + /* FIXME: set 0 to errno */ + return number; + } + /* FIXME: set ERANGE to errno */ + return (sgn ? LONG_MIN : LONG_MAX); + } + + return (sgn ? -number : number); +} + + +/** Convert initial part of string to unsigned long according to given base. + * The number may begin with an arbitrary number of whitespaces followed by optional sign (`+' or `-'). + * If the base is 0 or 16, the prefix `0x' may be inserted and the number will be taken as hexadecimal one. + * If the base is 0 and the number begin with a zero, number will be taken as octal one (as with base 8). + * Otherwise the base 0 is taken as decimal. + * @param nptr pointer to string + * @param endptr if not NULL, function stores here pointer to the first invalid character + * @param base zero or number between 2 and 36 inclusive + * @return result of conversion. + */ +unsigned long strtoul(const char *nptr, char **endptr, int base) +{ + char sgn = 0; + unsigned long number = 0; + + number = _strtoul(nptr, endptr, base, &sgn); + + return (sgn ? -number : number); +} + +char *strcpy(char *dest, const char *src) +{ + char *orig = dest; + + while ((*(dest++) = *(src++))); + return orig; +} + +char *strncpy(char *dest, const char *src, size_t n) +{ + char *orig = dest; + + while ((*(dest++) = *(src++)) && --n); + return orig; +} + +/** @} + */ Index: uspace/lib/libc/generic/sysinfo.c =================================================================== --- uspace/lib/libc/generic/sysinfo.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/sysinfo.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include + +sysarg_t sysinfo_value(char *name) +{ + return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t ) name, (sysarg_t) strlen(name)); +} + +/** @} + */ Index: uspace/lib/libc/generic/task.c =================================================================== --- uspace/lib/libc/generic/task.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/task.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,48 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include + +task_id_t task_get_id(void) +{ + task_id_t task_id; + + (void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id); + + return task_id; +} + +/** @} + */ Index: uspace/lib/libc/generic/thread.c =================================================================== --- uspace/lib/libc/generic/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/thread.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,215 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + + +#ifndef THREAD_INITIAL_STACK_PAGES_NO +#define THREAD_INITIAL_STACK_PAGES_NO 1 +#endif + +static LIST_INITIALIZE(thread_garbage); + +extern char _tdata_start; +extern char _tdata_end; +extern char _tbss_start; +extern char _tbss_end; + +/** Create TLS (Thread Local Storage) data structures. + * + * The code requires, that sections .tdata and .tbss are adjacent. It may be + * changed in the future. + * + * @return Pointer to TCB. + */ +tcb_t *__make_tls(void) +{ + void *data; + tcb_t *tcb; + size_t tls_size = &_tbss_end - &_tdata_start; + + tcb = __alloc_tls(&data, tls_size); + + /* + * Copy thread local data from the initialization image. + */ + memcpy(data, &_tdata_start, &_tdata_end - &_tdata_start); + /* + * Zero out the thread local uninitialized data. + */ + memset(data + (&_tbss_start - &_tdata_start), 0, + &_tbss_end - &_tbss_start); + + return tcb; +} + +void __free_tls(tcb_t *tcb) +{ + size_t tls_size = &_tbss_end - &_tdata_start; + __free_tls_arch(tcb, tls_size); +} + +/** Main thread function. + * + * This function is called from __thread_entry() and is used + * to call the thread's implementing function and perform cleanup + * and exit when thread returns back. Do not call this function + * directly. + * + * @param uarg Pointer to userspace argument structure. + */ +void __thread_main(uspace_arg_t *uarg) +{ + psthread_data_t *pt; + + pt = psthread_setup(); + __tcb_set(pt->tcb); + + uarg->uspace_thread_function(uarg->uspace_thread_arg); + /* XXX: we cannot free the userspace stack while running on it */ +// free(uarg->uspace_stack); +// free(uarg); + + /* If there is a manager, destroy it */ + async_destroy_manager(); + psthread_teardown(pt); + + thread_exit(0); +} + +/** Create userspace thread. + * + * This function creates new userspace thread and allocates userspace + * stack and userspace argument structure for it. + * + * @param function Function implementing the thread. + * @param arg Argument to be passed to thread. + * @param name Symbolic name of the thread. + * @param tid Thread ID of the newly created thread. + * + * @return Zero on success or a code from @ref errno.h on failure. + */ +int thread_create(void (* function)(void *), void *arg, char *name, + thread_id_t *tid) +{ + char *stack; + uspace_arg_t *uarg; + int rc; + + stack = (char *) malloc(getpagesize() * THREAD_INITIAL_STACK_PAGES_NO); + if (!stack) + return -1; + + uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t)); + if (!uarg) { + free(stack); + return -1; + } + + uarg->uspace_entry = (void *) FADDR(__thread_entry); + uarg->uspace_stack = (void *) stack; + uarg->uspace_thread_function = function; + uarg->uspace_thread_arg = arg; + uarg->uspace_uarg = uarg; + + rc = __SYSCALL3(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name, + (sysarg_t) tid); + + if (rc) { + /* + * Failed to create a new thread. + * Free up the allocated structures. + */ + free(uarg); + free(stack); + } + + return rc; +} + +/** Terminate current thread. + * + * @param status Exit status. Currently not used. + */ +void thread_exit(int status) +{ + __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status); +} + +/** Detach thread. + * + * Currently not implemented. + * + * @param thread TID. + */ +void thread_detach(thread_id_t thread) +{ +} + +/** Join thread. + * + * Currently not implemented. + * + * @param thread TID. + * + * @return Thread exit status. + */ +int thread_join(thread_id_t thread) +{ +} + +/** Get current thread ID. + * + * @return Current thread ID. + */ +thread_id_t thread_get_id(void) +{ + thread_id_t thread_id; + + (void) __SYSCALL1(SYS_THREAD_GET_ID, (sysarg_t) &thread_id); + + return thread_id; +} + +/** @} + */ Index: uspace/lib/libc/generic/time.c =================================================================== --- uspace/lib/libc/generic/time.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/generic/time.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,138 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +/* Pointers to public variables with time */ +struct { + volatile sysarg_t seconds1; + volatile sysarg_t useconds; + volatile sysarg_t seconds2; +} *ktime = NULL; + + +/** POSIX gettimeofday + * + * The time variables are memory mapped(RO) from kernel, which updates + * them periodically. As it is impossible to read 2 values atomically, we + * use a trick: First read a seconds, then read microseconds, then + * read seconds again. If a second elapsed in the meantime, set it to zero. + * This provides assurance, that at least the + * sequence of subsequent gettimeofday calls is ordered. + */ +int gettimeofday(struct timeval *tv, struct timezone *tz) +{ + void *mapping; + sysarg_t s1, s2; + sysarg_t rights; + int res; + + if (!ktime) { + mapping = as_get_mappable_page(PAGE_SIZE); + /* Get the mapping of kernel clock */ + res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, + (sysarg_t) mapping, PAGE_SIZE, SERVICE_MEM_REALTIME, NULL, + &rights, NULL); + if (res) { + printf("Failed to initialize timeofday memarea\n"); + _exit(1); + } + if (! (rights & AS_AREA_READ)) { + printf("Received bad rights on time area: %X\n", + rights); + as_area_destroy(mapping); + _exit(1); + } + ktime = mapping; + } + if (tz) { + tz->tz_minuteswest = 0; + tz->tz_dsttime = DST_NONE; + } + + s2 = ktime->seconds2; + read_barrier(); + tv->tv_usec = ktime->useconds; + read_barrier(); + s1 = ktime->seconds1; + if (s1 != s2) { + tv->tv_usec = 0; + tv->tv_sec = s1 > s2 ? s1 : s2; + } else + tv->tv_sec = s1; + + return 0; +} + +/** Wait unconditionally for specified number of microseconds */ +void usleep(unsigned long usec) +{ + atomic_t futex = FUTEX_INITIALIZER; + + futex_initialize(&futex, 0); + futex_down_timeout(&futex, usec, 0); +} + +/** Wait unconditionally for specified number of seconds */ +unsigned int sleep(unsigned int seconds) +{ + atomic_t futex = FUTEX_INITIALIZER; + + futex_initialize(&futex, 0); + + /* Sleep in 1000 second steps to support + full argument range */ + while (seconds > 0) { + unsigned int period = (seconds > 1000) ? 1000 : seconds; + + futex_down_timeout(&futex, period * 1000000, 0); + seconds -= period; + } +} + +/** @} + */ Index: uspace/lib/libc/include/align.h =================================================================== --- uspace/lib/libc/include/align.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/align.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_ALIGN_H_ +#define LIBC_ALIGN_H_ + +/** Align to the nearest lower address. + * + * @param s Address or size to be aligned. + * @param a Size of alignment, must be power of 2. + */ +#define ALIGN_DOWN(s, a) ((s) & ~((a) - 1)) + + +/** Align to the nearest higher address. + * + * @param s Address or size to be aligned. + * @param a Size of alignment, must be power of 2. + */ +#define ALIGN_UP(s, a) ((long)((s) + ((a) - 1)) & ~((long) (a) - 1)) + +#endif + +/** @} + */ Index: uspace/lib/libc/include/as.h =================================================================== --- uspace/lib/libc/include/as.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/as.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,52 @@ +/* + * 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_AS_H_ +#define LIBC_AS_H_ + +#include +#include +#include +#include + +extern void *as_area_create(void *address, size_t size, int flags); +extern int as_area_resize(void *address, size_t size, int flags); +extern int as_area_destroy(void *address); +extern void *set_maxheapsize(size_t mhs); +extern void * as_get_mappable_page(size_t sz); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/assert.h =================================================================== --- uspace/lib/libc/include/assert.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/assert.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2005 Martin Decky + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_ASSERT_H_ +#define LIBC_ASSERT_H_ + +/** Debugging assert macro + * + * If NDEBUG is not set, the assert() macro + * evaluates expr and if it is false prints + * error message and terminate program. + * + * @param expr Expression which is expected to be true. + * + */ + +#include +#ifndef NDEBUG +# define assert(expr) if (!(expr)) { printf("Assertion failed (%s) at file '%s', line %d.\n", #expr, __FILE__, __LINE__); abort();} +#else +# define assert(expr) +#endif + +#endif + +/** @} + */ Index: uspace/lib/libc/include/async.h =================================================================== --- uspace/lib/libc/include/async.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/async.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,135 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_ASYNC_H_ +#define LIBC_ASYNC_H_ + +#include +#include +#include +#include + +typedef ipc_callid_t aid_t; +typedef void (*async_client_conn_t)(ipc_callid_t callid, ipc_call_t *call); + +static inline void async_manager(void) +{ + psthread_schedule_next_adv(PS_TO_MANAGER); +} + +ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs); +static inline ipc_callid_t async_get_call(ipc_call_t *data) +{ + return async_get_call_timeout(data, 0); +} + +aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, + ipc_call_t *dataptr); +aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, + ipcarg_t arg3, ipc_call_t *dataptr); +void async_wait_for(aid_t amsgid, ipcarg_t *result); +int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout); + +/** Pseudo-synchronous message sending + * + * Send message through IPC, wait in the event loop, until it is received + * + * @return Return code of message + */ +static inline ipcarg_t async_req_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t *r1, ipcarg_t *r2) +{ + ipc_call_t result; + ipcarg_t rc; + + aid_t eid = async_send_2(phoneid, method, arg1, arg2, &result); + async_wait_for(eid, &rc); + if (r1) + *r1 = IPC_GET_ARG1(result); + if (r2) + *r2 = IPC_GET_ARG2(result); + return rc; +} +#define async_req(phoneid, method, arg1, r1) async_req_2(phoneid, method, arg1, 0, r1, 0) + +static inline ipcarg_t async_req_3(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *r1, + ipcarg_t *r2, ipcarg_t *r3) +{ + ipc_call_t result; + ipcarg_t rc; + + aid_t eid = async_send_3(phoneid, method, arg1, arg2, arg3, &result); + async_wait_for(eid, &rc); + if (r1) + *r1 = IPC_GET_ARG1(result); + if (r2) + *r2 = IPC_GET_ARG2(result); + if (r3) + *r3 = IPC_GET_ARG3(result); + return rc; +} + + +pstid_t async_new_connection(ipcarg_t in_phone_hash,ipc_callid_t callid, + ipc_call_t *call, + void (*cthread)(ipc_callid_t,ipc_call_t *)); +void async_usleep(suseconds_t timeout); +void async_create_manager(void); +void async_destroy_manager(void); +void async_set_client_connection(async_client_conn_t conn); +void async_set_interrupt_received(async_client_conn_t conn); +int _async_init(void); + + +/* Primitve functions for IPC communication */ +void async_msg_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, + ipcarg_t arg3); +void async_msg_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2); +#define async_msg(ph, m, a1) async_msg_2(ph, m, a1, 0) + +static inline void async_serialize_start(void) +{ + psthread_inc_sercount(); +} + +static inline void async_serialize_end(void) +{ + psthread_dec_sercount(); +} + +extern atomic_t async_futex; +#endif + +/** @} + */ Index: uspace/lib/libc/include/atomic.h =================================================================== --- uspace/lib/libc/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/atomic.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,57 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_ATOMIC_H_ +#define LIBC_ATOMIC_H_ + +typedef struct atomic { + volatile long count; +} atomic_t; + +#include + +static inline void atomic_set(atomic_t *val, long i) +{ + val->count = i; +} + +static inline long atomic_get(atomic_t *val) +{ + return val->count; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/include/bitops.h =================================================================== --- uspace/lib/libc/include/bitops.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/bitops.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,94 @@ +/* + * 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 generic + * @{ + */ +/** @file + */ + +#ifndef LIBC_BITOPS_H_ +#define LIBC_BITOPS_H_ + +#include + + +/** Return position of first non-zero bit from left (i.e. [log_2(arg)]). + * + * If number is zero, it returns 0 + */ +static inline int fnzb32(uint32_t arg) +{ + int n = 0; + + if (arg >> 16) { + arg >>= 16; + n += 16; + } + + if (arg >> 8) { + arg >>= 8; + n += 8; + } + + if (arg >> 4) { + arg >>= 4; + n += 4; + } + + if (arg >> 2) { + arg >>= 2; + n += 2; + } + + if (arg >> 1) { + arg >>= 1; + n += 1; + } + + return n; +} + +static inline int fnzb64(uint64_t arg) +{ + int n = 0; + + if (arg >> 32) { + arg >>= 32; + n += 32; + } + + return n + fnzb32((uint32_t) arg); +} + +#define fnzb(x) fnzb32(x) + +#endif + +/** @} + */ Index: uspace/lib/libc/include/bool.h =================================================================== --- uspace/lib/libc/include/bool.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/bool.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_BOOL_H_ +#define LIBC_BOOL_H_ + +#define false 0 +#define true 1 + +typedef short bool; + +#endif + +/** @} + */ Index: uspace/lib/libc/include/cap.h =================================================================== --- uspace/lib/libc/include/cap.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/cap.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIB_CAP_H_ +#define LIB_CAP_H_ + +#include + +extern int cap_grant(task_id_t id, unsigned int caps); +extern int cap_revoke(task_id_t id, unsigned int caps); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/ctype.h =================================================================== --- uspace/lib/libc/include/ctype.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/ctype.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,62 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_CTYPE_H_ +#define LIBC_CTYPE_H_ + +static inline int isdigit(int c) +{ + return ((c >= '0' )&&( c <= '9')); +} + +static inline int isspace(int c) +{ + switch(c) { + case ' ': + case '\n': + case '\t': + case '\f': + case '\r': + case '\v': + return 1; + break; + default: + return 0; + } +} + +#endif + +/** @} + */ Index: uspace/lib/libc/include/ddi.h =================================================================== --- uspace/lib/libc/include/ddi.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/ddi.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DDI_H_ +#define LIBC_DDI_H_ + +#include + +extern int physmem_map(void *pf, void *vp, unsigned long pages, int flags); +extern int iospace_enable(task_id_t id, void *ioaddr, unsigned long size); +extern int preemption_control(int enable); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/endian.h =================================================================== --- uspace/lib/libc/include/endian.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/endian.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_ENDIAN_H_ +#define LIBC_ENDIAN_H_ + +#define __LITTLE_ENDIAN 1234 +#define __BIG_ENDIAN 4321 +#define __PDP_ENDIAN 3412 + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/include/err.h =================================================================== --- uspace/lib/libc/include/err.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/err.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,46 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_ERR_H_ +#define LIBC_ERR_H_ + +#define errx(status, fmt, ...) { \ + printf((fmt), ##__VA_ARGS__); \ + _exit(status); \ +} + +#endif + +/** @} + */ Index: uspace/lib/libc/include/errno.h =================================================================== --- uspace/lib/libc/include/errno.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/errno.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,43 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_ERRNO_H_ +#define LIBC_ERRNO_H_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/include/futex.h =================================================================== --- uspace/lib/libc/include/futex.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/futex.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_FUTEX_H_ +#define LIBC_FUTEX_H_ + +#include +#include + +#define FUTEX_INITIALIZER {1} + +extern void futex_initialize(atomic_t *futex, int value); +extern int futex_down(atomic_t *futex); +extern int futex_trydown(atomic_t *futex); +extern int futex_down_timeout(atomic_t *futex, uint32_t usec, int flags); +extern int futex_up(atomic_t *futex); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/io/file.h =================================================================== --- uspace/lib/libc/include/io/file.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/io/file.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2007 Michal Konopa + * Copyright (c) 2007 Martin Jelen + * Copyright (c) 2007 Peter Majer + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING 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 file.h + * @brief The main header for the user library for working with the file system + */ + +#ifndef _FILE_H +#define _FILE_H + +#include "../../../fs/const.h" +#include "../../../fs/type.h" +#include "../../../fs/stat.h" +#include "../../../fs/dir.h" +#include "../../../share/message.h" + +#define F_OK 0x00 +#define F_FILE_NOT_FOUND 0x01 +#define F_FILE_NOT_OPEN 0x02 +#define F_READ_ERROR 0x10 +#define F_READ_OVERFLOW 0x11 +#define F_SYSTEM_ERROR 0xf0 +#define F_IPC_FAILURE 0xf1 +#define F_MMAP_FAILURE 0xf2 +#define F_COMM_FAILURE 0xf3 + +#define F_ERRTYPE_MASK 0xf0 + +#define F_MODE_READ 0x01 +#define F_MODE_WRITE 0x02 +#define F_MODE_READ_WRITE F_MODE_READ | F_MODE_WRITE +#define F_MODE_APPEND 0x04 + +/** + * + */ +typedef struct { + char name[30]; + unsigned short inode_num; +} dir_item_t; + +/** + * + */ +typedef struct { + size_t size; + dir_item_t base_info; + void *share; + message_params_t *params; + unsigned int handle; + stat_t stat; +} file_t; + +static int f_err; + +dir_item_t *ls(unsigned int *length); +int chdir(char *new_dir); + +file_t *fopen(char *name, int mode); +int fstat(file_t *file); +int fread(file_t *file, void *buffer, unsigned int size); +int fseek(file_t * file, int offset, int whence); +int fclose(file_t *file); + +#endif + +/** + *@} + / Index: uspace/lib/libc/include/io/io.h =================================================================== --- uspace/lib/libc/include/io/io.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/io/io.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,50 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_IO_H_ +#define LIBC_IO_H_ + +#include + +int putnchars(const char * buf, size_t count); +int putstr(const char * str); +int putchar(int c); +int getchar(void); + +#endif + +/** @} + */ + + Index: uspace/lib/libc/include/io/printf_core.h =================================================================== --- uspace/lib/libc/include/io/printf_core.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/io/printf_core.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,57 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_PRINTF_CORE_H_ +#define LIBC_PRINTF_CORE_H_ + +#include +#include + +/** Structure for specifying output methods for different printf clones. */ +struct printf_spec { + /* Output function, returns count of printed characters or EOF */ + int (*write)(void *, size_t, void *); + /* Support data - output stream specification, its state, locks,... */ + void *data; + +}; + +int printf_core(const char *fmt, struct printf_spec *ps ,va_list ap); + +#endif + +/** @} + */ + + Index: uspace/lib/libc/include/io/stream.h =================================================================== --- uspace/lib/libc/include/io/stream.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/io/stream.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2006 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_STREAM_H_ +#define LIBC_STREAM_H_ + +#include + +#define EMFILE -17 + +typedef int fd_t; + +typedef ssize_t (*pwritefn_t)(void *, const void *, size_t); +typedef ssize_t (*preadfn_t)(void *, void *, size_t); + +fd_t open(const char *fname, int flags); +int get_fd_phone(int fd); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/ipc/fb.h =================================================================== --- uspace/lib/libc/include/ipc/fb.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/ipc/fb.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcipc + * @{ + */ +/** @file + */ + +#ifndef LIBC_FB_H_ +#define LIBC_FB_H_ + +#define FB_PUTCHAR 1025 +#define FB_CLEAR 1026 +#define FB_GET_CSIZE 1027 +#define FB_CURSOR_VISIBILITY 1028 +#define FB_CURSOR_GOTO 1029 +#define FB_SCROLL 1030 +#define FB_VIEWPORT_SWITCH 1031 +#define FB_VIEWPORT_CREATE 1032 +#define FB_VIEWPORT_DELETE 1033 +#define FB_SET_STYLE 1034 +#define FB_GET_RESOLUTION 1035 +#define FB_DRAW_TEXT_DATA 1036 +#define FB_FLUSH 1037 +#define FB_VIEWPORT_DB 1038 + +#define FB_DRAW_PPM 1100 +#define FB_PREPARE_SHM 1101 +#define FB_DROP_SHM 1102 +#define FB_SHM2PIXMAP 1103 + +#define FB_VP_DRAW_PIXMAP 1104 +#define FB_VP2PIXMAP 1105 +#define FB_DROP_PIXMAP 1106 +#define FB_TRANS_PUTCHAR 1107 + +#define FB_ANIM_CREATE 1200 +#define FB_ANIM_DROP 1201 +#define FB_ANIM_ADDPIXMAP 1202 +#define FB_ANIM_CHGVP 1203 +#define FB_ANIM_START 1204 +#define FB_ANIM_STOP 1205 + +#define FB_POINTER_MOVE 1300 + +#endif + +/** @} + */ Index: uspace/lib/libc/include/ipc/ipc.h =================================================================== --- uspace/lib/libc/include/ipc/ipc.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/ipc/ipc.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,97 @@ +/* + * 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 libcipc + * @{ + */ +/** @file + */ + +#ifndef LIBIPC_IPC_H_ +#define LIBIPC_IPC_H_ + +#include +#include +#include +#include +#include + +typedef sysarg_t ipcarg_t; +typedef struct { + ipcarg_t args[IPC_CALL_LEN]; + ipcarg_t in_phone_hash; +} ipc_call_t; +typedef sysarg_t ipc_callid_t; + +typedef void (* ipc_async_callback_t)(void *private, int retval, + ipc_call_t *data); + +#define ipc_call_sync_2(phoneid, method, arg1, arg2, res1, res2) \ + ipc_call_sync_3((phoneid), (method), (arg1), (arg2), 0, (res1), (res2), \ + 0) +extern int ipc_call_sync_3(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2, + ipcarg_t *result3); + +extern int ipc_call_sync(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t *result); + +extern ipc_callid_t ipc_wait_cycle(ipc_call_t *call, uint32_t usec, int flags); +extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *data, uint32_t usec); +static inline ipc_callid_t ipc_wait_for_call(ipc_call_t *data) +{ + return ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT); +} +extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *data); + +extern ipcarg_t ipc_answer_fast(ipc_callid_t callid, ipcarg_t retval, + ipcarg_t arg1, ipcarg_t arg2); +extern ipcarg_t ipc_answer(ipc_callid_t callid, ipc_call_t *call); + +#define ipc_call_async(phoneid, method, arg1, private, callback, can_preempt) \ + (ipc_call_async_2(phoneid, method, arg1, 0, private, callback, \ + can_preempt)) +extern void ipc_call_async_2(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, void *private, ipc_async_callback_t callback, + int can_preempt); +extern void ipc_call_async_3(int phoneid, ipcarg_t method, ipcarg_t arg1, + ipcarg_t arg2, ipcarg_t arg3, void *private, ipc_async_callback_t callback, + int can_preempt); + +extern int ipc_connect_to_me(int phoneid, int arg1, int arg2, ipcarg_t *phone); +extern int ipc_connect_me_to(int phoneid, int arg1, int arg2); +extern int ipc_hangup(int phoneid); +extern int ipc_register_irq(int inr, int devno, int method, irq_code_t *code); +extern int ipc_unregister_irq(int inr, int devno); +extern int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method, + ipcarg_t arg1); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/ipc/ns.h =================================================================== --- uspace/lib/libc/include/ipc/ns.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/ipc/ns.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libcipc + * @{ + */ +/** @file + */ + +#ifndef LIBIPC_NS_H_ +#define LIBIPC_NS_H_ + +#endif + +/** @} + */ Index: uspace/lib/libc/include/ipc/services.h =================================================================== --- uspace/lib/libc/include/ipc/services.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/ipc/services.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,54 @@ +/* + * 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 libcipc + * @{ + */ +/** + * @file services.h + * @brief List of all known services and their codes. + */ + +#ifndef LIBIPC_SERVICES_H_ +#define LIBIPC_SERVICES_H_ + +#define SERVICE_PCI 1 +#define SERVICE_KEYBOARD 2 +#define SERVICE_VIDEO 3 +#define SERVICE_CONSOLE 4 +#define SERVICE_RD 5 +#define SERVICE_FS 6 + +/* Memory area to be received from NS */ +#define SERVICE_MEM_REALTIME 1 +#define SERVICE_MEM_KLOG 2 + +#endif + +/** @} + */ Index: uspace/lib/libc/include/libadt/fifo.h =================================================================== --- uspace/lib/libc/include/libadt/fifo.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/libadt/fifo.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,127 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +/* + * This implementation of FIFO stores values in an array + * (static or dynamic). As such, these FIFOs have upper bound + * on number of values they can store. Push and pop operations + * are done via accessing the array through head and tail indices. + * Because of better operation ordering in fifo_pop(), the access + * policy for these two indices is to 'increment (mod size of FIFO) + * and use'. + */ + +#ifndef LIBC_FIFO_H_ +#define LIBC_FIFO_H_ + +#include + +typedef unsigned long fifo_count_t; +typedef unsigned long fifo_index_t; + +#define FIFO_CREATE_STATIC(name, t, itms) \ + struct { \ + t fifo[(itms)]; \ + fifo_count_t items; \ + fifo_index_t head; \ + fifo_index_t tail; \ + } name + +/** Create and initialize static FIFO. + * + * FIFO is allocated statically. + * This macro is suitable for creating smaller FIFOs. + * + * @param name Name of FIFO. + * @param t Type of values stored in FIFO. + * @param itms Number of items that can be stored in FIFO. + */ +#define FIFO_INITIALIZE_STATIC(name, t, itms) \ + FIFO_CREATE_STATIC(name, t, itms) = { \ + .items = (itms), \ + .head = 0, \ + .tail = 0 \ + } + +/** Create and prepare dynamic FIFO. + * + * FIFO is allocated dynamically. + * This macro is suitable for creating larger FIFOs. + * + * @param name Name of FIFO. + * @param t Type of values stored in FIFO. + * @param itms Number of items that can be stored in FIFO. + */ +#define FIFO_INITIALIZE_DYNAMIC(name, t, itms) \ + struct { \ + t *fifo; \ + fifo_count_t items; \ + fifo_index_t head; \ + fifo_index_t tail; \ + } name = { \ + .fifo = NULL, \ + .items = (itms), \ + .head = 0, \ + .tail = 0 \ + } + +/** Pop value from head of FIFO. + * + * @param name FIFO name. + * + * @return Leading value in FIFO. + */ +#define fifo_pop(name) \ + name.fifo[name.head = (name.head + 1) < name.items ? (name.head + 1) : 0] + +/** Push value to tail of FIFO. + * + * @param name FIFO name. + * @param value Value to be appended to FIFO. + * + */ +#define fifo_push(name, value) \ + name.fifo[name.tail = (name.tail + 1) < name.items ? (name.tail + 1) : 0] = (value) + +/** Allocate memory for dynamic FIFO. + * + * @param name FIFO name. + */ +#define fifo_create(name) \ + name.fifo = malloc(sizeof(*name.fifo) * name.items) + +#endif + +/** @} + */ Index: uspace/lib/libc/include/libadt/hash_table.h =================================================================== --- uspace/lib/libc/include/libadt/hash_table.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/libadt/hash_table.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,89 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_HASH_TABLE_H_ +#define LIBC_HASH_TABLE_H_ + +#include +#include + +typedef unsigned long hash_count_t; +typedef unsigned long hash_index_t; +typedef struct hash_table hash_table_t; +typedef struct hash_table_operations hash_table_operations_t; + +/** Hash table structure. */ +struct hash_table { + link_t *entry; + hash_count_t entries; + hash_count_t max_keys; + hash_table_operations_t *op; +}; + +/** Set of operations for hash table. */ +struct hash_table_operations { + /** Hash function. + * + * @param key Array of keys needed to compute hash index. All keys must be passed. + * + * @return Index into hash table. + */ + hash_index_t (* hash)(unsigned long key[]); + + /** Hash table item comparison function. + * + * @param key Array of keys that will be compared with item. It is not necessary to pass all keys. + * + * @return true if the keys match, false otherwise. + */ + int (*compare)(unsigned long key[], hash_count_t keys, link_t *item); + + /** Hash table item removal callback. + * + * @param item Item that was removed from the hash table. + */ + void (*remove_callback)(link_t *item); +}; + +#define hash_table_get_instance(item, type, member) list_get_instance((item), type, member) + +extern int hash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys, hash_table_operations_t *op); +extern void hash_table_insert(hash_table_t *h, unsigned long key[], link_t *item); +extern link_t *hash_table_find(hash_table_t *h, unsigned long key[]); +extern void hash_table_remove(hash_table_t *h, unsigned long key[], hash_count_t keys); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/libadt/list.h =================================================================== --- uspace/lib/libc/include/libadt/list.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/libadt/list.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,194 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_LIST_H_ +#define LIBC_LIST_H_ + +#include + +#ifndef true +# define true 1 +#endif +#ifndef false +# define false 0 +#endif + +typedef struct link link_t; + +/** Doubly linked list head and link type. */ +struct link { + link_t *prev; /**< Pointer to the previous item in the list. */ + link_t *next; /**< Pointer to the next item in the list. */ +}; + +/** Declare and initialize statically allocated list. + * + * @param name Name of the new statically allocated list. + */ +#define LIST_INITIALIZE(name) link_t name = { .prev = &name, .next = &name } + +/** Initialize doubly-linked circular list link + * + * Initialize doubly-linked list link. + * + * @param link Pointer to link_t structure to be initialized. + */ +static inline void link_initialize(link_t *link) +{ + link->prev = NULL; + link->next = NULL; +} + +/** Initialize doubly-linked circular list + * + * Initialize doubly-linked circular list. + * + * @param head Pointer to link_t structure representing head of the list. + */ +static inline void list_initialize(link_t *head) +{ + head->prev = head; + head->next = head; +} + +/** Add item to the beginning of doubly-linked circular list + * + * Add item to the beginning of doubly-linked circular list. + * + * @param link Pointer to link_t structure to be added. + * @param head Pointer to link_t structure representing head of the list. + */ +static inline void list_prepend(link_t *link, link_t *head) +{ + link->next = head->next; + link->prev = head; + head->next->prev = link; + head->next = link; +} + +/** Add item to the end of doubly-linked circular list + * + * Add item to the end of doubly-linked circular list. + * + * @param link Pointer to link_t structure to be added. + * @param head Pointer to link_t structure representing head of the list. + */ +static inline void list_append(link_t *link, link_t *head) +{ + link->prev = head->prev; + link->next = head; + head->prev->next = link; + head->prev = link; +} + +/** Remove item from doubly-linked circular list + * + * Remove item from doubly-linked circular list. + * + * @param link Pointer to link_t structure to be removed from the list it is contained in. + */ +static inline void list_remove(link_t *link) +{ + link->next->prev = link->prev; + link->prev->next = link->next; + link_initialize(link); +} + +/** Query emptiness of doubly-linked circular list + * + * Query emptiness of doubly-linked circular list. + * + * @param head Pointer to link_t structure representing head of the list. + */ +static inline int list_empty(link_t *head) +{ + return head->next == head ? true : false; +} + + +/** Split or concatenate headless doubly-linked circular list + * + * Split or concatenate headless doubly-linked circular list. + * + * Note that the algorithm works both directions: + * concatenates splitted lists and splits concatenated lists. + * + * @param part1 Pointer to link_t structure leading the first (half of the headless) list. + * @param part2 Pointer to link_t structure leading the second (half of the headless) list. + */ +static inline void headless_list_split_or_concat(link_t *part1, link_t *part2) +{ + link_t *hlp; + + part1->prev->next = part2; + part2->prev->next = part1; + hlp = part1->prev; + part1->prev = part2->prev; + part2->prev = hlp; +} + + +/** Split headless doubly-linked circular list + * + * Split headless doubly-linked circular list. + * + * @param part1 Pointer to link_t structure leading the first half of the headless list. + * @param part2 Pointer to link_t structure leading the second half of the headless list. + */ +static inline void headless_list_split(link_t *part1, link_t *part2) +{ + headless_list_split_or_concat(part1, part2); +} + +/** Concatenate two headless doubly-linked circular lists + * + * Concatenate two headless doubly-linked circular lists. + * + * @param part1 Pointer to link_t structure leading the first headless list. + * @param part2 Pointer to link_t structure leading the second headless list. + */ +static inline void headless_list_concat(link_t *part1, link_t *part2) +{ + headless_list_split_or_concat(part1, part2); +} + +#define list_get_instance(link,type,member) (type *)(((char *)(link))-((char *)&(((type *)NULL)->member))) + +extern int list_member(const link_t *link, const link_t *head); +extern void list_concat(link_t *head1, link_t *head2); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/libc.h =================================================================== --- uspace/lib/libc/include/libc.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/libc.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,55 @@ +/* + * 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_LIBC_H_ +#define LIBC_LIBC_H_ + +#include +#include +#include + +#define __SYSCALL0(id) __syscall(0, 0, 0, 0, id) +#define __SYSCALL1(id, p1) __syscall(p1, 0, 0, 0, id) +#define __SYSCALL2(id, p1, p2) __syscall(p1, p2, 0, 0, id) +#define __SYSCALL3(id, p1, p2, p3) __syscall(p1, p2, p3, 0, id) +#define __SYSCALL4(id, p1, p2, p3, p4) __syscall(p1, p2, p3, p4, id) + +extern void __main(void); +extern void __io_init(void); +extern void __exit(void); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/limits.h =================================================================== --- uspace/lib/libc/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/limits.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,74 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_LIMITS_H_ +#define LIBC_LIMITS_H_ + +#include +#include + +/* char */ +#define SCHAR_MIN MIN_INT8 +#define SCHAR_MAX MAX_INT8 +#define UCHAR_MIN MIN_UINT8 +#define UCHAR_MAX MAX_UINT8 + +#ifdef __CHAR_UNSIGNED__ +# define CHAR_MIN UCHAR_MIN +# define CHAR_MAX UCHAR_MAX +#else +# define CHAR_MIN SCHAR_MIN +# define CHAR_MAX SCHAR_MAX +#endif + +/* short int */ +#define SHRT_MIN MIN_INT16 +#define SHRT_MAX MAX_INT16 +#define USHRT_MIN MIN_UINT16 +#define USHRT_MAX MAX_UINT16 + +#define INT_MIN MIN_INT32 +#define INT_MAX MAX_INT32 +#define UINT_MIN MIN_UINT32 +#define UINT_MAX MAX_UINT32 + +#define LLONG_MIN MIN_INT64 +#define LLONG_MAX MAX_INT64 +#define ULLONG_MIN MIN_UINT64 +#define ULLONG_MAX MAX_UINT64 + +#endif + +/** @} + */ Index: uspace/lib/libc/include/malloc.h =================================================================== --- uspace/lib/libc/include/malloc.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/malloc.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,537 @@ +/* + Default header file for malloc-2.8.x, written by Doug Lea + and released to the public domain, as explained at + http://creativecommons.org/licenses/publicdomain. + + last update: Mon Aug 15 08:55:52 2005 Doug Lea (dl at gee) + + This header is for ANSI C/C++ only. You can set any of + the following #defines before including: + + * If USE_DL_PREFIX is defined, it is assumed that malloc.c + was also compiled with this option, so all routines + have names starting with "dl". + + * If HAVE_USR_INCLUDE_MALLOC_H is defined, it is assumed that this + file will be #included AFTER . This is needed only if + your system defines a struct mallinfo that is incompatible with the + standard one declared here. Otherwise, you can include this file + INSTEAD of your system system . At least on ANSI, all + declarations should be compatible with system versions + + * If MSPACES is defined, declarations for mspace versions are included. +*/ + +#ifndef MALLOC_280_H +#define MALLOC_280_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include /* for size_t */ + +#if !ONLY_MSPACES + +#ifndef USE_DL_PREFIX +#define dlcalloc calloc +#define dlfree free +#define dlmalloc malloc +#define dlmemalign memalign +#define dlrealloc realloc +#define dlvalloc valloc +#define dlpvalloc pvalloc +#define dlmallinfo mallinfo +#define dlmallopt mallopt +#define dlmalloc_trim malloc_trim +#define dlmalloc_stats malloc_stats +#define dlmalloc_usable_size malloc_usable_size +#define dlmalloc_footprint malloc_footprint +#define dlmalloc_max_footprint malloc_max_footprint +#define dlindependent_calloc independent_calloc +#define dlindependent_comalloc independent_comalloc +#endif /* USE_DL_PREFIX */ + + +/* + malloc(size_t n) + Returns a pointer to a newly allocated chunk of at least n bytes, or + null if no space is available, in which case errno is set to ENOMEM + on ANSI C systems. + + If n is zero, malloc returns a minimum-sized chunk. (The minimum + size is 16 bytes on most 32bit systems, and 32 bytes on 64bit + systems.) Note that size_t is an unsigned type, so calls with + arguments that would be negative if signed are interpreted as + requests for huge amounts of space, which will often fail. The + maximum supported value of n differs across systems, but is in all + cases less than the maximum representable value of a size_t. +*/ +void* dlmalloc(size_t); + +/* + free(void* p) + Releases the chunk of memory pointed to by p, that had been previously + allocated using malloc or a related routine such as realloc. + It has no effect if p is null. If p was not malloced or already + freed, free(p) will by default cuase the current program to abort. +*/ +void dlfree(void*); + +/* + calloc(size_t n_elements, size_t element_size); + Returns a pointer to n_elements * element_size bytes, with all locations + set to zero. +*/ +void* dlcalloc(size_t, size_t); + +/* + realloc(void* p, size_t n) + Returns a pointer to a chunk of size n that contains the same data + as does chunk p up to the minimum of (n, p's size) bytes, or null + if no space is available. + + The returned pointer may or may not be the same as p. The algorithm + prefers extending p in most cases when possible, otherwise it + employs the equivalent of a malloc-copy-free sequence. + + If p is null, realloc is equivalent to malloc. + + If space is not available, realloc returns null, errno is set (if on + ANSI) and p is NOT freed. + + if n is for fewer bytes than already held by p, the newly unused + space is lopped off and freed if possible. realloc with a size + argument of zero (re)allocates a minimum-sized chunk. + + The old unix realloc convention of allowing the last-free'd chunk + to be used as an argument to realloc is not supported. +*/ + +void* dlrealloc(void*, size_t); + +/* + memalign(size_t alignment, size_t n); + Returns a pointer to a newly allocated chunk of n bytes, aligned + in accord with the alignment argument. + + The alignment argument should be a power of two. If the argument is + not a power of two, the nearest greater power is used. + 8-byte alignment is guaranteed by normal malloc calls, so don't + bother calling memalign with an argument of 8 or less. + + Overreliance on memalign is a sure way to fragment space. +*/ +void* dlmemalign(size_t, size_t); + +/* + valloc(size_t n); + Equivalent to memalign(pagesize, n), where pagesize is the page + size of the system. If the pagesize is unknown, 4096 is used. +*/ +void* dlvalloc(size_t); + +/* + mallopt(int parameter_number, int parameter_value) + Sets tunable parameters The format is to provide a + (parameter-number, parameter-value) pair. mallopt then sets the + corresponding parameter to the argument value if it can (i.e., so + long as the value is meaningful), and returns 1 if successful else + 0. SVID/XPG/ANSI defines four standard param numbers for mallopt, + normally defined in malloc.h. None of these are use in this malloc, + so setting them has no effect. But this malloc also supports other + options in mallopt: + + Symbol param # default allowed param values + M_TRIM_THRESHOLD -1 2*1024*1024 any (-1U disables trimming) + M_GRANULARITY -2 page size any power of 2 >= page size + M_MMAP_THRESHOLD -3 256*1024 any (or 0 if no MMAP support) +*/ +int dlmallopt(int, int); + +#define M_TRIM_THRESHOLD (-1) +#define M_GRANULARITY (-2) +#define M_MMAP_THRESHOLD (-3) + + +/* + malloc_footprint(); + Returns the number of bytes obtained from the system. The total + number of bytes allocated by malloc, realloc etc., is less than this + value. Unlike mallinfo, this function returns only a precomputed + result, so can be called frequently to monitor memory consumption. + Even if locks are otherwise defined, this function does not use them, + so results might not be up to date. +*/ +size_t dlmalloc_footprint(void); +size_t dlmalloc_max_footprint(void); + +#if !NO_MALLINFO +/* + mallinfo() + Returns (by copy) a struct containing various summary statistics: + + arena: current total non-mmapped bytes allocated from system + ordblks: the number of free chunks + smblks: always zero. + hblks: current number of mmapped regions + hblkhd: total bytes held in mmapped regions + usmblks: the maximum total allocated space. This will be greater + than current total if trimming has occurred. + fsmblks: always zero + uordblks: current total allocated space (normal or mmapped) + fordblks: total free space + keepcost: the maximum number of bytes that could ideally be released + back to system via malloc_trim. ("ideally" means that + it ignores page restrictions etc.) + + Because these fields are ints, but internal bookkeeping may + be kept as longs, the reported values may wrap around zero and + thus be inaccurate. +*/ +#ifndef HAVE_USR_INCLUDE_MALLOC_H +#ifndef _MALLOC_H +#ifndef MALLINFO_FIELD_TYPE +#define MALLINFO_FIELD_TYPE size_t +#endif /* MALLINFO_FIELD_TYPE */ +struct mallinfo { + MALLINFO_FIELD_TYPE arena; /* non-mmapped space allocated from system */ + MALLINFO_FIELD_TYPE ordblks; /* number of free chunks */ + MALLINFO_FIELD_TYPE smblks; /* always 0 */ + MALLINFO_FIELD_TYPE hblks; /* always 0 */ + MALLINFO_FIELD_TYPE hblkhd; /* space in mmapped regions */ + MALLINFO_FIELD_TYPE usmblks; /* maximum total allocated space */ + MALLINFO_FIELD_TYPE fsmblks; /* always 0 */ + MALLINFO_FIELD_TYPE uordblks; /* total allocated space */ + MALLINFO_FIELD_TYPE fordblks; /* total free space */ + MALLINFO_FIELD_TYPE keepcost; /* releasable (via malloc_trim) space */ +}; +#endif /* _MALLOC_H */ +#endif /* HAVE_USR_INCLUDE_MALLOC_H */ + +struct mallinfo dlmallinfo(void); +#endif /* NO_MALLINFO */ + +/* + independent_calloc(size_t n_elements, size_t element_size, void* chunks[]); + + independent_calloc is similar to calloc, but instead of returning a + single cleared space, it returns an array of pointers to n_elements + independent elements that can hold contents of size elem_size, each + of which starts out cleared, and can be independently freed, + realloc'ed etc. The elements are guaranteed to be adjacently + allocated (this is not guaranteed to occur with multiple callocs or + mallocs), which may also improve cache locality in some + applications. + + The "chunks" argument is optional (i.e., may be null, which is + probably the most typical usage). If it is null, the returned array + is itself dynamically allocated and should also be freed when it is + no longer needed. Otherwise, the chunks array must be of at least + n_elements in length. It is filled in with the pointers to the + chunks. + + In either case, independent_calloc returns this pointer array, or + null if the allocation failed. If n_elements is zero and "chunks" + is null, it returns a chunk representing an array with zero elements + (which should be freed if not wanted). + + Each element must be individually freed when it is no longer + needed. If you'd like to instead be able to free all at once, you + should instead use regular calloc and assign pointers into this + space to represent elements. (In this case though, you cannot + independently free elements.) + + independent_calloc simplifies and speeds up implementations of many + kinds of pools. It may also be useful when constructing large data + structures that initially have a fixed number of fixed-sized nodes, + but the number is not known at compile time, and some of the nodes + may later need to be freed. For example: + + struct Node { int item; struct Node* next; }; + + struct Node* build_list() { + struct Node** pool; + int n = read_number_of_nodes_needed(); + if (n <= 0) return 0; + pool = (struct Node**)(independent_calloc(n, sizeof(struct Node), 0); + if (pool == 0) die(); + // organize into a linked list... + struct Node* first = pool[0]; + for (i = 0; i < n-1; ++i) + pool[i]->next = pool[i+1]; + free(pool); // Can now free the array (or not, if it is needed later) + return first; + } +*/ +void** dlindependent_calloc(size_t, size_t, void**); + +/* + independent_comalloc(size_t n_elements, size_t sizes[], void* chunks[]); + + independent_comalloc allocates, all at once, a set of n_elements + chunks with sizes indicated in the "sizes" array. It returns + an array of pointers to these elements, each of which can be + independently freed, realloc'ed etc. The elements are guaranteed to + be adjacently allocated (this is not guaranteed to occur with + multiple callocs or mallocs), which may also improve cache locality + in some applications. + + The "chunks" argument is optional (i.e., may be null). If it is null + the returned array is itself dynamically allocated and should also + be freed when it is no longer needed. Otherwise, the chunks array + must be of at least n_elements in length. It is filled in with the + pointers to the chunks. + + In either case, independent_comalloc returns this pointer array, or + null if the allocation failed. If n_elements is zero and chunks is + null, it returns a chunk representing an array with zero elements + (which should be freed if not wanted). + + Each element must be individually freed when it is no longer + needed. If you'd like to instead be able to free all at once, you + should instead use a single regular malloc, and assign pointers at + particular offsets in the aggregate space. (In this case though, you + cannot independently free elements.) + + independent_comallac differs from independent_calloc in that each + element may have a different size, and also that it does not + automatically clear elements. + + independent_comalloc can be used to speed up allocation in cases + where several structs or objects must always be allocated at the + same time. For example: + + struct Head { ... } + struct Foot { ... } + + void send_message(char* msg) { + int msglen = strlen(msg); + size_t sizes[3] = { sizeof(struct Head), msglen, sizeof(struct Foot) }; + void* chunks[3]; + if (independent_comalloc(3, sizes, chunks) == 0) + die(); + struct Head* head = (struct Head*)(chunks[0]); + char* body = (char*)(chunks[1]); + struct Foot* foot = (struct Foot*)(chunks[2]); + // ... + } + + In general though, independent_comalloc is worth using only for + larger values of n_elements. For small values, you probably won't + detect enough difference from series of malloc calls to bother. + + Overuse of independent_comalloc can increase overall memory usage, + since it cannot reuse existing noncontiguous small chunks that + might be available for some of the elements. +*/ +void** dlindependent_comalloc(size_t, size_t*, void**); + + +/* + pvalloc(size_t n); + Equivalent to valloc(minimum-page-that-holds(n)), that is, + round up n to nearest pagesize. + */ +void* dlpvalloc(size_t); + +/* + malloc_trim(size_t pad); + + If possible, gives memory back to the system (via negative arguments + to sbrk) if there is unused memory at the `high' end of the malloc + pool or in unused MMAP segments. You can call this after freeing + large blocks of memory to potentially reduce the system-level memory + requirements of a program. However, it cannot guarantee to reduce + memory. Under some allocation patterns, some large free blocks of + memory will be locked between two used chunks, so they cannot be + given back to the system. + + The `pad' argument to malloc_trim represents the amount of free + trailing space to leave untrimmed. If this argument is zero, only + the minimum amount of memory to maintain internal data structures + will be left. Non-zero arguments can be supplied to maintain enough + trailing space to service future expected allocations without having + to re-obtain memory from the system. + + Malloc_trim returns 1 if it actually released any memory, else 0. +*/ +int dlmalloc_trim(size_t); + +/* + malloc_usable_size(void* p); + + Returns the number of bytes you can actually use in + an allocated chunk, which may be more than you requested (although + often not) due to alignment and minimum size constraints. + You can use this many bytes without worrying about + overwriting other allocated objects. This is not a particularly great + programming practice. malloc_usable_size can be more useful in + debugging and assertions, for example: + + p = malloc(n); + assert(malloc_usable_size(p) >= 256); +*/ +size_t dlmalloc_usable_size(void*); + +/* + malloc_stats(); + Prints on stderr the amount of space obtained from the system (both + via sbrk and mmap), the maximum amount (which may be more than + current if malloc_trim and/or munmap got called), and the current + number of bytes allocated via malloc (or realloc, etc) but not yet + freed. Note that this is the number of bytes allocated, not the + number requested. It will be larger than the number requested + because of alignment and bookkeeping overhead. Because it includes + alignment wastage as being in use, this figure may be greater than + zero even when no user-level chunks are allocated. + + The reported current and maximum system memory can be inaccurate if + a program makes other calls to system memory allocation functions + (normally sbrk) outside of malloc. + + malloc_stats prints only the most commonly interesting statistics. + More information can be obtained by calling mallinfo. +*/ +void dlmalloc_stats(void); + +#endif /* !ONLY_MSPACES */ + +#if MSPACES + +/* + mspace is an opaque type representing an independent + region of space that supports mspace_malloc, etc. +*/ +typedef void* mspace; + +/* + create_mspace creates and returns a new independent space with the + given initial capacity, or, if 0, the default granularity size. It + returns null if there is no system memory available to create the + space. If argument locked is non-zero, the space uses a separate + lock to control access. The capacity of the space will grow + dynamically as needed to service mspace_malloc requests. You can + control the sizes of incremental increases of this space by + compiling with a different DEFAULT_GRANULARITY or dynamically + setting with mallopt(M_GRANULARITY, value). +*/ +mspace create_mspace(size_t capacity, int locked); + +/* + destroy_mspace destroys the given space, and attempts to return all + of its memory back to the system, returning the total number of + bytes freed. After destruction, the results of access to all memory + used by the space become undefined. +*/ +size_t destroy_mspace(mspace msp); + +/* + create_mspace_with_base uses the memory supplied as the initial base + of a new mspace. Part (less than 128*sizeof(size_t) bytes) of this + space is used for bookkeeping, so the capacity must be at least this + large. (Otherwise 0 is returned.) When this initial space is + exhausted, additional memory will be obtained from the system. + Destroying this space will deallocate all additionally allocated + space (if possible) but not the initial base. +*/ +mspace create_mspace_with_base(void* base, size_t capacity, int locked); + +/* + mspace_malloc behaves as malloc, but operates within + the given space. +*/ +void* mspace_malloc(mspace msp, size_t bytes); + +/* + mspace_free behaves as free, but operates within + the given space. + + If compiled with FOOTERS==1, mspace_free is not actually needed. + free may be called instead of mspace_free because freed chunks from + any space are handled by their originating spaces. +*/ +void mspace_free(mspace msp, void* mem); + +/* + mspace_realloc behaves as realloc, but operates within + the given space. + + If compiled with FOOTERS==1, mspace_realloc is not actually + needed. realloc may be called instead of mspace_realloc because + realloced chunks from any space are handled by their originating + spaces. +*/ +void* mspace_realloc(mspace msp, void* mem, size_t newsize); + +/* + mspace_calloc behaves as calloc, but operates within + the given space. +*/ +void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size); + +/* + mspace_memalign behaves as memalign, but operates within + the given space. +*/ +void* mspace_memalign(mspace msp, size_t alignment, size_t bytes); + +/* + mspace_independent_calloc behaves as independent_calloc, but + operates within the given space. +*/ +void** mspace_independent_calloc(mspace msp, size_t n_elements, + size_t elem_size, void* chunks[]); + +/* + mspace_independent_comalloc behaves as independent_comalloc, but + operates within the given space. +*/ +void** mspace_independent_comalloc(mspace msp, size_t n_elements, + size_t sizes[], void* chunks[]); + +/* + mspace_footprint() returns the number of bytes obtained from the + system for this space. +*/ +size_t mspace_footprint(mspace msp); + + +#if !NO_MALLINFO +/* + mspace_mallinfo behaves as mallinfo, but reports properties of + the given space. +*/ +struct mallinfo mspace_mallinfo(mspace msp); +#endif /* NO_MALLINFO */ + +/* + mspace_malloc_stats behaves as malloc_stats, but reports + properties of the given space. +*/ +void mspace_malloc_stats(mspace msp); + +/* + mspace_trim behaves as malloc_trim, but + operates within the given space. +*/ +int mspace_trim(mspace msp, size_t pad); + +/* + An alias for mallopt. +*/ +int mspace_mallopt(int, int); + +#endif /* MSPACES */ + +#ifdef __cplusplus +}; /* end of extern "C" */ +#endif + +#endif /* MALLOC_280_H */ + + + /** @} + */ + + Index: uspace/lib/libc/include/psthread.h =================================================================== --- uspace/lib/libc/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/psthread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,98 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_PSTHREAD_H_ +#define LIBC_PSTHREAD_H_ + +#include +#include +#include + +#ifndef context_set +#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); +#endif /* context_set */ + +#define PSTHREAD_SERIALIZED 1 + +typedef enum { + PS_TO_MANAGER, + PS_FROM_MANAGER, + PS_PREEMPT, + PS_FROM_DEAD +} pschange_type; + +typedef sysarg_t pstid_t; + +struct psthread_data { + link_t link; + context_t ctx; + void *stack; + void *arg; + int (*func)(void *); + tcb_t *tcb; + + struct psthread_data *waiter; + int finished; + int retval; + int flags; +}; +typedef struct psthread_data psthread_data_t; + +extern int context_save(context_t *c); +extern void context_restore(context_t *c) __attribute__ ((noreturn)); + +pstid_t psthread_create(int (*func)(void *), void *arg); +int psthread_join(pstid_t psthrid); +psthread_data_t * psthread_setup(void); +void psthread_teardown(psthread_data_t *pt); +int psthread_schedule_next_adv(pschange_type ctype); +void psthread_add_ready(pstid_t ptid); +void psthread_add_manager(pstid_t psthrid); +void psthread_remove_manager(void); +pstid_t psthread_get_id(void); +void psthread_inc_sercount(void); +void psthread_dec_sercount(void); + +static inline int psthread_schedule_next() { + return psthread_schedule_next_adv(PS_PREEMPT); +} + + +#endif + +/** @} + */ Index: uspace/lib/libc/include/stdarg.h =================================================================== --- uspace/lib/libc/include/stdarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/stdarg.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,55 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_STDARG_H_ +#define LIBC_STDARG_H_ + +#include +#include + +#ifndef __VARARGS_DEFINED +# define __VARARGS_DEFINED + +typedef __builtin_va_list va_list; + +# define va_start(ap, last) __builtin_va_start(ap, last) +# define va_arg(ap, type) __builtin_va_arg(ap, type) +# define va_end(ap) __builtin_va_end(ap) + +# endif + +#endif + +/** @} + */ Index: uspace/lib/libc/include/stddef.h =================================================================== --- uspace/lib/libc/include/stddef.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/stddef.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_STDDEF_H_ +#define LIBC_STDDEF_H_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/include/stdint.h =================================================================== --- uspace/lib/libc/include/stdint.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/stdint.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,64 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_STDINT_H_ +#define LIBC_STDINT_H_ + +/* Definitions of types with fixed size*/ +#include + +#define MAX_INT8 (0x7F) +#define MIN_INT8 (0x80) +#define MAX_UINT8 (0xFFu) +#define MIN_UINT8 (0u) + +#define MAX_INT16 (0x7FFF) +#define MIN_INT16 (0x8000) +#define MAX_UINT16 (0xFFFFu) +#define MIN_UINT16 (0u) + +#define MAX_INT32 (0x7FFFFFFF) +#define MIN_INT32 (0x80000000) +#define MAX_UINT32 (0xFFFFFFFFu) +#define MIN_UINT32 (0u) + +#define MAX_INT64 (0x7FFFFFFFFFFFFFFFll) +#define MIN_INT64 (0x8000000000000000ll) +#define MAX_UINT64 (0xFFFFFFFFFFFFFFFFull) +#define MIN_UINT64 (0ull) + +#endif + +/** @} + */ Index: uspace/lib/libc/include/stdio.h =================================================================== --- uspace/lib/libc/include/stdio.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/stdio.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,73 @@ +/* + * 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_STDIO_H_ +#define LIBC_STDIO_H_ + +#include +#include + +#define EOF (-1) + +#include +#include + +#define DEBUG(fmt, ...) \ +{ \ + char buf[256]; \ + int n; \ + n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \ + if (n > 0) \ + (void) __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, strlen(buf)); \ +} + +extern int getchar(void); + +extern int puts(const char * str); +extern int putchar(int c); + +extern int printf(const char *fmt, ...); +extern int sprintf(char *str, const char *fmt, ...); +extern int snprintf(char *str, size_t size, const char *fmt, ...); + +extern int vprintf(const char *fmt, va_list ap); +extern int vsprintf(char *str, const char *fmt, va_list ap); +extern int vsnprintf(char *str, size_t size, const char *fmt, va_list ap); + +#define fprintf(f, fmt, ...) printf(fmt, ##__VA_ARGS__) + +#endif + +/** @} + */ Index: uspace/lib/libc/include/stdlib.h =================================================================== --- uspace/lib/libc/include/stdlib.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/stdlib.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,61 @@ +/* + * 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_STDLIB_H_ +#define LIBC_STDLIB_H_ + +#include +#include + +#define abort() _exit(1) +#define exit(status) _exit((status)) + +#define RAND_MAX 714025 + +extern long int random(void); +extern void srandom(unsigned int seed); + +static inline int rand(void) +{ + return random(); +} +static inline void srand(unsigned int seed) +{ + srandom(seed); +} + +#endif + +/** @} + */ Index: uspace/lib/libc/include/string.h =================================================================== --- uspace/lib/libc/include/string.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/string.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,64 @@ +/* + * 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_STRING_H_ +#define LIBC_STRING_H_ + +#include + +#define bzero(ptr, len) memset((ptr), 0, (len)) + +void * memset(void *s, int c, size_t n); +void * memcpy(void *dest, const void *src, size_t n); +void * memmove(void *dest, const void *src, size_t n); + +int bcmp(const char *s1, const char *s2, size_t n); + +int strcmp(const char *, const char *); + +char *strcpy(char *dest, const char *src); +char *strncpy(char *dest, const char *src, size_t n); + +size_t strlen(const char *str); + +char *strchr(const char *str, int c); +char *strrchr(const char *str, int c); + +long int strtol(const char *nptr, char **endptr, int base); +unsigned long strtoul(const char *nptr, char **endptr, int base); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/sys/mman.h =================================================================== --- uspace/lib/libc/include/sys/mman.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/sys/mman.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,58 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_MMAN_H_ +#define LIBC_MMAN_H_ + +#include + +#define MAP_FAILED ((void *) -1) + +#define MAP_SHARED (1 << 0) +#define MAP_PRIVATE (1 << 1) +#define MAP_FIXED (1 << 2) +#define MAP_ANONYMOUS (1 << 3) + +#define PROTO_READ AS_AREA_READ +#define PROTO_WRITE AS_AREA_WRITE +#define PROTO_EXEC AS_AREA_EXEC + +extern void *mmap(void *start, size_t length, int prot, int flags, int fd, + off_t offset); +extern int munmap(void *start, size_t length); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/sys/time.h =================================================================== --- uspace/lib/libc/include/sys/time.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/sys/time.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,60 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_TIME_H_ +#define LIBC_TIME_H_ + +#include + +#define DST_NONE 0 + +typedef long time_t; +typedef long suseconds_t; + +struct timeval { + time_t tv_sec; /* seconds */ + suseconds_t tv_usec; /* microseconds */ +}; + +struct timezone { + int tz_minuteswest; /* minutes W of Greenwich */ + int tz_dsttime; /* type of dst correction */ +}; + +int gettimeofday(struct timeval *tv, struct timezone *tz); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/sys/types.h =================================================================== --- uspace/lib/libc/include/sys/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/sys/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_SYS_TYPES_H_ +#define LIBC_SYS_TYPES_H_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/include/syscall.h =================================================================== --- uspace/lib/libc/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/syscall.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,48 @@ +/* + * 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 + * @brief Syscall function declaration for architectures that don't inline syscalls. + */ + +#ifndef LIBC_SYSCALL_H_ +#define LIBC_SYSCALL_H_ + +#include +#include + +extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, const sysarg_t p4, const syscall_t id); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/sysinfo.h =================================================================== --- uspace/lib/libc/include/sysinfo.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/sysinfo.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_SYSINFO_H_ +#define LIBC_SYSINFO_H_ + +#include +#include +#include + +sysarg_t sysinfo_value(char *name); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/task.h =================================================================== --- uspace/lib/libc/include/task.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/task.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_TASK_H_ +#define LIBC_TASK_H_ + +#include + +typedef uint64_t task_id_t; + +extern task_id_t task_get_id(void); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/thread.h =================================================================== --- uspace/lib/libc/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/thread.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,60 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_THREAD_H_ +#define LIBC_THREAD_H_ + +#include +#include +#include + +typedef uint64_t thread_id_t; + +extern void __thread_entry(void); +extern void __thread_main(uspace_arg_t *uarg); + +extern int thread_create(void (* function)(void *), void *arg, char *name, thread_id_t *tid); +extern void thread_exit(int status); +extern void thread_detach(thread_id_t thread); +extern int thread_join(thread_id_t thread); +extern thread_id_t thread_get_id(void); +extern tcb_t * __make_tls(void); +extern tcb_t * __alloc_tls(void **data, size_t size); +extern void __free_tls(tcb_t *); +extern void __free_tls_arch(tcb_t *, size_t size); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/time.h =================================================================== --- uspace/lib/libc/include/time.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/time.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_TIME_H_ +#define LIBC_TIME_H_ + +#endif + +/** @} + */ Index: uspace/lib/libc/include/types.h =================================================================== --- uspace/lib/libc/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/types.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,1 @@ +#include Index: uspace/lib/libc/include/unistd.h =================================================================== --- uspace/lib/libc/include/unistd.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/include/unistd.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,54 @@ +/* + * 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_UNISTD_H_ +#define LIBC_UNISTD_H_ + +#include +#include + +#define NULL 0 +#define getpagesize() (PAGE_SIZE) + +extern ssize_t write(int fd, const void * buf, size_t count); +extern ssize_t read(int fd, void * buf, size_t count); +extern void _exit(int status); +extern void *sbrk(ssize_t incr); +extern void usleep(unsigned long usec); +extern unsigned int sleep(unsigned int seconds); + +#endif + +/** @} + */ Index: uspace/lib/libc/malloc/malloc.c =================================================================== --- uspace/lib/libc/malloc/malloc.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/libc/malloc/malloc.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,4425 @@ +/* + This is a version (aka dlmalloc) of malloc/free/realloc written by + Doug Lea and released to the public domain, as explained at + http://creativecommons.org/licenses/publicdomain. Send questions, + comments, complaints, performance data, etc to dl@cs.oswego.edu + +* Version 2.8.3 Thu Sep 22 11:16:15 2005 Doug Lea (dl at gee) + + Note: There may be an updated version of this malloc obtainable at + ftp://gee.cs.oswego.edu/pub/misc/malloc.c + Check before installing! + +* Quickstart + + This library is all in one file to simplify the most common usage: + ftp it, compile it (-O3), and link it into another program. All of + the compile-time options default to reasonable values for use on + most platforms. You might later want to step through various + compile-time and dynamic tuning options. + + For convenience, an include file for code using this malloc is at: + ftp://gee.cs.oswego.edu/pub/misc/malloc-2.8.3.h + You don't really need this .h file unless you call functions not + defined in your system include files. The .h file contains only the + excerpts from this file needed for using this malloc on ANSI C/C++ + systems, so long as you haven't changed compile-time options about + naming and tuning parameters. If you do, then you can create your + own malloc.h that does include all settings by cutting at the point + indicated below. Note that you may already by default be using a C + library containing a malloc that is based on some version of this + malloc (for example in linux). You might still want to use the one + in this file to customize settings or to avoid overheads associated + with library versions. + +* Vital statistics: + + Supported pointer/size_t representation: 4 or 8 bytes + size_t MUST be an unsigned type of the same width as + pointers. (If you are using an ancient system that declares + size_t as a signed type, or need it to be a different width + than pointers, you can use a previous release of this malloc + (e.g. 2.7.2) supporting these.) + + Alignment: 8 bytes (default) + This suffices for nearly all current machines and C compilers. + However, you can define MALLOC_ALIGNMENT to be wider than this + if necessary (up to 128bytes), at the expense of using more space. + + Minimum overhead per allocated chunk: 4 or 8 bytes (if 4byte sizes) + 8 or 16 bytes (if 8byte sizes) + Each malloced chunk has a hidden word of overhead holding size + and status information, and additional cross-check word + if FOOTERS is defined. + + Minimum allocated size: 4-byte ptrs: 16 bytes (including overhead) + 8-byte ptrs: 32 bytes (including overhead) + + Even a request for zero bytes (i.e., malloc(0)) returns a + pointer to something of the minimum allocatable size. + The maximum overhead wastage (i.e., number of extra bytes + allocated than were requested in malloc) is less than or equal + to the minimum size, except for requests >= mmap_threshold that + are serviced via mmap(), where the worst case wastage is about + 32 bytes plus the remainder from a system page (the minimal + mmap unit); typically 4096 or 8192 bytes. + + Security: static-safe; optionally more or less + The "security" of malloc refers to the ability of malicious + code to accentuate the effects of errors (for example, freeing + space that is not currently malloc'ed or overwriting past the + ends of chunks) in code that calls malloc. This malloc + guarantees not to modify any memory locations below the base of + heap, i.e., static variables, even in the presence of usage + errors. The routines additionally detect most improper frees + and reallocs. All this holds as long as the static bookkeeping + for malloc itself is not corrupted by some other means. This + is only one aspect of security -- these checks do not, and + cannot, detect all possible programming errors. + + If FOOTERS is defined nonzero, then each allocated chunk + carries an additional check word to verify that it was malloced + from its space. These check words are the same within each + execution of a program using malloc, but differ across + executions, so externally crafted fake chunks cannot be + freed. This improves security by rejecting frees/reallocs that + could corrupt heap memory, in addition to the checks preventing + writes to statics that are always on. This may further improve + security at the expense of time and space overhead. (Note that + FOOTERS may also be worth using with MSPACES.) + + By default detected errors cause the program to abort (calling + "abort()"). You can override this to instead proceed past + errors by defining PROCEED_ON_ERROR. In this case, a bad free + has no effect, and a malloc that encounters a bad address + caused by user overwrites will ignore the bad address by + dropping pointers and indices to all known memory. This may + be appropriate for programs that should continue if at all + possible in the face of programming errors, although they may + run out of memory because dropped memory is never reclaimed. + + If you don't like either of these options, you can define + CORRUPTION_ERROR_ACTION and USAGE_ERROR_ACTION to do anything + else. And if if you are sure that your program using malloc has + no errors or vulnerabilities, you can define INSECURE to 1, + which might (or might not) provide a small performance improvement. + + Thread-safety: NOT thread-safe unless USE_LOCKS defined + When USE_LOCKS is defined, each public call to malloc, free, + etc is surrounded with either a pthread mutex or a win32 + spinlock (depending on WIN32). This is not especially fast, and + can be a major bottleneck. It is designed only to provide + minimal protection in concurrent environments, and to provide a + basis for extensions. If you are using malloc in a concurrent + program, consider instead using ptmalloc, which is derived from + a version of this malloc. (See http://www.malloc.de). + + System requirements: Any combination of MORECORE and/or MMAP/MUNMAP + This malloc can use unix sbrk or any emulation (invoked using + the CALL_MORECORE macro) and/or mmap/munmap or any emulation + (invoked using CALL_MMAP/CALL_MUNMAP) to get and release system + memory. On most unix systems, it tends to work best if both + MORECORE and MMAP are enabled. On Win32, it uses emulations + based on VirtualAlloc. It also uses common C library functions + like memset. + + Compliance: I believe it is compliant with the Single Unix Specification + (See http://www.unix.org). Also SVID/XPG, ANSI C, and probably + others as well. + +* Overview of algorithms + + This is not the fastest, most space-conserving, most portable, or + most tunable malloc ever written. However it is among the fastest + while also being among the most space-conserving, portable and + tunable. Consistent balance across these factors results in a good + general-purpose allocator for malloc-intensive programs. + + In most ways, this malloc is a best-fit allocator. Generally, it + chooses the best-fitting existing chunk for a request, with ties + broken in approximately least-recently-used order. (This strategy + normally maintains low fragmentation.) However, for requests less + than 256bytes, it deviates from best-fit when there is not an + exactly fitting available chunk by preferring to use space adjacent + to that used for the previous small request, as well as by breaking + ties in approximately most-recently-used order. (These enhance + locality of series of small allocations.) And for very large requests + (>= 256Kb by default), it relies on system memory mapping + facilities, if supported. (This helps avoid carrying around and + possibly fragmenting memory used only for large chunks.) + + All operations (except malloc_stats and mallinfo) have execution + times that are bounded by a constant factor of the number of bits in + a size_t, not counting any clearing in calloc or copying in realloc, + or actions surrounding MORECORE and MMAP that have times + proportional to the number of non-contiguous regions returned by + system allocation routines, which is often just 1. + + The implementation is not very modular and seriously overuses + macros. Perhaps someday all C compilers will do as good a job + inlining modular code as can now be done by brute-force expansion, + but now, enough of them seem not to. + + Some compilers issue a lot of warnings about code that is + dead/unreachable only on some platforms, and also about intentional + uses of negation on unsigned types. All known cases of each can be + ignored. + + For a longer but out of date high-level description, see + http://gee.cs.oswego.edu/dl/html/malloc.html + +* MSPACES + If MSPACES is defined, then in addition to malloc, free, etc., + this file also defines mspace_malloc, mspace_free, etc. These + are versions of malloc routines that take an "mspace" argument + obtained using create_mspace, to control all internal bookkeeping. + If ONLY_MSPACES is defined, only these versions are compiled. + So if you would like to use this allocator for only some allocations, + and your system malloc for others, you can compile with + ONLY_MSPACES and then do something like... + static mspace mymspace = create_mspace(0,0); // for example + #define mymalloc(bytes) mspace_malloc(mymspace, bytes) + + (Note: If you only need one instance of an mspace, you can instead + use "USE_DL_PREFIX" to relabel the global malloc.) + + You can similarly create thread-local allocators by storing + mspaces as thread-locals. For example: + static __thread mspace tlms = 0; + void* tlmalloc(size_t bytes) { + if (tlms == 0) tlms = create_mspace(0, 0); + return mspace_malloc(tlms, bytes); + } + void tlfree(void* mem) { mspace_free(tlms, mem); } + + Unless FOOTERS is defined, each mspace is completely independent. + You cannot allocate from one and free to another (although + conformance is only weakly checked, so usage errors are not always + caught). If FOOTERS is defined, then each chunk carries around a tag + indicating its originating mspace, and frees are directed to their + originating spaces. + + ------------------------- Compile-time options --------------------------- + +Be careful in setting #define values for numerical constants of type +size_t. On some systems, literal values are not automatically extended +to size_t precision unless they are explicitly casted. + +WIN32 default: defined if _WIN32 defined + Defining WIN32 sets up defaults for MS environment and compilers. + Otherwise defaults are for unix. + +MALLOC_ALIGNMENT default: (size_t)8 + Controls the minimum alignment for malloc'ed chunks. It must be a + power of two and at least 8, even on machines for which smaller + alignments would suffice. It may be defined as larger than this + though. Note however that code and data structures are optimized for + the case of 8-byte alignment. + +MSPACES default: 0 (false) + If true, compile in support for independent allocation spaces. + This is only supported if HAVE_MMAP is true. + +ONLY_MSPACES default: 0 (false) + If true, only compile in mspace versions, not regular versions. + +USE_LOCKS default: 0 (false) + Causes each call to each public routine to be surrounded with + pthread or WIN32 mutex lock/unlock. (If set true, this can be + overridden on a per-mspace basis for mspace versions.) + +FOOTERS default: 0 + If true, provide extra checking and dispatching by placing + information in the footers of allocated chunks. This adds + space and time overhead. + +INSECURE default: 0 + If true, omit checks for usage errors and heap space overwrites. + +USE_DL_PREFIX default: NOT defined + Causes compiler to prefix all public routines with the string 'dl'. + This can be useful when you only want to use this malloc in one part + of a program, using your regular system malloc elsewhere. + +ABORT default: defined as abort() + Defines how to abort on failed checks. On most systems, a failed + check cannot die with an "assert" or even print an informative + message, because the underlying print routines in turn call malloc, + which will fail again. Generally, the best policy is to simply call + abort(). It's not very useful to do more than this because many + errors due to overwriting will show up as address faults (null, odd + addresses etc) rather than malloc-triggered checks, so will also + abort. Also, most compilers know that abort() does not return, so + can better optimize code conditionally calling it. + +PROCEED_ON_ERROR default: defined as 0 (false) + Controls whether detected bad addresses cause them to bypassed + rather than aborting. If set, detected bad arguments to free and + realloc are ignored. And all bookkeeping information is zeroed out + upon a detected overwrite of freed heap space, thus losing the + ability to ever return it from malloc again, but enabling the + application to proceed. If PROCEED_ON_ERROR is defined, the + static variable malloc_corruption_error_count is compiled in + and can be examined to see if errors have occurred. This option + generates slower code than the default abort policy. + +DEBUG default: NOT defined + The DEBUG setting is mainly intended for people trying to modify + this code or diagnose problems when porting to new platforms. + However, it may also be able to better isolate user errors than just + using runtime checks. The assertions in the check routines spell + out in more detail the assumptions and invariants underlying the + algorithms. The checking is fairly extensive, and will slow down + execution noticeably. Calling malloc_stats or mallinfo with DEBUG + set will attempt to check every non-mmapped allocated and free chunk + in the course of computing the summaries. + +ABORT_ON_ASSERT_FAILURE default: defined as 1 (true) + Debugging assertion failures can be nearly impossible if your + version of the assert macro causes malloc to be called, which will + lead to a cascade of further failures, blowing the runtime stack. + ABORT_ON_ASSERT_FAILURE cause assertions failures to call abort(), + which will usually make debugging easier. + +MALLOC_FAILURE_ACTION default: sets errno to ENOMEM, or no-op on win32 + The action to take before "return 0" when malloc fails to be able to + return memory because there is none available. + +HAVE_MORECORE default: 1 (true) unless win32 or ONLY_MSPACES + True if this system supports sbrk or an emulation of it. + +MORECORE default: sbrk + The name of the sbrk-style system routine to call to obtain more + memory. See below for guidance on writing custom MORECORE + functions. The type of the argument to sbrk/MORECORE varies across + systems. It cannot be size_t, because it supports negative + arguments, so it is normally the signed type of the same width as + size_t (sometimes declared as "intptr_t"). It doesn't much matter + though. Internally, we only call it with arguments less than half + the max value of a size_t, which should work across all reasonable + possibilities, although sometimes generating compiler warnings. See + near the end of this file for guidelines for creating a custom + version of MORECORE. + +MORECORE_CONTIGUOUS default: 1 (true) + If true, take advantage of fact that consecutive calls to MORECORE + with positive arguments always return contiguous increasing + addresses. This is true of unix sbrk. It does not hurt too much to + set it true anyway, since malloc copes with non-contiguities. + Setting it false when definitely non-contiguous saves time + and possibly wasted space it would take to discover this though. + +MORECORE_CANNOT_TRIM default: NOT defined + True if MORECORE cannot release space back to the system when given + negative arguments. This is generally necessary only if you are + using a hand-crafted MORECORE function that cannot handle negative + arguments. + +HAVE_MMAP default: 1 (true) + True if this system supports mmap or an emulation of it. If so, and + HAVE_MORECORE is not true, MMAP is used for all system + allocation. If set and HAVE_MORECORE is true as well, MMAP is + primarily used to directly allocate very large blocks. It is also + used as a backup strategy in cases where MORECORE fails to provide + space from system. Note: A single call to MUNMAP is assumed to be + able to unmap memory that may have be allocated using multiple calls + to MMAP, so long as they are adjacent. + +HAVE_MREMAP default: 1 on linux, else 0 + If true realloc() uses mremap() to re-allocate large blocks and + extend or shrink allocation spaces. + +MMAP_CLEARS default: 1 on unix + True if mmap clears memory so calloc doesn't need to. This is true + for standard unix mmap using /dev/zero. + +USE_BUILTIN_FFS default: 0 (i.e., not used) + Causes malloc to use the builtin ffs() function to compute indices. + Some compilers may recognize and intrinsify ffs to be faster than the + supplied C version. Also, the case of x86 using gcc is special-cased + to an asm instruction, so is already as fast as it can be, and so + this setting has no effect. (On most x86s, the asm version is only + slightly faster than the C version.) + +malloc_getpagesize default: derive from system includes, or 4096. + The system page size. To the extent possible, this malloc manages + memory from the system in page-size units. This may be (and + usually is) a function rather than a constant. This is ignored + if WIN32, where page size is determined using getSystemInfo during + initialization. + +USE_DEV_RANDOM default: 0 (i.e., not used) + Causes malloc to use /dev/random to initialize secure magic seed for + stamping footers. Otherwise, the current time is used. + +NO_MALLINFO default: 0 + If defined, don't compile "mallinfo". This can be a simple way + of dealing with mismatches between system declarations and + those in this file. + +MALLINFO_FIELD_TYPE default: size_t + The type of the fields in the mallinfo struct. This was originally + defined as "int" in SVID etc, but is more usefully defined as + size_t. The value is used only if HAVE_USR_INCLUDE_MALLOC_H is not set + +REALLOC_ZERO_BYTES_FREES default: not defined + This should be set if a call to realloc with zero bytes should + be the same as a call to free. Some people think it should. Otherwise, + since this malloc returns a unique pointer for malloc(0), so does + realloc(p, 0). + +LACKS_UNISTD_H, LACKS_FCNTL_H, LACKS_SYS_PARAM_H, LACKS_SYS_MMAN_H +LACKS_STRINGS_H, LACKS_STRING_H, LACKS_SYS_TYPES_H, LACKS_ERRNO_H +LACKS_STDLIB_H default: NOT defined unless on WIN32 + Define these if your system does not have these header files. + You might need to manually insert some of the declarations they provide. + +DEFAULT_GRANULARITY default: page size if MORECORE_CONTIGUOUS, + system_info.dwAllocationGranularity in WIN32, + otherwise 64K. + Also settable using mallopt(M_GRANULARITY, x) + The unit for allocating and deallocating memory from the system. On + most systems with contiguous MORECORE, there is no reason to + make this more than a page. However, systems with MMAP tend to + either require or encourage larger granularities. You can increase + this value to prevent system allocation functions to be called so + often, especially if they are slow. The value must be at least one + page and must be a power of two. Setting to 0 causes initialization + to either page size or win32 region size. (Note: In previous + versions of malloc, the equivalent of this option was called + "TOP_PAD") + +DEFAULT_TRIM_THRESHOLD default: 2MB + Also settable using mallopt(M_TRIM_THRESHOLD, x) + The maximum amount of unused top-most memory to keep before + releasing via malloc_trim in free(). Automatic trimming is mainly + useful in long-lived programs using contiguous MORECORE. Because + trimming via sbrk can be slow on some systems, and can sometimes be + wasteful (in cases where programs immediately afterward allocate + more large chunks) the value should be high enough so that your + overall system performance would improve by releasing this much + memory. As a rough guide, you might set to a value close to the + average size of a process (program) running on your system. + Releasing this much memory would allow such a process to run in + memory. Generally, it is worth tuning trim thresholds when a + program undergoes phases where several large chunks are allocated + and released in ways that can reuse each other's storage, perhaps + mixed with phases where there are no such chunks at all. The trim + value must be greater than page size to have any useful effect. To + disable trimming completely, you can set to MAX_SIZE_T. Note that the trick + some people use of mallocing a huge space and then freeing it at + program startup, in an attempt to reserve system memory, doesn't + have the intended effect under automatic trimming, since that memory + will immediately be returned to the system. + +DEFAULT_MMAP_THRESHOLD default: 256K + Also settable using mallopt(M_MMAP_THRESHOLD, x) + The request size threshold for using MMAP to directly service a + request. Requests of at least this size that cannot be allocated + using already-existing space will be serviced via mmap. (If enough + normal freed space already exists it is used instead.) Using mmap + segregates relatively large chunks of memory so that they can be + individually obtained and released from the host system. A request + serviced through mmap is never reused by any other request (at least + not directly; the system may just so happen to remap successive + requests to the same locations). Segregating space in this way has + the benefits that: Mmapped space can always be individually released + back to the system, which helps keep the system level memory demands + of a long-lived program low. Also, mapped memory doesn't become + `locked' between other chunks, as can happen with normally allocated + chunks, which means that even trimming via malloc_trim would not + release them. However, it has the disadvantage that the space + cannot be reclaimed, consolidated, and then used to service later + requests, as happens with normal chunks. The advantages of mmap + nearly always outweigh disadvantages for "large" chunks, but the + value of "large" may vary across systems. The default is an + empirically derived value that works well in most systems. You can + disable mmap by setting to MAX_SIZE_T. + +*/ + +/** @addtogroup libcmalloc malloc + * @brief Malloc originally written by Doug Lea and ported to HelenOS. + * @ingroup libc + * @{ + */ +/** @file + */ + + +#include /* For size_t */ + +/** Non-default helenos customizations */ +#define LACKS_FCNTL_H +#define LACKS_SYS_MMAN_H +#define LACKS_SYS_PARAM_H +#undef HAVE_MMAP +#define HAVE_MMAP 0 +#define LACKS_ERRNO_H +/* Set errno? */ +#undef MALLOC_FAILURE_ACTION +#define MALLOC_FAILURE_ACTION + +/* The maximum possible size_t value has all bits set */ +#define MAX_SIZE_T (~(size_t)0) + +#define ONLY_MSPACES 0 +#define MSPACES 0 + +#ifdef MALLOC_ALIGNMENT_16 +#define MALLOC_ALIGNMENT ((size_t)16U) +#else +#define MALLOC_ALIGNMENT ((size_t)8U) +#endif + +#define FOOTERS 0 +#define ABORT abort() +#define ABORT_ON_ASSERT_FAILURE 1 +#define PROCEED_ON_ERROR 0 +#define USE_LOCKS 1 +#define INSECURE 0 +#define HAVE_MMAP 0 + +#define MMAP_CLEARS 1 + +#define HAVE_MORECORE 1 +#define MORECORE_CONTIGUOUS 1 +#define MORECORE sbrk +#define DEFAULT_GRANULARITY (0) /* 0 means to compute in init_mparams */ + +#ifndef DEFAULT_TRIM_THRESHOLD +#ifndef MORECORE_CANNOT_TRIM +#define DEFAULT_TRIM_THRESHOLD ((size_t)2U * (size_t)1024U * (size_t)1024U) +#else /* MORECORE_CANNOT_TRIM */ +#define DEFAULT_TRIM_THRESHOLD MAX_SIZE_T +#endif /* MORECORE_CANNOT_TRIM */ +#endif /* DEFAULT_TRIM_THRESHOLD */ +#ifndef DEFAULT_MMAP_THRESHOLD +#if HAVE_MMAP +#define DEFAULT_MMAP_THRESHOLD ((size_t)256U * (size_t)1024U) +#else /* HAVE_MMAP */ +#define DEFAULT_MMAP_THRESHOLD MAX_SIZE_T +#endif /* HAVE_MMAP */ +#endif /* DEFAULT_MMAP_THRESHOLD */ +#ifndef USE_BUILTIN_FFS +#define USE_BUILTIN_FFS 0 +#endif /* USE_BUILTIN_FFS */ +#ifndef USE_DEV_RANDOM +#define USE_DEV_RANDOM 0 +#endif /* USE_DEV_RANDOM */ +#ifndef NO_MALLINFO +#define NO_MALLINFO 0 +#endif /* NO_MALLINFO */ +#ifndef MALLINFO_FIELD_TYPE +#define MALLINFO_FIELD_TYPE size_t +#endif /* MALLINFO_FIELD_TYPE */ + +/* + mallopt tuning options. SVID/XPG defines four standard parameter + numbers for mallopt, normally defined in malloc.h. None of these + are used in this malloc, so setting them has no effect. But this + malloc does support the following options. +*/ + +#define M_TRIM_THRESHOLD (-1) +#define M_GRANULARITY (-2) +#define M_MMAP_THRESHOLD (-3) + +/* + ======================================================================== + To make a fully customizable malloc.h header file, cut everything + above this line, put into file malloc.h, edit to suit, and #include it + on the next line, as well as in programs that use this malloc. + ======================================================================== +*/ + +#include "malloc.h" + +/*------------------------------ internal #includes ---------------------- */ + +#include /* for printing in malloc_stats */ +#include + +#ifndef LACKS_ERRNO_H +#include /* for MALLOC_FAILURE_ACTION */ +#endif /* LACKS_ERRNO_H */ +#if FOOTERS +#include /* for magic initialization */ +#endif /* FOOTERS */ +#ifndef LACKS_STDLIB_H +#include /* for abort() */ +#endif /* LACKS_STDLIB_H */ +#ifdef DEBUG +#if ABORT_ON_ASSERT_FAILURE +#define assert(x) {if(!(x)) {printf(#x);ABORT;}} +#else /* ABORT_ON_ASSERT_FAILURE */ +#include +#endif /* ABORT_ON_ASSERT_FAILURE */ +#else /* DEBUG */ +#define assert(x) +#endif /* DEBUG */ +#if USE_BUILTIN_FFS +#ifndef LACKS_STRINGS_H +#include /* for ffs */ +#endif /* LACKS_STRINGS_H */ +#endif /* USE_BUILTIN_FFS */ +#if HAVE_MMAP +#ifndef LACKS_SYS_MMAN_H +#include /* for mmap */ +#endif /* LACKS_SYS_MMAN_H */ +#ifndef LACKS_FCNTL_H +#include +#endif /* LACKS_FCNTL_H */ +#endif /* HAVE_MMAP */ +#if HAVE_MORECORE +#ifndef LACKS_UNISTD_H +#include /* for sbrk */ +#else /* LACKS_UNISTD_H */ +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) +extern void* sbrk(ptrdiff_t); +#endif /* FreeBSD etc */ +#endif /* LACKS_UNISTD_H */ +#endif /* HAVE_MMAP */ + +#ifndef WIN32 +#ifndef malloc_getpagesize +# ifdef _SC_PAGESIZE /* some SVR4 systems omit an underscore */ +# ifndef _SC_PAGE_SIZE +# define _SC_PAGE_SIZE _SC_PAGESIZE +# endif +# endif +# ifdef _SC_PAGE_SIZE +# define malloc_getpagesize sysconf(_SC_PAGE_SIZE) +# else +# if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE) + extern size_t getpagesize(); +# define malloc_getpagesize getpagesize() +# else +# ifdef WIN32 /* use supplied emulation of getpagesize */ +# define malloc_getpagesize getpagesize() +# else +# ifndef LACKS_SYS_PARAM_H +# include +# endif +# ifdef EXEC_PAGESIZE +# define malloc_getpagesize EXEC_PAGESIZE +# else +# ifdef NBPG +# ifndef CLSIZE +# define malloc_getpagesize NBPG +# else +# define malloc_getpagesize (NBPG * CLSIZE) +# endif +# else +# ifdef NBPC +# define malloc_getpagesize NBPC +# else +# ifdef PAGESIZE +# define malloc_getpagesize PAGESIZE +# else /* just guess */ +# define malloc_getpagesize ((size_t)4096U) +# endif +# endif +# endif +# endif +# endif +# endif +# endif +#endif +#endif + +/* ------------------- size_t and alignment properties -------------------- */ + +/* The byte and bit size of a size_t */ +#define SIZE_T_SIZE (sizeof(size_t)) +#define SIZE_T_BITSIZE (sizeof(size_t) << 3) + +/* Some constants coerced to size_t */ +/* Annoying but necessary to avoid errors on some plaftorms */ +#define SIZE_T_ZERO ((size_t)0) +#define SIZE_T_ONE ((size_t)1) +#define SIZE_T_TWO ((size_t)2) +#define TWO_SIZE_T_SIZES (SIZE_T_SIZE<<1) +#define FOUR_SIZE_T_SIZES (SIZE_T_SIZE<<2) +#define SIX_SIZE_T_SIZES (FOUR_SIZE_T_SIZES+TWO_SIZE_T_SIZES) +#define HALF_MAX_SIZE_T (MAX_SIZE_T / 2U) + +/* The bit mask value corresponding to MALLOC_ALIGNMENT */ +#define CHUNK_ALIGN_MASK (MALLOC_ALIGNMENT - SIZE_T_ONE) + +/* True if address a has acceptable alignment */ +#define is_aligned(A) (((size_t)((A)) & (CHUNK_ALIGN_MASK)) == 0) + +/* the number of bytes to offset an address to align it */ +#define align_offset(A)\ + ((((size_t)(A) & CHUNK_ALIGN_MASK) == 0)? 0 :\ + ((MALLOC_ALIGNMENT - ((size_t)(A) & CHUNK_ALIGN_MASK)) & CHUNK_ALIGN_MASK)) + +/* -------------------------- MMAP preliminaries ------------------------- */ + +/* + If HAVE_MORECORE or HAVE_MMAP are false, we just define calls and + checks to fail so compiler optimizer can delete code rather than + using so many "#if"s. +*/ + + +/* MORECORE and MMAP must return MFAIL on failure */ +#define MFAIL ((void*)(MAX_SIZE_T)) +#define CMFAIL ((char*)(MFAIL)) /* defined for convenience */ + +#if !HAVE_MMAP +#define IS_MMAPPED_BIT (SIZE_T_ZERO) +#define USE_MMAP_BIT (SIZE_T_ZERO) +#define CALL_MMAP(s) MFAIL +#define CALL_MUNMAP(a, s) (-1) +#define DIRECT_MMAP(s) MFAIL + +#else /* HAVE_MMAP */ +#define IS_MMAPPED_BIT (SIZE_T_ONE) +#define USE_MMAP_BIT (SIZE_T_ONE) + +#ifndef WIN32 +#define CALL_MUNMAP(a, s) munmap((a), (s)) +#define MMAP_PROT (PROT_READ|PROT_WRITE) +#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) +#define MAP_ANONYMOUS MAP_ANON +#endif /* MAP_ANON */ +#ifdef MAP_ANONYMOUS +#define MMAP_FLAGS (MAP_PRIVATE|MAP_ANONYMOUS) +#define CALL_MMAP(s) mmap(0, (s), MMAP_PROT, MMAP_FLAGS, -1, 0) +#else /* MAP_ANONYMOUS */ +/* + Nearly all versions of mmap support MAP_ANONYMOUS, so the following + is unlikely to be needed, but is supplied just in case. +*/ +#define MMAP_FLAGS (MAP_PRIVATE) +static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */ +#define CALL_MMAP(s) ((dev_zero_fd < 0) ? \ + (dev_zero_fd = open("/dev/zero", O_RDWR), \ + mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) : \ + mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) +#endif /* MAP_ANONYMOUS */ + +#define DIRECT_MMAP(s) CALL_MMAP(s) +#else /* WIN32 */ + +/* Win32 MMAP via VirtualAlloc */ +static void* win32mmap(size_t size) { + void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE); + return (ptr != 0)? ptr: MFAIL; +} + +/* For direct MMAP, use MEM_TOP_DOWN to minimize interference */ +static void* win32direct_mmap(size_t size) { + void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT|MEM_TOP_DOWN, + PAGE_READWRITE); + return (ptr != 0)? ptr: MFAIL; +} + +/* This function supports releasing coalesed segments */ +static int win32munmap(void* ptr, size_t size) { + MEMORY_BASIC_INFORMATION minfo; + char* cptr = ptr; + while (size) { + if (VirtualQuery(cptr, &minfo, sizeof(minfo)) == 0) + return -1; + if (minfo.BaseAddress != cptr || minfo.AllocationBase != cptr || + minfo.State != MEM_COMMIT || minfo.RegionSize > size) + return -1; + if (VirtualFree(cptr, 0, MEM_RELEASE) == 0) + return -1; + cptr += minfo.RegionSize; + size -= minfo.RegionSize; + } + return 0; +} + +#define CALL_MMAP(s) win32mmap(s) +#define CALL_MUNMAP(a, s) win32munmap((a), (s)) +#define DIRECT_MMAP(s) win32direct_mmap(s) +#endif /* WIN32 */ +#endif /* HAVE_MMAP */ + +#if HAVE_MMAP && HAVE_MREMAP +#define CALL_MREMAP(addr, osz, nsz, mv) mremap((addr), (osz), (nsz), (mv)) +#else /* HAVE_MMAP && HAVE_MREMAP */ +#define CALL_MREMAP(addr, osz, nsz, mv) MFAIL +#endif /* HAVE_MMAP && HAVE_MREMAP */ + +#if HAVE_MORECORE +#define CALL_MORECORE(S) MORECORE(S) +#else /* HAVE_MORECORE */ +#define CALL_MORECORE(S) MFAIL +#endif /* HAVE_MORECORE */ + +/* mstate bit set if continguous morecore disabled or failed */ +#define USE_NONCONTIGUOUS_BIT (4U) + +/* segment bit set in create_mspace_with_base */ +#define EXTERN_BIT (8U) + + +/* --------------------------- Lock preliminaries ------------------------ */ + +#if USE_LOCKS + +/* + When locks are defined, there are up to two global locks: + + * If HAVE_MORECORE, morecore_mutex protects sequences of calls to + MORECORE. In many cases sys_alloc requires two calls, that should + not be interleaved with calls by other threads. This does not + protect against direct calls to MORECORE by other threads not + using this lock, so there is still code to cope the best we can on + interference. + + * magic_init_mutex ensures that mparams.magic and other + unique mparams values are initialized only once. +*/ + +/* By default use posix locks */ +#include +#define MLOCK_T atomic_t +#define INITIAL_LOCK(l) futex_initialize(l, 1) +/* futex_down cannot fail, but can return different + * retvals for OK + */ +#define ACQUIRE_LOCK(l) ({futex_down(l);0;}) +#define RELEASE_LOCK(l) futex_up(l) + +#if HAVE_MORECORE +static MLOCK_T morecore_mutex = FUTEX_INITIALIZER; +#endif /* HAVE_MORECORE */ + +static MLOCK_T magic_init_mutex = FUTEX_INITIALIZER; + + +#define USE_LOCK_BIT (2U) +#else /* USE_LOCKS */ +#define USE_LOCK_BIT (0U) +#define INITIAL_LOCK(l) +#endif /* USE_LOCKS */ + +#if USE_LOCKS && HAVE_MORECORE +#define ACQUIRE_MORECORE_LOCK() ACQUIRE_LOCK(&morecore_mutex); +#define RELEASE_MORECORE_LOCK() RELEASE_LOCK(&morecore_mutex); +#else /* USE_LOCKS && HAVE_MORECORE */ +#define ACQUIRE_MORECORE_LOCK() +#define RELEASE_MORECORE_LOCK() +#endif /* USE_LOCKS && HAVE_MORECORE */ + +#if USE_LOCKS +#define ACQUIRE_MAGIC_INIT_LOCK() ACQUIRE_LOCK(&magic_init_mutex); +#define RELEASE_MAGIC_INIT_LOCK() RELEASE_LOCK(&magic_init_mutex); +#else /* USE_LOCKS */ +#define ACQUIRE_MAGIC_INIT_LOCK() +#define RELEASE_MAGIC_INIT_LOCK() +#endif /* USE_LOCKS */ + + +/* ----------------------- Chunk representations ------------------------ */ + +/* + (The following includes lightly edited explanations by Colin Plumb.) + + The malloc_chunk declaration below is misleading (but accurate and + necessary). It declares a "view" into memory allowing access to + necessary fields at known offsets from a given base. + + Chunks of memory are maintained using a `boundary tag' method as + originally described by Knuth. (See the paper by Paul Wilson + ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a survey of such + techniques.) Sizes of free chunks are stored both in the front of + each chunk and at the end. This makes consolidating fragmented + chunks into bigger chunks fast. The head fields also hold bits + representing whether chunks are free or in use. + + Here are some pictures to make it clearer. They are "exploded" to + show that the state of a chunk can be thought of as extending from + the high 31 bits of the head field of its header through the + prev_foot and PINUSE_BIT bit of the following chunk header. + + A chunk that's in use looks like: + + chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Size of previous chunk (if P = 1) | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P| + | Size of this chunk 1| +-+ + mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | | + +- -+ + | | + +- -+ + | : + +- size - sizeof(size_t) available payload bytes -+ + : | + chunk-> +- -+ + | | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |1| + | Size of next chunk (may or may not be in use) | +-+ + mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + And if it's free, it looks like this: + + chunk-> +- -+ + | User payload (must be in use, or we would have merged!) | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P| + | Size of this chunk 0| +-+ + mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Next pointer | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Prev pointer | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | : + +- size - sizeof(struct chunk) unused bytes -+ + : | + chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Size of this chunk | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |0| + | Size of next chunk (must be in use, or we would have merged)| +-+ + mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | : + +- User payload -+ + : | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |0| + +-+ + Note that since we always merge adjacent free chunks, the chunks + adjacent to a free chunk must be in use. + + Given a pointer to a chunk (which can be derived trivially from the + payload pointer) we can, in O(1) time, find out whether the adjacent + chunks are free, and if so, unlink them from the lists that they + are on and merge them with the current chunk. + + Chunks always begin on even word boundaries, so the mem portion + (which is returned to the user) is also on an even word boundary, and + thus at least double-word aligned. + + The P (PINUSE_BIT) bit, stored in the unused low-order bit of the + chunk size (which is always a multiple of two words), is an in-use + bit for the *previous* chunk. If that bit is *clear*, then the + word before the current chunk size contains the previous chunk + size, and can be used to find the front of the previous chunk. + The very first chunk allocated always has this bit set, preventing + access to non-existent (or non-owned) memory. If pinuse is set for + any given chunk, then you CANNOT determine the size of the + previous chunk, and might even get a memory addressing fault when + trying to do so. + + The C (CINUSE_BIT) bit, stored in the unused second-lowest bit of + the chunk size redundantly records whether the current chunk is + inuse. This redundancy enables usage checks within free and realloc, + and reduces indirection when freeing and consolidating chunks. + + Each freshly allocated chunk must have both cinuse and pinuse set. + That is, each allocated chunk borders either a previously allocated + and still in-use chunk, or the base of its memory arena. This is + ensured by making all allocations from the the `lowest' part of any + found chunk. Further, no free chunk physically borders another one, + so each free chunk is known to be preceded and followed by either + inuse chunks or the ends of memory. + + Note that the `foot' of the current chunk is actually represented + as the prev_foot of the NEXT chunk. This makes it easier to + deal with alignments etc but can be very confusing when trying + to extend or adapt this code. + + The exceptions to all this are + + 1. The special chunk `top' is the top-most available chunk (i.e., + the one bordering the end of available memory). It is treated + specially. Top is never included in any bin, is used only if + no other chunk is available, and is released back to the + system if it is very large (see M_TRIM_THRESHOLD). In effect, + the top chunk is treated as larger (and thus less well + fitting) than any other available chunk. The top chunk + doesn't update its trailing size field since there is no next + contiguous chunk that would have to index off it. However, + space is still allocated for it (TOP_FOOT_SIZE) to enable + separation or merging when space is extended. + + 3. Chunks allocated via mmap, which have the lowest-order bit + (IS_MMAPPED_BIT) set in their prev_foot fields, and do not set + PINUSE_BIT in their head fields. Because they are allocated + one-by-one, each must carry its own prev_foot field, which is + also used to hold the offset this chunk has within its mmapped + region, which is needed to preserve alignment. Each mmapped + chunk is trailed by the first two fields of a fake next-chunk + for sake of usage checks. + +*/ + +struct malloc_chunk { + size_t prev_foot; /* Size of previous chunk (if free). */ + size_t head; /* Size and inuse bits. */ + struct malloc_chunk* fd; /* double links -- used only if free. */ + struct malloc_chunk* bk; +}; + +typedef struct malloc_chunk mchunk; +typedef struct malloc_chunk* mchunkptr; +typedef struct malloc_chunk* sbinptr; /* The type of bins of chunks */ +typedef unsigned int bindex_t; /* Described below */ +typedef unsigned int binmap_t; /* Described below */ +typedef unsigned int flag_t; /* The type of various bit flag sets */ + +/* ------------------- Chunks sizes and alignments ----------------------- */ + +#define MCHUNK_SIZE (sizeof(mchunk)) + +#if FOOTERS +#define CHUNK_OVERHEAD (TWO_SIZE_T_SIZES) +#else /* FOOTERS */ +#define CHUNK_OVERHEAD (SIZE_T_SIZE) +#endif /* FOOTERS */ + +/* MMapped chunks need a second word of overhead ... */ +#define MMAP_CHUNK_OVERHEAD (TWO_SIZE_T_SIZES) +/* ... and additional padding for fake next-chunk at foot */ +#define MMAP_FOOT_PAD (FOUR_SIZE_T_SIZES) + +/* The smallest size we can malloc is an aligned minimal chunk */ +#define MIN_CHUNK_SIZE\ + ((MCHUNK_SIZE + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK) + +/* conversion from malloc headers to user pointers, and back */ +#define chunk2mem(p) ((void*)((char*)(p) + TWO_SIZE_T_SIZES)) +#define mem2chunk(mem) ((mchunkptr)((char*)(mem) - TWO_SIZE_T_SIZES)) +/* chunk associated with aligned address A */ +#define align_as_chunk(A) (mchunkptr)((A) + align_offset(chunk2mem(A))) + +/* Bounds on request (not chunk) sizes. */ +#define MAX_REQUEST ((-MIN_CHUNK_SIZE) << 2) +#define MIN_REQUEST (MIN_CHUNK_SIZE - CHUNK_OVERHEAD - SIZE_T_ONE) + +/* pad request bytes into a usable size */ +#define pad_request(req) \ + (((req) + CHUNK_OVERHEAD + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK) + +/* pad request, checking for minimum (but not maximum) */ +#define request2size(req) \ + (((req) < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(req)) + + +/* ------------------ Operations on head and foot fields ----------------- */ + +/* + The head field of a chunk is or'ed with PINUSE_BIT when previous + adjacent chunk in use, and or'ed with CINUSE_BIT if this chunk is in + use. If the chunk was obtained with mmap, the prev_foot field has + IS_MMAPPED_BIT set, otherwise holding the offset of the base of the + mmapped region to the base of the chunk. +*/ + +#define PINUSE_BIT (SIZE_T_ONE) +#define CINUSE_BIT (SIZE_T_TWO) +#define INUSE_BITS (PINUSE_BIT|CINUSE_BIT) + +/* Head value for fenceposts */ +#define FENCEPOST_HEAD (INUSE_BITS|SIZE_T_SIZE) + +/* extraction of fields from head words */ +#define cinuse(p) ((p)->head & CINUSE_BIT) +#define pinuse(p) ((p)->head & PINUSE_BIT) +#define chunksize(p) ((p)->head & ~(INUSE_BITS)) + +#define clear_pinuse(p) ((p)->head &= ~PINUSE_BIT) +#define clear_cinuse(p) ((p)->head &= ~CINUSE_BIT) + +/* Treat space at ptr +/- offset as a chunk */ +#define chunk_plus_offset(p, s) ((mchunkptr)(((char*)(p)) + (s))) +#define chunk_minus_offset(p, s) ((mchunkptr)(((char*)(p)) - (s))) + +/* Ptr to next or previous physical malloc_chunk. */ +#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->head & ~INUSE_BITS))) +#define prev_chunk(p) ((mchunkptr)( ((char*)(p)) - ((p)->prev_foot) )) + +/* extract next chunk's pinuse bit */ +#define next_pinuse(p) ((next_chunk(p)->head) & PINUSE_BIT) + +/* Get/set size at footer */ +#define get_foot(p, s) (((mchunkptr)((char*)(p) + (s)))->prev_foot) +#define set_foot(p, s) (((mchunkptr)((char*)(p) + (s)))->prev_foot = (s)) + +/* Set size, pinuse bit, and foot */ +#define set_size_and_pinuse_of_free_chunk(p, s)\ + ((p)->head = (s|PINUSE_BIT), set_foot(p, s)) + +/* Set size, pinuse bit, foot, and clear next pinuse */ +#define set_free_with_pinuse(p, s, n)\ + (clear_pinuse(n), set_size_and_pinuse_of_free_chunk(p, s)) + +#define is_mmapped(p)\ + (!((p)->head & PINUSE_BIT) && ((p)->prev_foot & IS_MMAPPED_BIT)) + +/* Get the internal overhead associated with chunk p */ +#define overhead_for(p)\ + (is_mmapped(p)? MMAP_CHUNK_OVERHEAD : CHUNK_OVERHEAD) + +/* Return true if malloced space is not necessarily cleared */ +#if MMAP_CLEARS +#define calloc_must_clear(p) (!is_mmapped(p)) +#else /* MMAP_CLEARS */ +#define calloc_must_clear(p) (1) +#endif /* MMAP_CLEARS */ + +/* ---------------------- Overlaid data structures ----------------------- */ + +/* + When chunks are not in use, they are treated as nodes of either + lists or trees. + + "Small" chunks are stored in circular doubly-linked lists, and look + like this: + + chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Size of previous chunk | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + `head:' | Size of chunk, in bytes |P| + mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Forward pointer to next chunk in list | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Back pointer to previous chunk in list | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Unused space (may be 0 bytes long) . + . . + . | +nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + `foot:' | Size of chunk, in bytes | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + Larger chunks are kept in a form of bitwise digital trees (aka + tries) keyed on chunksizes. Because malloc_tree_chunks are only for + free chunks greater than 256 bytes, their size doesn't impose any + constraints on user chunk sizes. Each node looks like: + + chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Size of previous chunk | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + `head:' | Size of chunk, in bytes |P| + mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Forward pointer to next chunk of same size | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Back pointer to previous chunk of same size | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Pointer to left child (child[0]) | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Pointer to right child (child[1]) | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Pointer to parent | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | bin index of this chunk | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Unused space . + . | +nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + `foot:' | Size of chunk, in bytes | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + Each tree holding treenodes is a tree of unique chunk sizes. Chunks + of the same size are arranged in a circularly-linked list, with only + the oldest chunk (the next to be used, in our FIFO ordering) + actually in the tree. (Tree members are distinguished by a non-null + parent pointer.) If a chunk with the same size an an existing node + is inserted, it is linked off the existing node using pointers that + work in the same way as fd/bk pointers of small chunks. + + Each tree contains a power of 2 sized range of chunk sizes (the + smallest is 0x100 <= x < 0x180), which is is divided in half at each + tree level, with the chunks in the smaller half of the range (0x100 + <= x < 0x140 for the top nose) in the left subtree and the larger + half (0x140 <= x < 0x180) in the right subtree. This is, of course, + done by inspecting individual bits. + + Using these rules, each node's left subtree contains all smaller + sizes than its right subtree. However, the node at the root of each + subtree has no particular ordering relationship to either. (The + dividing line between the subtree sizes is based on trie relation.) + If we remove the last chunk of a given size from the interior of the + tree, we need to replace it with a leaf node. The tree ordering + rules permit a node to be replaced by any leaf below it. + + The smallest chunk in a tree (a common operation in a best-fit + allocator) can be found by walking a path to the leftmost leaf in + the tree. Unlike a usual binary tree, where we follow left child + pointers until we reach a null, here we follow the right child + pointer any time the left one is null, until we reach a leaf with + both child pointers null. The smallest chunk in the tree will be + somewhere along that path. + + The worst case number of steps to add, find, or remove a node is + bounded by the number of bits differentiating chunks within + bins. Under current bin calculations, this ranges from 6 up to 21 + (for 32 bit sizes) or up to 53 (for 64 bit sizes). The typical case + is of course much better. +*/ + +struct malloc_tree_chunk { + /* The first four fields must be compatible with malloc_chunk */ + size_t prev_foot; + size_t head; + struct malloc_tree_chunk* fd; + struct malloc_tree_chunk* bk; + + struct malloc_tree_chunk* child[2]; + struct malloc_tree_chunk* parent; + bindex_t index; +}; + +typedef struct malloc_tree_chunk tchunk; +typedef struct malloc_tree_chunk* tchunkptr; +typedef struct malloc_tree_chunk* tbinptr; /* The type of bins of trees */ + +/* A little helper macro for trees */ +#define leftmost_child(t) ((t)->child[0] != 0? (t)->child[0] : (t)->child[1]) + +/* ----------------------------- Segments -------------------------------- */ + +/* + Each malloc space may include non-contiguous segments, held in a + list headed by an embedded malloc_segment record representing the + top-most space. Segments also include flags holding properties of + the space. Large chunks that are directly allocated by mmap are not + included in this list. They are instead independently created and + destroyed without otherwise keeping track of them. + + Segment management mainly comes into play for spaces allocated by + MMAP. Any call to MMAP might or might not return memory that is + adjacent to an existing segment. MORECORE normally contiguously + extends the current space, so this space is almost always adjacent, + which is simpler and faster to deal with. (This is why MORECORE is + used preferentially to MMAP when both are available -- see + sys_alloc.) When allocating using MMAP, we don't use any of the + hinting mechanisms (inconsistently) supported in various + implementations of unix mmap, or distinguish reserving from + committing memory. Instead, we just ask for space, and exploit + contiguity when we get it. It is probably possible to do + better than this on some systems, but no general scheme seems + to be significantly better. + + Management entails a simpler variant of the consolidation scheme + used for chunks to reduce fragmentation -- new adjacent memory is + normally prepended or appended to an existing segment. However, + there are limitations compared to chunk consolidation that mostly + reflect the fact that segment processing is relatively infrequent + (occurring only when getting memory from system) and that we + don't expect to have huge numbers of segments: + + * Segments are not indexed, so traversal requires linear scans. (It + would be possible to index these, but is not worth the extra + overhead and complexity for most programs on most platforms.) + * New segments are only appended to old ones when holding top-most + memory; if they cannot be prepended to others, they are held in + different segments. + + Except for the top-most segment of an mstate, each segment record + is kept at the tail of its segment. Segments are added by pushing + segment records onto the list headed by &mstate.seg for the + containing mstate. + + Segment flags control allocation/merge/deallocation policies: + * If EXTERN_BIT set, then we did not allocate this segment, + and so should not try to deallocate or merge with others. + (This currently holds only for the initial segment passed + into create_mspace_with_base.) + * If IS_MMAPPED_BIT set, the segment may be merged with + other surrounding mmapped segments and trimmed/de-allocated + using munmap. + * If neither bit is set, then the segment was obtained using + MORECORE so can be merged with surrounding MORECORE'd segments + and deallocated/trimmed using MORECORE with negative arguments. +*/ + +struct malloc_segment { + char* base; /* base address */ + size_t size; /* allocated size */ + struct malloc_segment* next; /* ptr to next segment */ + flag_t sflags; /* mmap and extern flag */ +}; + +#define is_mmapped_segment(S) ((S)->sflags & IS_MMAPPED_BIT) +#define is_extern_segment(S) ((S)->sflags & EXTERN_BIT) + +typedef struct malloc_segment msegment; +typedef struct malloc_segment* msegmentptr; + +/* ---------------------------- malloc_state ----------------------------- */ + +/* + A malloc_state holds all of the bookkeeping for a space. + The main fields are: + + Top + The topmost chunk of the currently active segment. Its size is + cached in topsize. The actual size of topmost space is + topsize+TOP_FOOT_SIZE, which includes space reserved for adding + fenceposts and segment records if necessary when getting more + space from the system. The size at which to autotrim top is + cached from mparams in trim_check, except that it is disabled if + an autotrim fails. + + Designated victim (dv) + This is the preferred chunk for servicing small requests that + don't have exact fits. It is normally the chunk split off most + recently to service another small request. Its size is cached in + dvsize. The link fields of this chunk are not maintained since it + is not kept in a bin. + + SmallBins + An array of bin headers for free chunks. These bins hold chunks + with sizes less than MIN_LARGE_SIZE bytes. Each bin contains + chunks of all the same size, spaced 8 bytes apart. To simplify + use in double-linked lists, each bin header acts as a malloc_chunk + pointing to the real first node, if it exists (else pointing to + itself). This avoids special-casing for headers. But to avoid + waste, we allocate only the fd/bk pointers of bins, and then use + repositioning tricks to treat these as the fields of a chunk. + + TreeBins + Treebins are pointers to the roots of trees holding a range of + sizes. There are 2 equally spaced treebins for each power of two + from TREE_SHIFT to TREE_SHIFT+16. The last bin holds anything + larger. + + Bin maps + There is one bit map for small bins ("smallmap") and one for + treebins ("treemap). Each bin sets its bit when non-empty, and + clears the bit when empty. Bit operations are then used to avoid + bin-by-bin searching -- nearly all "search" is done without ever + looking at bins that won't be selected. The bit maps + conservatively use 32 bits per map word, even if on 64bit system. + For a good description of some of the bit-based techniques used + here, see Henry S. Warren Jr's book "Hacker's Delight" (and + supplement at http://hackersdelight.org/). Many of these are + intended to reduce the branchiness of paths through malloc etc, as + well as to reduce the number of memory locations read or written. + + Segments + A list of segments headed by an embedded malloc_segment record + representing the initial space. + + Address check support + The least_addr field is the least address ever obtained from + MORECORE or MMAP. Attempted frees and reallocs of any address less + than this are trapped (unless INSECURE is defined). + + Magic tag + A cross-check field that should always hold same value as mparams.magic. + + Flags + Bits recording whether to use MMAP, locks, or contiguous MORECORE + + Statistics + Each space keeps track of current and maximum system memory + obtained via MORECORE or MMAP. + + Locking + If USE_LOCKS is defined, the "mutex" lock is acquired and released + around every public call using this mspace. +*/ + +/* Bin types, widths and sizes */ +#define NSMALLBINS (32U) +#define NTREEBINS (32U) +#define SMALLBIN_SHIFT (3U) +#define SMALLBIN_WIDTH (SIZE_T_ONE << SMALLBIN_SHIFT) +#define TREEBIN_SHIFT (8U) +#define MIN_LARGE_SIZE (SIZE_T_ONE << TREEBIN_SHIFT) +#define MAX_SMALL_SIZE (MIN_LARGE_SIZE - SIZE_T_ONE) +#define MAX_SMALL_REQUEST (MAX_SMALL_SIZE - CHUNK_ALIGN_MASK - CHUNK_OVERHEAD) + +struct malloc_state { + binmap_t smallmap; + binmap_t treemap; + size_t dvsize; + size_t topsize; + char* least_addr; + mchunkptr dv; + mchunkptr top; + size_t trim_check; + size_t magic; + mchunkptr smallbins[(NSMALLBINS+1)*2]; + tbinptr treebins[NTREEBINS]; + size_t footprint; + size_t max_footprint; + flag_t mflags; +#if USE_LOCKS + MLOCK_T mutex; /* locate lock among fields that rarely change */ +#endif /* USE_LOCKS */ + msegment seg; +}; + +typedef struct malloc_state* mstate; + +/* ------------- Global malloc_state and malloc_params ------------------- */ + +/* + malloc_params holds global properties, including those that can be + dynamically set using mallopt. There is a single instance, mparams, + initialized in init_mparams. +*/ + +struct malloc_params { + size_t magic; + size_t page_size; + size_t granularity; + size_t mmap_threshold; + size_t trim_threshold; + flag_t default_mflags; +}; + +static struct malloc_params mparams; + +/* The global malloc_state used for all non-"mspace" calls */ +static struct malloc_state _gm_; +#define gm (&_gm_) +#define is_global(M) ((M) == &_gm_) +#define is_initialized(M) ((M)->top != 0) + +/* -------------------------- system alloc setup ------------------------- */ + +/* Operations on mflags */ + +#define use_lock(M) ((M)->mflags & USE_LOCK_BIT) +#define enable_lock(M) ((M)->mflags |= USE_LOCK_BIT) +#define disable_lock(M) ((M)->mflags &= ~USE_LOCK_BIT) + +#define use_mmap(M) ((M)->mflags & USE_MMAP_BIT) +#define enable_mmap(M) ((M)->mflags |= USE_MMAP_BIT) +#define disable_mmap(M) ((M)->mflags &= ~USE_MMAP_BIT) + +#define use_noncontiguous(M) ((M)->mflags & USE_NONCONTIGUOUS_BIT) +#define disable_contiguous(M) ((M)->mflags |= USE_NONCONTIGUOUS_BIT) + +#define set_lock(M,L)\ + ((M)->mflags = (L)?\ + ((M)->mflags | USE_LOCK_BIT) :\ + ((M)->mflags & ~USE_LOCK_BIT)) + +/* page-align a size */ +#define page_align(S)\ + (((S) + (mparams.page_size)) & ~(mparams.page_size - SIZE_T_ONE)) + +/* granularity-align a size */ +#define granularity_align(S)\ + (((S) + (mparams.granularity)) & ~(mparams.granularity - SIZE_T_ONE)) + +#define is_page_aligned(S)\ + (((size_t)(S) & (mparams.page_size - SIZE_T_ONE)) == 0) +#define is_granularity_aligned(S)\ + (((size_t)(S) & (mparams.granularity - SIZE_T_ONE)) == 0) + +/* True if segment S holds address A */ +#define segment_holds(S, A)\ + ((char*)(A) >= S->base && (char*)(A) < S->base + S->size) + +/* Return segment holding given address */ +static msegmentptr segment_holding(mstate m, char* addr) { + msegmentptr sp = &m->seg; + for (;;) { + if (addr >= sp->base && addr < sp->base + sp->size) + return sp; + if ((sp = sp->next) == 0) + return 0; + } +} + +/* Return true if segment contains a segment link */ +static int has_segment_link(mstate m, msegmentptr ss) { + msegmentptr sp = &m->seg; + for (;;) { + if ((char*)sp >= ss->base && (char*)sp < ss->base + ss->size) + return 1; + if ((sp = sp->next) == 0) + return 0; + } +} + +#ifndef MORECORE_CANNOT_TRIM +#define should_trim(M,s) ((s) > (M)->trim_check) +#else /* MORECORE_CANNOT_TRIM */ +#define should_trim(M,s) (0) +#endif /* MORECORE_CANNOT_TRIM */ + +/* + TOP_FOOT_SIZE is padding at the end of a segment, including space + that may be needed to place segment records and fenceposts when new + noncontiguous segments are added. +*/ +#define TOP_FOOT_SIZE\ + (align_offset(chunk2mem(0))+pad_request(sizeof(struct malloc_segment))+MIN_CHUNK_SIZE) + + +/* ------------------------------- Hooks -------------------------------- */ + +/* + PREACTION should be defined to return 0 on success, and nonzero on + failure. If you are not using locking, you can redefine these to do + anything you like. +*/ + +#if USE_LOCKS + +/* Ensure locks are initialized */ +#define GLOBALLY_INITIALIZE() (mparams.page_size == 0 && init_mparams()) + +#define PREACTION(M) ((GLOBALLY_INITIALIZE() || use_lock(M))? ACQUIRE_LOCK(&(M)->mutex) : 0) +#define POSTACTION(M) { if (use_lock(M)) RELEASE_LOCK(&(M)->mutex); } +#else /* USE_LOCKS */ + +#ifndef PREACTION +#define PREACTION(M) (0) +#endif /* PREACTION */ + +#ifndef POSTACTION +#define POSTACTION(M) +#endif /* POSTACTION */ + +#endif /* USE_LOCKS */ + +/* + CORRUPTION_ERROR_ACTION is triggered upon detected bad addresses. + USAGE_ERROR_ACTION is triggered on detected bad frees and + reallocs. The argument p is an address that might have triggered the + fault. It is ignored by the two predefined actions, but might be + useful in custom actions that try to help diagnose errors. +*/ + +#if PROCEED_ON_ERROR + +/* A count of the number of corruption errors causing resets */ +int malloc_corruption_error_count; + +/* default corruption action */ +static void reset_on_error(mstate m); + +#define CORRUPTION_ERROR_ACTION(m) reset_on_error(m) +#define USAGE_ERROR_ACTION(m, p) + +#else /* PROCEED_ON_ERROR */ + +#ifndef CORRUPTION_ERROR_ACTION +#define CORRUPTION_ERROR_ACTION(m) ABORT +#endif /* CORRUPTION_ERROR_ACTION */ + +#ifndef USAGE_ERROR_ACTION +#define USAGE_ERROR_ACTION(m,p) ABORT +#endif /* USAGE_ERROR_ACTION */ + +#endif /* PROCEED_ON_ERROR */ + +/* -------------------------- Debugging setup ---------------------------- */ + +#if ! DEBUG + +#define check_free_chunk(M,P) +#define check_inuse_chunk(M,P) +#define check_malloced_chunk(M,P,N) +#define check_mmapped_chunk(M,P) +#define check_malloc_state(M) +#define check_top_chunk(M,P) + +#else /* DEBUG */ +#define check_free_chunk(M,P) do_check_free_chunk(M,P) +#define check_inuse_chunk(M,P) do_check_inuse_chunk(M,P) +#define check_top_chunk(M,P) do_check_top_chunk(M,P) +#define check_malloced_chunk(M,P,N) do_check_malloced_chunk(M,P,N) +#define check_mmapped_chunk(M,P) do_check_mmapped_chunk(M,P) +#define check_malloc_state(M) do_check_malloc_state(M) + +static void do_check_any_chunk(mstate m, mchunkptr p); +static void do_check_top_chunk(mstate m, mchunkptr p); +static void do_check_mmapped_chunk(mstate m, mchunkptr p); +static void do_check_inuse_chunk(mstate m, mchunkptr p); +static void do_check_free_chunk(mstate m, mchunkptr p); +static void do_check_malloced_chunk(mstate m, void* mem, size_t s); +static void do_check_tree(mstate m, tchunkptr t); +static void do_check_treebin(mstate m, bindex_t i); +static void do_check_smallbin(mstate m, bindex_t i); +static void do_check_malloc_state(mstate m); +static int bin_find(mstate m, mchunkptr x); +static size_t traverse_and_check(mstate m); +#endif /* DEBUG */ + +/* ---------------------------- Indexing Bins ---------------------------- */ + +#define is_small(s) (((s) >> SMALLBIN_SHIFT) < NSMALLBINS) +#define small_index(s) ((s) >> SMALLBIN_SHIFT) +#define small_index2size(i) ((i) << SMALLBIN_SHIFT) +#define MIN_SMALL_INDEX (small_index(MIN_CHUNK_SIZE)) + +/* addressing by index. See above about smallbin repositioning */ +#define smallbin_at(M, i) ((sbinptr)((char*)&((M)->smallbins[(i)<<1]))) +#define treebin_at(M,i) (&((M)->treebins[i])) + +/* assign tree index for size S to variable I */ +#if defined(__GNUC__) && defined(i386) +#define compute_tree_index(S, I)\ +{\ + size_t X = S >> TREEBIN_SHIFT;\ + if (X == 0)\ + I = 0;\ + else if (X > 0xFFFF)\ + I = NTREEBINS-1;\ + else {\ + unsigned int K;\ + asm("bsrl %1,%0\n\t" : "=r" (K) : "rm" (X));\ + I = (bindex_t)((K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1)));\ + }\ +} +#else /* GNUC */ +#define compute_tree_index(S, I)\ +{\ + size_t X = S >> TREEBIN_SHIFT;\ + if (X == 0)\ + I = 0;\ + else if (X > 0xFFFF)\ + I = NTREEBINS-1;\ + else {\ + unsigned int Y = (unsigned int)X;\ + unsigned int N = ((Y - 0x100) >> 16) & 8;\ + unsigned int K = (((Y <<= N) - 0x1000) >> 16) & 4;\ + N += K;\ + N += K = (((Y <<= K) - 0x4000) >> 16) & 2;\ + K = 14 - N + ((Y <<= K) >> 15);\ + I = (K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1));\ + }\ +} +#endif /* GNUC */ + +/* Bit representing maximum resolved size in a treebin at i */ +#define bit_for_tree_index(i) \ + (i == NTREEBINS-1)? (SIZE_T_BITSIZE-1) : (((i) >> 1) + TREEBIN_SHIFT - 2) + +/* Shift placing maximum resolved bit in a treebin at i as sign bit */ +#define leftshift_for_tree_index(i) \ + ((i == NTREEBINS-1)? 0 : \ + ((SIZE_T_BITSIZE-SIZE_T_ONE) - (((i) >> 1) + TREEBIN_SHIFT - 2))) + +/* The size of the smallest chunk held in bin with index i */ +#define minsize_for_tree_index(i) \ + ((SIZE_T_ONE << (((i) >> 1) + TREEBIN_SHIFT)) | \ + (((size_t)((i) & SIZE_T_ONE)) << (((i) >> 1) + TREEBIN_SHIFT - 1))) + + +/* ------------------------ Operations on bin maps ----------------------- */ + +/* bit corresponding to given index */ +#define idx2bit(i) ((binmap_t)(1) << (i)) + +/* Mark/Clear bits with given index */ +#define mark_smallmap(M,i) ((M)->smallmap |= idx2bit(i)) +#define clear_smallmap(M,i) ((M)->smallmap &= ~idx2bit(i)) +#define smallmap_is_marked(M,i) ((M)->smallmap & idx2bit(i)) + +#define mark_treemap(M,i) ((M)->treemap |= idx2bit(i)) +#define clear_treemap(M,i) ((M)->treemap &= ~idx2bit(i)) +#define treemap_is_marked(M,i) ((M)->treemap & idx2bit(i)) + +/* index corresponding to given bit */ + +#if defined(__GNUC__) && defined(i386) +#define compute_bit2idx(X, I)\ +{\ + unsigned int J;\ + asm("bsfl %1,%0\n\t" : "=r" (J) : "rm" (X));\ + I = (bindex_t)J;\ +} + +#else /* GNUC */ +#if USE_BUILTIN_FFS +#define compute_bit2idx(X, I) I = ffs(X)-1 + +#else /* USE_BUILTIN_FFS */ +#define compute_bit2idx(X, I)\ +{\ + unsigned int Y = X - 1;\ + unsigned int K = Y >> (16-4) & 16;\ + unsigned int N = K; Y >>= K;\ + N += K = Y >> (8-3) & 8; Y >>= K;\ + N += K = Y >> (4-2) & 4; Y >>= K;\ + N += K = Y >> (2-1) & 2; Y >>= K;\ + N += K = Y >> (1-0) & 1; Y >>= K;\ + I = (bindex_t)(N + Y);\ +} +#endif /* USE_BUILTIN_FFS */ +#endif /* GNUC */ + +/* isolate the least set bit of a bitmap */ +#define least_bit(x) ((x) & -(x)) + +/* mask with all bits to left of least bit of x on */ +#define left_bits(x) ((x<<1) | -(x<<1)) + +/* mask with all bits to left of or equal to least bit of x on */ +#define same_or_left_bits(x) ((x) | -(x)) + + +/* ----------------------- Runtime Check Support ------------------------- */ + +/* + For security, the main invariant is that malloc/free/etc never + writes to a static address other than malloc_state, unless static + malloc_state itself has been corrupted, which cannot occur via + malloc (because of these checks). In essence this means that we + believe all pointers, sizes, maps etc held in malloc_state, but + check all of those linked or offsetted from other embedded data + structures. These checks are interspersed with main code in a way + that tends to minimize their run-time cost. + + When FOOTERS is defined, in addition to range checking, we also + verify footer fields of inuse chunks, which can be used guarantee + that the mstate controlling malloc/free is intact. This is a + streamlined version of the approach described by William Robertson + et al in "Run-time Detection of Heap-based Overflows" LISA'03 + http://www.usenix.org/events/lisa03/tech/robertson.html The footer + of an inuse chunk holds the xor of its mstate and a random seed, + that is checked upon calls to free() and realloc(). This is + (probablistically) unguessable from outside the program, but can be + computed by any code successfully malloc'ing any chunk, so does not + itself provide protection against code that has already broken + security through some other means. Unlike Robertson et al, we + always dynamically check addresses of all offset chunks (previous, + next, etc). This turns out to be cheaper than relying on hashes. +*/ + +#if !INSECURE +/* Check if address a is at least as high as any from MORECORE or MMAP */ +#define ok_address(M, a) ((char*)(a) >= (M)->least_addr) +/* Check if address of next chunk n is higher than base chunk p */ +#define ok_next(p, n) ((char*)(p) < (char*)(n)) +/* Check if p has its cinuse bit on */ +#define ok_cinuse(p) cinuse(p) +/* Check if p has its pinuse bit on */ +#define ok_pinuse(p) pinuse(p) + +#else /* !INSECURE */ +#define ok_address(M, a) (1) +#define ok_next(b, n) (1) +#define ok_cinuse(p) (1) +#define ok_pinuse(p) (1) +#endif /* !INSECURE */ + +#if (FOOTERS && !INSECURE) +/* Check if (alleged) mstate m has expected magic field */ +#define ok_magic(M) ((M)->magic == mparams.magic) +#else /* (FOOTERS && !INSECURE) */ +#define ok_magic(M) (1) +#endif /* (FOOTERS && !INSECURE) */ + + +/* In gcc, use __builtin_expect to minimize impact of checks */ +#if !INSECURE +#if defined(__GNUC__) && __GNUC__ >= 3 +#define RTCHECK(e) __builtin_expect(e, 1) +#else /* GNUC */ +#define RTCHECK(e) (e) +#endif /* GNUC */ +#else /* !INSECURE */ +#define RTCHECK(e) (1) +#endif /* !INSECURE */ + +/* macros to set up inuse chunks with or without footers */ + +#if !FOOTERS + +#define mark_inuse_foot(M,p,s) + +/* Set cinuse bit and pinuse bit of next chunk */ +#define set_inuse(M,p,s)\ + ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\ + ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT) + +/* Set cinuse and pinuse of this chunk and pinuse of next chunk */ +#define set_inuse_and_pinuse(M,p,s)\ + ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\ + ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT) + +/* Set size, cinuse and pinuse bit of this chunk */ +#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\ + ((p)->head = (s|PINUSE_BIT|CINUSE_BIT)) + +#else /* FOOTERS */ + +/* Set foot of inuse chunk to be xor of mstate and seed */ +#define mark_inuse_foot(M,p,s)\ + (((mchunkptr)((char*)(p) + (s)))->prev_foot = ((size_t)(M) ^ mparams.magic)) + +#define get_mstate_for(p)\ + ((mstate)(((mchunkptr)((char*)(p) +\ + (chunksize(p))))->prev_foot ^ mparams.magic)) + +#define set_inuse(M,p,s)\ + ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\ + (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT), \ + mark_inuse_foot(M,p,s)) + +#define set_inuse_and_pinuse(M,p,s)\ + ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\ + (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT),\ + mark_inuse_foot(M,p,s)) + +#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\ + ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\ + mark_inuse_foot(M, p, s)) + +#endif /* !FOOTERS */ + +/* ---------------------------- setting mparams -------------------------- */ + +/* Initialize mparams */ +static int init_mparams(void) { + if (mparams.page_size == 0) { + size_t s; + + mparams.mmap_threshold = DEFAULT_MMAP_THRESHOLD; + mparams.trim_threshold = DEFAULT_TRIM_THRESHOLD; +#if MORECORE_CONTIGUOUS + mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT; +#else /* MORECORE_CONTIGUOUS */ + mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT|USE_NONCONTIGUOUS_BIT; +#endif /* MORECORE_CONTIGUOUS */ + +#if (FOOTERS && !INSECURE) + { +#if USE_DEV_RANDOM + int fd; + unsigned char buf[sizeof(size_t)]; + /* Try to use /dev/urandom, else fall back on using time */ + if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 && + read(fd, buf, sizeof(buf)) == sizeof(buf)) { + s = *((size_t *) buf); + close(fd); + } + else +#endif /* USE_DEV_RANDOM */ + s = (size_t)(time(0) ^ (size_t)0x55555555U); + + s |= (size_t)8U; /* ensure nonzero */ + s &= ~(size_t)7U; /* improve chances of fault for bad values */ + + } +#else /* (FOOTERS && !INSECURE) */ + s = (size_t)0x58585858U; +#endif /* (FOOTERS && !INSECURE) */ + ACQUIRE_MAGIC_INIT_LOCK(); + if (mparams.magic == 0) { + mparams.magic = s; + /* Set up lock for main malloc area */ + INITIAL_LOCK(&gm->mutex); + gm->mflags = mparams.default_mflags; + } + RELEASE_MAGIC_INIT_LOCK(); + +#ifndef WIN32 + mparams.page_size = malloc_getpagesize; + mparams.granularity = ((DEFAULT_GRANULARITY != 0)? + DEFAULT_GRANULARITY : mparams.page_size); +#else /* WIN32 */ + { + SYSTEM_INFO system_info; + GetSystemInfo(&system_info); + mparams.page_size = system_info.dwPageSize; + mparams.granularity = system_info.dwAllocationGranularity; + } +#endif /* WIN32 */ + + /* Sanity-check configuration: + size_t must be unsigned and as wide as pointer type. + ints must be at least 4 bytes. + alignment must be at least 8. + Alignment, min chunk size, and page size must all be powers of 2. + */ + if ((sizeof(size_t) != sizeof(char*)) || + (MAX_SIZE_T < MIN_CHUNK_SIZE) || + (sizeof(int) < 4) || + (MALLOC_ALIGNMENT < (size_t)8U) || + ((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-SIZE_T_ONE)) != 0) || + ((MCHUNK_SIZE & (MCHUNK_SIZE-SIZE_T_ONE)) != 0) || + ((mparams.granularity & (mparams.granularity-SIZE_T_ONE)) != 0) || + ((mparams.page_size & (mparams.page_size-SIZE_T_ONE)) != 0)) + ABORT; + } + return 0; +} + +/* support for mallopt */ +static int change_mparam(int param_number, int value) { + size_t val = (size_t)value; + init_mparams(); + switch(param_number) { + case M_TRIM_THRESHOLD: + mparams.trim_threshold = val; + return 1; + case M_GRANULARITY: + if (val >= mparams.page_size && ((val & (val-1)) == 0)) { + mparams.granularity = val; + return 1; + } + else + return 0; + case M_MMAP_THRESHOLD: + mparams.mmap_threshold = val; + return 1; + default: + return 0; + } +} + +#if DEBUG +/* ------------------------- Debugging Support --------------------------- */ + +/* Check properties of any chunk, whether free, inuse, mmapped etc */ +static void do_check_any_chunk(mstate m, mchunkptr p) { + assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD)); + assert(ok_address(m, p)); +} + +/* Check properties of top chunk */ +static void do_check_top_chunk(mstate m, mchunkptr p) { + msegmentptr sp = segment_holding(m, (char*)p); + size_t sz = chunksize(p); + assert(sp != 0); + assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD)); + assert(ok_address(m, p)); + assert(sz == m->topsize); + assert(sz > 0); + assert(sz == ((sp->base + sp->size) - (char*)p) - TOP_FOOT_SIZE); + assert(pinuse(p)); + assert(!next_pinuse(p)); +} + +/* Check properties of (inuse) mmapped chunks */ +static void do_check_mmapped_chunk(mstate m, mchunkptr p) { + size_t sz = chunksize(p); + size_t len = (sz + (p->prev_foot & ~IS_MMAPPED_BIT) + MMAP_FOOT_PAD); + assert(is_mmapped(p)); + assert(use_mmap(m)); + assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD)); + assert(ok_address(m, p)); + assert(!is_small(sz)); + assert((len & (mparams.page_size-SIZE_T_ONE)) == 0); + assert(chunk_plus_offset(p, sz)->head == FENCEPOST_HEAD); + assert(chunk_plus_offset(p, sz+SIZE_T_SIZE)->head == 0); +} + +/* Check properties of inuse chunks */ +static void do_check_inuse_chunk(mstate m, mchunkptr p) { + do_check_any_chunk(m, p); + assert(cinuse(p)); + assert(next_pinuse(p)); + /* If not pinuse and not mmapped, previous chunk has OK offset */ + assert(is_mmapped(p) || pinuse(p) || next_chunk(prev_chunk(p)) == p); + if (is_mmapped(p)) + do_check_mmapped_chunk(m, p); +} + +/* Check properties of free chunks */ +static void do_check_free_chunk(mstate m, mchunkptr p) { + size_t sz = p->head & ~(PINUSE_BIT|CINUSE_BIT); + mchunkptr next = chunk_plus_offset(p, sz); + do_check_any_chunk(m, p); + assert(!cinuse(p)); + assert(!next_pinuse(p)); + assert (!is_mmapped(p)); + if (p != m->dv && p != m->top) { + if (sz >= MIN_CHUNK_SIZE) { + assert((sz & CHUNK_ALIGN_MASK) == 0); + assert(is_aligned(chunk2mem(p))); + assert(next->prev_foot == sz); + assert(pinuse(p)); + assert (next == m->top || cinuse(next)); + assert(p->fd->bk == p); + assert(p->bk->fd == p); + } + else /* markers are always of size SIZE_T_SIZE */ + assert(sz == SIZE_T_SIZE); + } +} + +/* Check properties of malloced chunks at the point they are malloced */ +static void do_check_malloced_chunk(mstate m, void* mem, size_t s) { + if (mem != 0) { + mchunkptr p = mem2chunk(mem); + size_t sz = p->head & ~(PINUSE_BIT|CINUSE_BIT); + do_check_inuse_chunk(m, p); + assert((sz & CHUNK_ALIGN_MASK) == 0); + assert(sz >= MIN_CHUNK_SIZE); + assert(sz >= s); + /* unless mmapped, size is less than MIN_CHUNK_SIZE more than request */ + assert(is_mmapped(p) || sz < (s + MIN_CHUNK_SIZE)); + } +} + +/* Check a tree and its subtrees. */ +static void do_check_tree(mstate m, tchunkptr t) { + tchunkptr head = 0; + tchunkptr u = t; + bindex_t tindex = t->index; + size_t tsize = chunksize(t); + bindex_t idx; + compute_tree_index(tsize, idx); + assert(tindex == idx); + assert(tsize >= MIN_LARGE_SIZE); + assert(tsize >= minsize_for_tree_index(idx)); + assert((idx == NTREEBINS-1) || (tsize < minsize_for_tree_index((idx+1)))); + + do { /* traverse through chain of same-sized nodes */ + do_check_any_chunk(m, ((mchunkptr)u)); + assert(u->index == tindex); + assert(chunksize(u) == tsize); + assert(!cinuse(u)); + assert(!next_pinuse(u)); + assert(u->fd->bk == u); + assert(u->bk->fd == u); + if (u->parent == 0) { + assert(u->child[0] == 0); + assert(u->child[1] == 0); + } + else { + assert(head == 0); /* only one node on chain has parent */ + head = u; + assert(u->parent != u); + assert (u->parent->child[0] == u || + u->parent->child[1] == u || + *((tbinptr*)(u->parent)) == u); + if (u->child[0] != 0) { + assert(u->child[0]->parent == u); + assert(u->child[0] != u); + do_check_tree(m, u->child[0]); + } + if (u->child[1] != 0) { + assert(u->child[1]->parent == u); + assert(u->child[1] != u); + do_check_tree(m, u->child[1]); + } + if (u->child[0] != 0 && u->child[1] != 0) { + assert(chunksize(u->child[0]) < chunksize(u->child[1])); + } + } + u = u->fd; + } while (u != t); + assert(head != 0); +} + +/* Check all the chunks in a treebin. */ +static void do_check_treebin(mstate m, bindex_t i) { + tbinptr* tb = treebin_at(m, i); + tchunkptr t = *tb; + int empty = (m->treemap & (1U << i)) == 0; + if (t == 0) + assert(empty); + if (!empty) + do_check_tree(m, t); +} + +/* Check all the chunks in a smallbin. */ +static void do_check_smallbin(mstate m, bindex_t i) { + sbinptr b = smallbin_at(m, i); + mchunkptr p = b->bk; + unsigned int empty = (m->smallmap & (1U << i)) == 0; + if (p == b) + assert(empty); + if (!empty) { + for (; p != b; p = p->bk) { + size_t size = chunksize(p); + mchunkptr q; + /* each chunk claims to be free */ + do_check_free_chunk(m, p); + /* chunk belongs in bin */ + assert(small_index(size) == i); + assert(p->bk == b || chunksize(p->bk) == chunksize(p)); + /* chunk is followed by an inuse chunk */ + q = next_chunk(p); + if (q->head != FENCEPOST_HEAD) + do_check_inuse_chunk(m, q); + } + } +} + +/* Find x in a bin. Used in other check functions. */ +static int bin_find(mstate m, mchunkptr x) { + size_t size = chunksize(x); + if (is_small(size)) { + bindex_t sidx = small_index(size); + sbinptr b = smallbin_at(m, sidx); + if (smallmap_is_marked(m, sidx)) { + mchunkptr p = b; + do { + if (p == x) + return 1; + } while ((p = p->fd) != b); + } + } + else { + bindex_t tidx; + compute_tree_index(size, tidx); + if (treemap_is_marked(m, tidx)) { + tchunkptr t = *treebin_at(m, tidx); + size_t sizebits = size << leftshift_for_tree_index(tidx); + while (t != 0 && chunksize(t) != size) { + t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]; + sizebits <<= 1; + } + if (t != 0) { + tchunkptr u = t; + do { + if (u == (tchunkptr)x) + return 1; + } while ((u = u->fd) != t); + } + } + } + return 0; +} + +/* Traverse each chunk and check it; return total */ +static size_t traverse_and_check(mstate m) { + size_t sum = 0; + if (is_initialized(m)) { + msegmentptr s = &m->seg; + sum += m->topsize + TOP_FOOT_SIZE; + while (s != 0) { + mchunkptr q = align_as_chunk(s->base); + mchunkptr lastq = 0; + assert(pinuse(q)); + while (segment_holds(s, q) && + q != m->top && q->head != FENCEPOST_HEAD) { + sum += chunksize(q); + if (cinuse(q)) { + assert(!bin_find(m, q)); + do_check_inuse_chunk(m, q); + } + else { + assert(q == m->dv || bin_find(m, q)); + assert(lastq == 0 || cinuse(lastq)); /* Not 2 consecutive free */ + do_check_free_chunk(m, q); + } + lastq = q; + q = next_chunk(q); + } + s = s->next; + } + } + return sum; +} + +/* Check all properties of malloc_state. */ +static void do_check_malloc_state(mstate m) { + bindex_t i; + size_t total; + /* check bins */ + for (i = 0; i < NSMALLBINS; ++i) + do_check_smallbin(m, i); + for (i = 0; i < NTREEBINS; ++i) + do_check_treebin(m, i); + + if (m->dvsize != 0) { /* check dv chunk */ + do_check_any_chunk(m, m->dv); + assert(m->dvsize == chunksize(m->dv)); + assert(m->dvsize >= MIN_CHUNK_SIZE); + assert(bin_find(m, m->dv) == 0); + } + + if (m->top != 0) { /* check top chunk */ + do_check_top_chunk(m, m->top); + assert(m->topsize == chunksize(m->top)); + assert(m->topsize > 0); + assert(bin_find(m, m->top) == 0); + } + + total = traverse_and_check(m); + assert(total <= m->footprint); + assert(m->footprint <= m->max_footprint); +} +#endif /* DEBUG */ + +/* ----------------------------- statistics ------------------------------ */ + +#if !NO_MALLINFO +static struct mallinfo internal_mallinfo(mstate m) { + struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + if (!PREACTION(m)) { + check_malloc_state(m); + if (is_initialized(m)) { + size_t nfree = SIZE_T_ONE; /* top always free */ + size_t mfree = m->topsize + TOP_FOOT_SIZE; + size_t sum = mfree; + msegmentptr s = &m->seg; + while (s != 0) { + mchunkptr q = align_as_chunk(s->base); + while (segment_holds(s, q) && + q != m->top && q->head != FENCEPOST_HEAD) { + size_t sz = chunksize(q); + sum += sz; + if (!cinuse(q)) { + mfree += sz; + ++nfree; + } + q = next_chunk(q); + } + s = s->next; + } + + nm.arena = sum; + nm.ordblks = nfree; + nm.hblkhd = m->footprint - sum; + nm.usmblks = m->max_footprint; + nm.uordblks = m->footprint - mfree; + nm.fordblks = mfree; + nm.keepcost = m->topsize; + } + + POSTACTION(m); + } + return nm; +} +#endif /* !NO_MALLINFO */ + +static void internal_malloc_stats(mstate m) { + if (!PREACTION(m)) { + size_t maxfp = 0; + size_t fp = 0; + size_t used = 0; + check_malloc_state(m); + if (is_initialized(m)) { + msegmentptr s = &m->seg; + maxfp = m->max_footprint; + fp = m->footprint; + used = fp - (m->topsize + TOP_FOOT_SIZE); + + while (s != 0) { + mchunkptr q = align_as_chunk(s->base); + while (segment_holds(s, q) && + q != m->top && q->head != FENCEPOST_HEAD) { + if (!cinuse(q)) + used -= chunksize(q); + q = next_chunk(q); + } + s = s->next; + } + } + + fprintf(stderr, "max system bytes = %10lu\n", (unsigned long)(maxfp)); + fprintf(stderr, "system bytes = %10lu\n", (unsigned long)(fp)); + fprintf(stderr, "in use bytes = %10lu\n", (unsigned long)(used)); + + POSTACTION(m); + } +} + +/* ----------------------- Operations on smallbins ----------------------- */ + +/* + Various forms of linking and unlinking are defined as macros. Even + the ones for trees, which are very long but have very short typical + paths. This is ugly but reduces reliance on inlining support of + compilers. +*/ + +/* Link a free chunk into a smallbin */ +#define insert_small_chunk(M, P, S) {\ + bindex_t I = small_index(S);\ + mchunkptr B = smallbin_at(M, I);\ + mchunkptr F = B;\ + assert(S >= MIN_CHUNK_SIZE);\ + if (!smallmap_is_marked(M, I))\ + mark_smallmap(M, I);\ + else if (RTCHECK(ok_address(M, B->fd)))\ + F = B->fd;\ + else {\ + CORRUPTION_ERROR_ACTION(M);\ + }\ + B->fd = P;\ + F->bk = P;\ + P->fd = F;\ + P->bk = B;\ +} + +/* Unlink a chunk from a smallbin */ +#define unlink_small_chunk(M, P, S) {\ + mchunkptr F = P->fd;\ + mchunkptr B = P->bk;\ + bindex_t I = small_index(S);\ + assert(P != B);\ + assert(P != F);\ + assert(chunksize(P) == small_index2size(I));\ + if (F == B)\ + clear_smallmap(M, I);\ + else if (RTCHECK((F == smallbin_at(M,I) || ok_address(M, F)) &&\ + (B == smallbin_at(M,I) || ok_address(M, B)))) {\ + F->bk = B;\ + B->fd = F;\ + }\ + else {\ + CORRUPTION_ERROR_ACTION(M);\ + }\ +} + +/* Unlink the first chunk from a smallbin */ +#define unlink_first_small_chunk(M, B, P, I) {\ + mchunkptr F = P->fd;\ + assert(P != B);\ + assert(P != F);\ + assert(chunksize(P) == small_index2size(I));\ + if (B == F)\ + clear_smallmap(M, I);\ + else if (RTCHECK(ok_address(M, F))) {\ + B->fd = F;\ + F->bk = B;\ + }\ + else {\ + CORRUPTION_ERROR_ACTION(M);\ + }\ +} + +/* Replace dv node, binning the old one */ +/* Used only when dvsize known to be small */ +#define replace_dv(M, P, S) {\ + size_t DVS = M->dvsize;\ + if (DVS != 0) {\ + mchunkptr DV = M->dv;\ + assert(is_small(DVS));\ + insert_small_chunk(M, DV, DVS);\ + }\ + M->dvsize = S;\ + M->dv = P;\ +} + +/* ------------------------- Operations on trees ------------------------- */ + +/* Insert chunk into tree */ +#define insert_large_chunk(M, X, S) {\ + tbinptr* H;\ + bindex_t I;\ + compute_tree_index(S, I);\ + H = treebin_at(M, I);\ + X->index = I;\ + X->child[0] = X->child[1] = 0;\ + if (!treemap_is_marked(M, I)) {\ + mark_treemap(M, I);\ + *H = X;\ + X->parent = (tchunkptr)H;\ + X->fd = X->bk = X;\ + }\ + else {\ + tchunkptr T = *H;\ + size_t K = S << leftshift_for_tree_index(I);\ + for (;;) {\ + if (chunksize(T) != S) {\ + tchunkptr* C = &(T->child[(K >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]);\ + K <<= 1;\ + if (*C != 0)\ + T = *C;\ + else if (RTCHECK(ok_address(M, C))) {\ + *C = X;\ + X->parent = T;\ + X->fd = X->bk = X;\ + break;\ + }\ + else {\ + CORRUPTION_ERROR_ACTION(M);\ + break;\ + }\ + }\ + else {\ + tchunkptr F = T->fd;\ + if (RTCHECK(ok_address(M, T) && ok_address(M, F))) {\ + T->fd = F->bk = X;\ + X->fd = F;\ + X->bk = T;\ + X->parent = 0;\ + break;\ + }\ + else {\ + CORRUPTION_ERROR_ACTION(M);\ + break;\ + }\ + }\ + }\ + }\ +} + +/* + Unlink steps: + + 1. If x is a chained node, unlink it from its same-sized fd/bk links + and choose its bk node as its replacement. + 2. If x was the last node of its size, but not a leaf node, it must + be replaced with a leaf node (not merely one with an open left or + right), to make sure that lefts and rights of descendents + correspond properly to bit masks. We use the rightmost descendent + of x. We could use any other leaf, but this is easy to locate and + tends to counteract removal of leftmosts elsewhere, and so keeps + paths shorter than minimally guaranteed. This doesn't loop much + because on average a node in a tree is near the bottom. + 3. If x is the base of a chain (i.e., has parent links) relink + x's parent and children to x's replacement (or null if none). +*/ + +#define unlink_large_chunk(M, X) {\ + tchunkptr XP = X->parent;\ + tchunkptr R;\ + if (X->bk != X) {\ + tchunkptr F = X->fd;\ + R = X->bk;\ + if (RTCHECK(ok_address(M, F))) {\ + F->bk = R;\ + R->fd = F;\ + }\ + else {\ + CORRUPTION_ERROR_ACTION(M);\ + }\ + }\ + else {\ + tchunkptr* RP;\ + if (((R = *(RP = &(X->child[1]))) != 0) ||\ + ((R = *(RP = &(X->child[0]))) != 0)) {\ + tchunkptr* CP;\ + while ((*(CP = &(R->child[1])) != 0) ||\ + (*(CP = &(R->child[0])) != 0)) {\ + R = *(RP = CP);\ + }\ + if (RTCHECK(ok_address(M, RP)))\ + *RP = 0;\ + else {\ + CORRUPTION_ERROR_ACTION(M);\ + }\ + }\ + }\ + if (XP != 0) {\ + tbinptr* H = treebin_at(M, X->index);\ + if (X == *H) {\ + if ((*H = R) == 0) \ + clear_treemap(M, X->index);\ + }\ + else if (RTCHECK(ok_address(M, XP))) {\ + if (XP->child[0] == X) \ + XP->child[0] = R;\ + else \ + XP->child[1] = R;\ + }\ + else\ + CORRUPTION_ERROR_ACTION(M);\ + if (R != 0) {\ + if (RTCHECK(ok_address(M, R))) {\ + tchunkptr C0, C1;\ + R->parent = XP;\ + if ((C0 = X->child[0]) != 0) {\ + if (RTCHECK(ok_address(M, C0))) {\ + R->child[0] = C0;\ + C0->parent = R;\ + }\ + else\ + CORRUPTION_ERROR_ACTION(M);\ + }\ + if ((C1 = X->child[1]) != 0) {\ + if (RTCHECK(ok_address(M, C1))) {\ + R->child[1] = C1;\ + C1->parent = R;\ + }\ + else\ + CORRUPTION_ERROR_ACTION(M);\ + }\ + }\ + else\ + CORRUPTION_ERROR_ACTION(M);\ + }\ + }\ +} + +/* Relays to large vs small bin operations */ + +#define insert_chunk(M, P, S)\ + if (is_small(S)) insert_small_chunk(M, P, S)\ + else { tchunkptr TP = (tchunkptr)(P); insert_large_chunk(M, TP, S); } + +#define unlink_chunk(M, P, S)\ + if (is_small(S)) unlink_small_chunk(M, P, S)\ + else { tchunkptr TP = (tchunkptr)(P); unlink_large_chunk(M, TP); } + + +/* Relays to internal calls to malloc/free from realloc, memalign etc */ + +#if ONLY_MSPACES +#define internal_malloc(m, b) mspace_malloc(m, b) +#define internal_free(m, mem) mspace_free(m,mem); +#else /* ONLY_MSPACES */ +#if MSPACES +#define internal_malloc(m, b)\ + (m == gm)? dlmalloc(b) : mspace_malloc(m, b) +#define internal_free(m, mem)\ + if (m == gm) dlfree(mem); else mspace_free(m,mem); +#else /* MSPACES */ +#define internal_malloc(m, b) dlmalloc(b) +#define internal_free(m, mem) dlfree(mem) +#endif /* MSPACES */ +#endif /* ONLY_MSPACES */ + +/* ----------------------- Direct-mmapping chunks ----------------------- */ + +/* + Directly mmapped chunks are set up with an offset to the start of + the mmapped region stored in the prev_foot field of the chunk. This + allows reconstruction of the required argument to MUNMAP when freed, + and also allows adjustment of the returned chunk to meet alignment + requirements (especially in memalign). There is also enough space + allocated to hold a fake next chunk of size SIZE_T_SIZE to maintain + the PINUSE bit so frees can be checked. +*/ + +/* Malloc using mmap */ +static void* mmap_alloc(mstate m, size_t nb) { + size_t mmsize = granularity_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK); + if (mmsize > nb) { /* Check for wrap around 0 */ + char* mm = (char*)(DIRECT_MMAP(mmsize)); + if (mm != CMFAIL) { + size_t offset = align_offset(chunk2mem(mm)); + size_t psize = mmsize - offset - MMAP_FOOT_PAD; + mchunkptr p = (mchunkptr)(mm + offset); + p->prev_foot = offset | IS_MMAPPED_BIT; + (p)->head = (psize|CINUSE_BIT); + mark_inuse_foot(m, p, psize); + chunk_plus_offset(p, psize)->head = FENCEPOST_HEAD; + chunk_plus_offset(p, psize+SIZE_T_SIZE)->head = 0; + + if (mm < m->least_addr) + m->least_addr = mm; + if ((m->footprint += mmsize) > m->max_footprint) + m->max_footprint = m->footprint; + assert(is_aligned(chunk2mem(p))); + check_mmapped_chunk(m, p); + return chunk2mem(p); + } + } + return 0; +} + +/* Realloc using mmap */ +static mchunkptr mmap_resize(mstate m, mchunkptr oldp, size_t nb) { + size_t oldsize = chunksize(oldp); + if (is_small(nb)) /* Can't shrink mmap regions below small size */ + return 0; + /* Keep old chunk if big enough but not too big */ + if (oldsize >= nb + SIZE_T_SIZE && + (oldsize - nb) <= (mparams.granularity << 1)) + return oldp; + else { + size_t offset = oldp->prev_foot & ~IS_MMAPPED_BIT; + size_t oldmmsize = oldsize + offset + MMAP_FOOT_PAD; + size_t newmmsize = granularity_align(nb + SIX_SIZE_T_SIZES + + CHUNK_ALIGN_MASK); + char* cp = (char*)CALL_MREMAP((char*)oldp - offset, + oldmmsize, newmmsize, 1); + if (cp != CMFAIL) { + mchunkptr newp = (mchunkptr)(cp + offset); + size_t psize = newmmsize - offset - MMAP_FOOT_PAD; + newp->head = (psize|CINUSE_BIT); + mark_inuse_foot(m, newp, psize); + chunk_plus_offset(newp, psize)->head = FENCEPOST_HEAD; + chunk_plus_offset(newp, psize+SIZE_T_SIZE)->head = 0; + + if (cp < m->least_addr) + m->least_addr = cp; + if ((m->footprint += newmmsize - oldmmsize) > m->max_footprint) + m->max_footprint = m->footprint; + check_mmapped_chunk(m, newp); + return newp; + } + } + return 0; +} + +/* -------------------------- mspace management -------------------------- */ + +/* Initialize top chunk and its size */ +static void init_top(mstate m, mchunkptr p, size_t psize) { + /* Ensure alignment */ + size_t offset = align_offset(chunk2mem(p)); + p = (mchunkptr)((char*)p + offset); + psize -= offset; + + m->top = p; + m->topsize = psize; + p->head = psize | PINUSE_BIT; + /* set size of fake trailing chunk holding overhead space only once */ + chunk_plus_offset(p, psize)->head = TOP_FOOT_SIZE; + m->trim_check = mparams.trim_threshold; /* reset on each update */ +} + +/* Initialize bins for a new mstate that is otherwise zeroed out */ +static void init_bins(mstate m) { + /* Establish circular links for smallbins */ + bindex_t i; + for (i = 0; i < NSMALLBINS; ++i) { + sbinptr bin = smallbin_at(m,i); + bin->fd = bin->bk = bin; + } +} + +#if PROCEED_ON_ERROR + +/* default corruption action */ +static void reset_on_error(mstate m) { + int i; + ++malloc_corruption_error_count; + /* Reinitialize fields to forget about all memory */ + m->smallbins = m->treebins = 0; + m->dvsize = m->topsize = 0; + m->seg.base = 0; + m->seg.size = 0; + m->seg.next = 0; + m->top = m->dv = 0; + for (i = 0; i < NTREEBINS; ++i) + *treebin_at(m, i) = 0; + init_bins(m); +} +#endif /* PROCEED_ON_ERROR */ + +/* Allocate chunk and prepend remainder with chunk in successor base. */ +static void* prepend_alloc(mstate m, char* newbase, char* oldbase, + size_t nb) { + mchunkptr p = align_as_chunk(newbase); + mchunkptr oldfirst = align_as_chunk(oldbase); + size_t psize = (char*)oldfirst - (char*)p; + mchunkptr q = chunk_plus_offset(p, nb); + size_t qsize = psize - nb; + set_size_and_pinuse_of_inuse_chunk(m, p, nb); + + assert((char*)oldfirst > (char*)q); + assert(pinuse(oldfirst)); + assert(qsize >= MIN_CHUNK_SIZE); + + /* consolidate remainder with first chunk of old base */ + if (oldfirst == m->top) { + size_t tsize = m->topsize += qsize; + m->top = q; + q->head = tsize | PINUSE_BIT; + check_top_chunk(m, q); + } + else if (oldfirst == m->dv) { + size_t dsize = m->dvsize += qsize; + m->dv = q; + set_size_and_pinuse_of_free_chunk(q, dsize); + } + else { + if (!cinuse(oldfirst)) { + size_t nsize = chunksize(oldfirst); + unlink_chunk(m, oldfirst, nsize); + oldfirst = chunk_plus_offset(oldfirst, nsize); + qsize += nsize; + } + set_free_with_pinuse(q, qsize, oldfirst); + insert_chunk(m, q, qsize); + check_free_chunk(m, q); + } + + check_malloced_chunk(m, chunk2mem(p), nb); + return chunk2mem(p); +} + + +/* Add a segment to hold a new noncontiguous region */ +static void add_segment(mstate m, char* tbase, size_t tsize, flag_t mmapped) { + /* Determine locations and sizes of segment, fenceposts, old top */ + char* old_top = (char*)m->top; + msegmentptr oldsp = segment_holding(m, old_top); + char* old_end = oldsp->base + oldsp->size; + size_t ssize = pad_request(sizeof(struct malloc_segment)); + char* rawsp = old_end - (ssize + FOUR_SIZE_T_SIZES + CHUNK_ALIGN_MASK); + size_t offset = align_offset(chunk2mem(rawsp)); + char* asp = rawsp + offset; + char* csp = (asp < (old_top + MIN_CHUNK_SIZE))? old_top : asp; + mchunkptr sp = (mchunkptr)csp; + msegmentptr ss = (msegmentptr)(chunk2mem(sp)); + mchunkptr tnext = chunk_plus_offset(sp, ssize); + mchunkptr p = tnext; + int nfences = 0; + + /* reset top to new space */ + init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE); + + /* Set up segment record */ + assert(is_aligned(ss)); + set_size_and_pinuse_of_inuse_chunk(m, sp, ssize); + *ss = m->seg; /* Push current record */ + m->seg.base = tbase; + m->seg.size = tsize; + m->seg.sflags = mmapped; + m->seg.next = ss; + + /* Insert trailing fenceposts */ + for (;;) { + mchunkptr nextp = chunk_plus_offset(p, SIZE_T_SIZE); + p->head = FENCEPOST_HEAD; + ++nfences; + if ((char*)(&(nextp->head)) < old_end) + p = nextp; + else + break; + } + assert(nfences >= 2); + + /* Insert the rest of old top into a bin as an ordinary free chunk */ + if (csp != old_top) { + mchunkptr q = (mchunkptr)old_top; + size_t psize = csp - old_top; + mchunkptr tn = chunk_plus_offset(q, psize); + set_free_with_pinuse(q, psize, tn); + insert_chunk(m, q, psize); + } + + check_top_chunk(m, m->top); +} + +/* -------------------------- System allocation -------------------------- */ + +/* Get memory from system using MORECORE or MMAP */ +static void* sys_alloc(mstate m, size_t nb) { + char* tbase = CMFAIL; + size_t tsize = 0; + flag_t mmap_flag = 0; + + init_mparams(); + + /* Directly map large chunks */ + if (use_mmap(m) && nb >= mparams.mmap_threshold) { + void* mem = mmap_alloc(m, nb); + if (mem != 0) + return mem; + } + + /* + Try getting memory in any of three ways (in most-preferred to + least-preferred order): + 1. A call to MORECORE that can normally contiguously extend memory. + (disabled if not MORECORE_CONTIGUOUS or not HAVE_MORECORE or + or main space is mmapped or a previous contiguous call failed) + 2. A call to MMAP new space (disabled if not HAVE_MMAP). + Note that under the default settings, if MORECORE is unable to + fulfill a request, and HAVE_MMAP is true, then mmap is + used as a noncontiguous system allocator. This is a useful backup + strategy for systems with holes in address spaces -- in this case + sbrk cannot contiguously expand the heap, but mmap may be able to + find space. + 3. A call to MORECORE that cannot usually contiguously extend memory. + (disabled if not HAVE_MORECORE) + */ + + if (MORECORE_CONTIGUOUS && !use_noncontiguous(m)) { + char* br = CMFAIL; + msegmentptr ss = (m->top == 0)? 0 : segment_holding(m, (char*)m->top); + size_t asize = 0; + ACQUIRE_MORECORE_LOCK(); + + if (ss == 0) { /* First time through or recovery */ + char* base = (char*)CALL_MORECORE(0); + if (base != CMFAIL) { + asize = granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE); + /* Adjust to end on a page boundary */ + if (!is_page_aligned(base)) + asize += (page_align((size_t)base) - (size_t)base); + /* Can't call MORECORE if size is negative when treated as signed */ + if (asize < HALF_MAX_SIZE_T && + (br = (char*)(CALL_MORECORE(asize))) == base) { + tbase = base; + tsize = asize; + } + } + } + else { + /* Subtract out existing available top space from MORECORE request. */ + asize = granularity_align(nb - m->topsize + TOP_FOOT_SIZE + SIZE_T_ONE); + /* Use mem here only if it did continuously extend old space */ + if (asize < HALF_MAX_SIZE_T && + (br = (char*)(CALL_MORECORE(asize))) == ss->base+ss->size) { + tbase = br; + tsize = asize; + } + } + + if (tbase == CMFAIL) { /* Cope with partial failure */ + if (br != CMFAIL) { /* Try to use/extend the space we did get */ + if (asize < HALF_MAX_SIZE_T && + asize < nb + TOP_FOOT_SIZE + SIZE_T_ONE) { + size_t esize = granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE - asize); + if (esize < HALF_MAX_SIZE_T) { + char* end = (char*)CALL_MORECORE(esize); + if (end != CMFAIL) + asize += esize; + else { /* Can't use; try to release */ + CALL_MORECORE(-asize); + br = CMFAIL; + } + } + } + } + if (br != CMFAIL) { /* Use the space we did get */ + tbase = br; + tsize = asize; + } + else + disable_contiguous(m); /* Don't try contiguous path in the future */ + } + + RELEASE_MORECORE_LOCK(); + } + + if (HAVE_MMAP && tbase == CMFAIL) { /* Try MMAP */ + size_t req = nb + TOP_FOOT_SIZE + SIZE_T_ONE; + size_t rsize = granularity_align(req); + if (rsize > nb) { /* Fail if wraps around zero */ + char* mp = (char*)(CALL_MMAP(rsize)); + if (mp != CMFAIL) { + tbase = mp; + tsize = rsize; + mmap_flag = IS_MMAPPED_BIT; + } + } + } + + if (HAVE_MORECORE && tbase == CMFAIL) { /* Try noncontiguous MORECORE */ + size_t asize = granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE); + if (asize < HALF_MAX_SIZE_T) { + char* br = CMFAIL; + char* end = CMFAIL; + ACQUIRE_MORECORE_LOCK(); + br = (char*)(CALL_MORECORE(asize)); + end = (char*)(CALL_MORECORE(0)); + RELEASE_MORECORE_LOCK(); + if (br != CMFAIL && end != CMFAIL && br < end) { + size_t ssize = end - br; + if (ssize > nb + TOP_FOOT_SIZE) { + tbase = br; + tsize = ssize; + } + } + } + } + + if (tbase != CMFAIL) { + + if ((m->footprint += tsize) > m->max_footprint) + m->max_footprint = m->footprint; + + if (!is_initialized(m)) { /* first-time initialization */ + m->seg.base = m->least_addr = tbase; + m->seg.size = tsize; + m->seg.sflags = mmap_flag; + m->magic = mparams.magic; + init_bins(m); + if (is_global(m)) + init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE); + else { + /* Offset top by embedded malloc_state */ + mchunkptr mn = next_chunk(mem2chunk(m)); + init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) -TOP_FOOT_SIZE); + } + } + + else { + /* Try to merge with an existing segment */ + msegmentptr sp = &m->seg; + while (sp != 0 && tbase != sp->base + sp->size) + sp = sp->next; + if (sp != 0 && + !is_extern_segment(sp) && + (sp->sflags & IS_MMAPPED_BIT) == mmap_flag && + segment_holds(sp, m->top)) { /* append */ + sp->size += tsize; + init_top(m, m->top, m->topsize + tsize); + } + else { + if (tbase < m->least_addr) + m->least_addr = tbase; + sp = &m->seg; + while (sp != 0 && sp->base != tbase + tsize) + sp = sp->next; + if (sp != 0 && + !is_extern_segment(sp) && + (sp->sflags & IS_MMAPPED_BIT) == mmap_flag) { + char* oldbase = sp->base; + sp->base = tbase; + sp->size += tsize; + return prepend_alloc(m, tbase, oldbase, nb); + } + else + add_segment(m, tbase, tsize, mmap_flag); + } + } + + if (nb < m->topsize) { /* Allocate from new or extended top space */ + size_t rsize = m->topsize -= nb; + mchunkptr p = m->top; + mchunkptr r = m->top = chunk_plus_offset(p, nb); + r->head = rsize | PINUSE_BIT; + set_size_and_pinuse_of_inuse_chunk(m, p, nb); + check_top_chunk(m, m->top); + check_malloced_chunk(m, chunk2mem(p), nb); + return chunk2mem(p); + } + } + + MALLOC_FAILURE_ACTION; + return 0; +} + +/* ----------------------- system deallocation -------------------------- */ + +/* Unmap and unlink any mmapped segments that don't contain used chunks */ +static size_t release_unused_segments(mstate m) { + size_t released = 0; + msegmentptr pred = &m->seg; + msegmentptr sp = pred->next; + while (sp != 0) { + char* base = sp->base; + size_t size = sp->size; + msegmentptr next = sp->next; + if (is_mmapped_segment(sp) && !is_extern_segment(sp)) { + mchunkptr p = align_as_chunk(base); + size_t psize = chunksize(p); + /* Can unmap if first chunk holds entire segment and not pinned */ + if (!cinuse(p) && (char*)p + psize >= base + size - TOP_FOOT_SIZE) { + tchunkptr tp = (tchunkptr)p; + assert(segment_holds(sp, (char*)sp)); + if (p == m->dv) { + m->dv = 0; + m->dvsize = 0; + } + else { + unlink_large_chunk(m, tp); + } + if (CALL_MUNMAP(base, size) == 0) { + released += size; + m->footprint -= size; + /* unlink obsoleted record */ + sp = pred; + sp->next = next; + } + else { /* back out if cannot unmap */ + insert_large_chunk(m, tp, psize); + } + } + } + pred = sp; + sp = next; + } + return released; +} + +static int sys_trim(mstate m, size_t pad) { + size_t released = 0; + if (pad < MAX_REQUEST && is_initialized(m)) { + pad += TOP_FOOT_SIZE; /* ensure enough room for segment overhead */ + + if (m->topsize > pad) { + /* Shrink top space in granularity-size units, keeping at least one */ + size_t unit = mparams.granularity; + size_t extra = ((m->topsize - pad + (unit - SIZE_T_ONE)) / unit - + SIZE_T_ONE) * unit; + msegmentptr sp = segment_holding(m, (char*)m->top); + + if (!is_extern_segment(sp)) { + if (is_mmapped_segment(sp)) { + if (HAVE_MMAP && + sp->size >= extra && + !has_segment_link(m, sp)) { /* can't shrink if pinned */ + /* Prefer mremap, fall back to munmap */ + if ((CALL_MREMAP(sp->base, sp->size, sp->size - extra, 0) != MFAIL) || + (CALL_MUNMAP(sp->base + sp->size - extra, extra) == 0)) { + released = extra; + } + } + } + else if (HAVE_MORECORE) { + if (extra >= HALF_MAX_SIZE_T) /* Avoid wrapping negative */ + extra = (HALF_MAX_SIZE_T) + SIZE_T_ONE - unit; + ACQUIRE_MORECORE_LOCK(); + { + /* Make sure end of memory is where we last set it. */ + char* old_br = (char*)(CALL_MORECORE(0)); + if (old_br == sp->base + sp->size) { + char* rel_br = (char*)(CALL_MORECORE(-extra)); + char* new_br = (char*)(CALL_MORECORE(0)); + if (rel_br != CMFAIL && new_br < old_br) + released = old_br - new_br; + } + } + RELEASE_MORECORE_LOCK(); + } + } + + if (released != 0) { + sp->size -= released; + m->footprint -= released; + init_top(m, m->top, m->topsize - released); + check_top_chunk(m, m->top); + } + } + + /* Unmap any unused mmapped segments */ + if (HAVE_MMAP) + released += release_unused_segments(m); + + /* On failure, disable autotrim to avoid repeated failed future calls */ + if (released == 0) + m->trim_check = MAX_SIZE_T; + } + + return (released != 0)? 1 : 0; +} + +/* ---------------------------- malloc support --------------------------- */ + +/* allocate a large request from the best fitting chunk in a treebin */ +static void* tmalloc_large(mstate m, size_t nb) { + tchunkptr v = 0; + size_t rsize = -nb; /* Unsigned negation */ + tchunkptr t; + bindex_t idx; + compute_tree_index(nb, idx); + + if ((t = *treebin_at(m, idx)) != 0) { + /* Traverse tree for this bin looking for node with size == nb */ + size_t sizebits = nb << leftshift_for_tree_index(idx); + tchunkptr rst = 0; /* The deepest untaken right subtree */ + for (;;) { + tchunkptr rt; + size_t trem = chunksize(t) - nb; + if (trem < rsize) { + v = t; + if ((rsize = trem) == 0) + break; + } + rt = t->child[1]; + t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]; + if (rt != 0 && rt != t) + rst = rt; + if (t == 0) { + t = rst; /* set t to least subtree holding sizes > nb */ + break; + } + sizebits <<= 1; + } + } + + if (t == 0 && v == 0) { /* set t to root of next non-empty treebin */ + binmap_t leftbits = left_bits(idx2bit(idx)) & m->treemap; + if (leftbits != 0) { + bindex_t i; + binmap_t leastbit = least_bit(leftbits); + compute_bit2idx(leastbit, i); + t = *treebin_at(m, i); + } + } + + while (t != 0) { /* find smallest of tree or subtree */ + size_t trem = chunksize(t) - nb; + if (trem < rsize) { + rsize = trem; + v = t; + } + t = leftmost_child(t); + } + + /* If dv is a better fit, return 0 so malloc will use it */ + if (v != 0 && rsize < (size_t)(m->dvsize - nb)) { + if (RTCHECK(ok_address(m, v))) { /* split */ + mchunkptr r = chunk_plus_offset(v, nb); + assert(chunksize(v) == rsize + nb); + if (RTCHECK(ok_next(v, r))) { + unlink_large_chunk(m, v); + if (rsize < MIN_CHUNK_SIZE) + set_inuse_and_pinuse(m, v, (rsize + nb)); + else { + set_size_and_pinuse_of_inuse_chunk(m, v, nb); + set_size_and_pinuse_of_free_chunk(r, rsize); + insert_chunk(m, r, rsize); + } + return chunk2mem(v); + } + } + CORRUPTION_ERROR_ACTION(m); + } + return 0; +} + +/* allocate a small request from the best fitting chunk in a treebin */ +static void* tmalloc_small(mstate m, size_t nb) { + tchunkptr t, v; + size_t rsize; + bindex_t i; + binmap_t leastbit = least_bit(m->treemap); + compute_bit2idx(leastbit, i); + + v = t = *treebin_at(m, i); + rsize = chunksize(t) - nb; + + while ((t = leftmost_child(t)) != 0) { + size_t trem = chunksize(t) - nb; + if (trem < rsize) { + rsize = trem; + v = t; + } + } + + if (RTCHECK(ok_address(m, v))) { + mchunkptr r = chunk_plus_offset(v, nb); + assert(chunksize(v) == rsize + nb); + if (RTCHECK(ok_next(v, r))) { + unlink_large_chunk(m, v); + if (rsize < MIN_CHUNK_SIZE) + set_inuse_and_pinuse(m, v, (rsize + nb)); + else { + set_size_and_pinuse_of_inuse_chunk(m, v, nb); + set_size_and_pinuse_of_free_chunk(r, rsize); + replace_dv(m, r, rsize); + } + return chunk2mem(v); + } + } + + CORRUPTION_ERROR_ACTION(m); + return 0; +} + +/* --------------------------- realloc support --------------------------- */ + +static void* internal_realloc(mstate m, void* oldmem, size_t bytes) { + if (bytes >= MAX_REQUEST) { + MALLOC_FAILURE_ACTION; + return 0; + } + if (!PREACTION(m)) { + mchunkptr oldp = mem2chunk(oldmem); + size_t oldsize = chunksize(oldp); + mchunkptr next = chunk_plus_offset(oldp, oldsize); + mchunkptr newp = 0; + void* extra = 0; + + /* Try to either shrink or extend into top. Else malloc-copy-free */ + + if (RTCHECK(ok_address(m, oldp) && ok_cinuse(oldp) && + ok_next(oldp, next) && ok_pinuse(next))) { + size_t nb = request2size(bytes); + if (is_mmapped(oldp)) + newp = mmap_resize(m, oldp, nb); + else if (oldsize >= nb) { /* already big enough */ + size_t rsize = oldsize - nb; + newp = oldp; + if (rsize >= MIN_CHUNK_SIZE) { + mchunkptr remainder = chunk_plus_offset(newp, nb); + set_inuse(m, newp, nb); + set_inuse(m, remainder, rsize); + extra = chunk2mem(remainder); + } + } + else if (next == m->top && oldsize + m->topsize > nb) { + /* Expand into top */ + size_t newsize = oldsize + m->topsize; + size_t newtopsize = newsize - nb; + mchunkptr newtop = chunk_plus_offset(oldp, nb); + set_inuse(m, oldp, nb); + newtop->head = newtopsize |PINUSE_BIT; + m->top = newtop; + m->topsize = newtopsize; + newp = oldp; + } + } + else { + USAGE_ERROR_ACTION(m, oldmem); + POSTACTION(m); + return 0; + } + + POSTACTION(m); + + if (newp != 0) { + if (extra != 0) { + internal_free(m, extra); + } + check_inuse_chunk(m, newp); + return chunk2mem(newp); + } + else { + void* newmem = internal_malloc(m, bytes); + if (newmem != 0) { + size_t oc = oldsize - overhead_for(oldp); + memcpy(newmem, oldmem, (oc < bytes)? oc : bytes); + internal_free(m, oldmem); + } + return newmem; + } + } + return 0; +} + +/* --------------------------- memalign support -------------------------- */ + +static void* internal_memalign(mstate m, size_t alignment, size_t bytes) { + if (alignment <= MALLOC_ALIGNMENT) /* Can just use malloc */ + return internal_malloc(m, bytes); + if (alignment < MIN_CHUNK_SIZE) /* must be at least a minimum chunk size */ + alignment = MIN_CHUNK_SIZE; + if ((alignment & (alignment-SIZE_T_ONE)) != 0) {/* Ensure a power of 2 */ + size_t a = MALLOC_ALIGNMENT << 1; + while (a < alignment) a <<= 1; + alignment = a; + } + + if (bytes >= MAX_REQUEST - alignment) { + if (m != 0) { /* Test isn't needed but avoids compiler warning */ + MALLOC_FAILURE_ACTION; + } + } + else { + size_t nb = request2size(bytes); + size_t req = nb + alignment + MIN_CHUNK_SIZE - CHUNK_OVERHEAD; + char* mem = (char*)internal_malloc(m, req); + if (mem != 0) { + void* leader = 0; + void* trailer = 0; + mchunkptr p = mem2chunk(mem); + + if (PREACTION(m)) return 0; + if ((((size_t)(mem)) % alignment) != 0) { /* misaligned */ + /* + Find an aligned spot inside chunk. Since we need to give + back leading space in a chunk of at least MIN_CHUNK_SIZE, if + the first calculation places us at a spot with less than + MIN_CHUNK_SIZE leader, we can move to the next aligned spot. + We've allocated enough total room so that this is always + possible. + */ + char* br = (char*)mem2chunk((size_t)(((size_t)(mem + + alignment - + SIZE_T_ONE)) & + -alignment)); + char* pos = ((size_t)(br - (char*)(p)) >= MIN_CHUNK_SIZE)? + br : br+alignment; + mchunkptr newp = (mchunkptr)pos; + size_t leadsize = pos - (char*)(p); + size_t newsize = chunksize(p) - leadsize; + + if (is_mmapped(p)) { /* For mmapped chunks, just adjust offset */ + newp->prev_foot = p->prev_foot + leadsize; + newp->head = (newsize|CINUSE_BIT); + } + else { /* Otherwise, give back leader, use the rest */ + set_inuse(m, newp, newsize); + set_inuse(m, p, leadsize); + leader = chunk2mem(p); + } + p = newp; + } + + /* Give back spare room at the end */ + if (!is_mmapped(p)) { + size_t size = chunksize(p); + if (size > nb + MIN_CHUNK_SIZE) { + size_t remainder_size = size - nb; + mchunkptr remainder = chunk_plus_offset(p, nb); + set_inuse(m, p, nb); + set_inuse(m, remainder, remainder_size); + trailer = chunk2mem(remainder); + } + } + + assert (chunksize(p) >= nb); + assert((((size_t)(chunk2mem(p))) % alignment) == 0); + check_inuse_chunk(m, p); + POSTACTION(m); + if (leader != 0) { + internal_free(m, leader); + } + if (trailer != 0) { + internal_free(m, trailer); + } + return chunk2mem(p); + } + } + return 0; +} + +/* ------------------------ comalloc/coalloc support --------------------- */ + +static void** ialloc(mstate m, + size_t n_elements, + size_t* sizes, + int opts, + void* chunks[]) { + /* + This provides common support for independent_X routines, handling + all of the combinations that can result. + + The opts arg has: + bit 0 set if all elements are same size (using sizes[0]) + bit 1 set if elements should be zeroed + */ + + size_t element_size; /* chunksize of each element, if all same */ + size_t contents_size; /* total size of elements */ + size_t array_size; /* request size of pointer array */ + void* mem; /* malloced aggregate space */ + mchunkptr p; /* corresponding chunk */ + size_t remainder_size; /* remaining bytes while splitting */ + void** marray; /* either "chunks" or malloced ptr array */ + mchunkptr array_chunk; /* chunk for malloced ptr array */ + flag_t was_enabled; /* to disable mmap */ + size_t size; + size_t i; + + /* compute array length, if needed */ + if (chunks != 0) { + if (n_elements == 0) + return chunks; /* nothing to do */ + marray = chunks; + array_size = 0; + } + else { + /* if empty req, must still return chunk representing empty array */ + if (n_elements == 0) + return (void**)internal_malloc(m, 0); + marray = 0; + array_size = request2size(n_elements * (sizeof(void*))); + } + + /* compute total element size */ + if (opts & 0x1) { /* all-same-size */ + element_size = request2size(*sizes); + contents_size = n_elements * element_size; + } + else { /* add up all the sizes */ + element_size = 0; + contents_size = 0; + for (i = 0; i != n_elements; ++i) + contents_size += request2size(sizes[i]); + } + + size = contents_size + array_size; + + /* + Allocate the aggregate chunk. First disable direct-mmapping so + malloc won't use it, since we would not be able to later + free/realloc space internal to a segregated mmap region. + */ + was_enabled = use_mmap(m); + disable_mmap(m); + mem = internal_malloc(m, size - CHUNK_OVERHEAD); + if (was_enabled) + enable_mmap(m); + if (mem == 0) + return 0; + + if (PREACTION(m)) return 0; + p = mem2chunk(mem); + remainder_size = chunksize(p); + + assert(!is_mmapped(p)); + + if (opts & 0x2) { /* optionally clear the elements */ + memset((size_t*)mem, 0, remainder_size - SIZE_T_SIZE - array_size); + } + + /* If not provided, allocate the pointer array as final part of chunk */ + if (marray == 0) { + size_t array_chunk_size; + array_chunk = chunk_plus_offset(p, contents_size); + array_chunk_size = remainder_size - contents_size; + marray = (void**) (chunk2mem(array_chunk)); + set_size_and_pinuse_of_inuse_chunk(m, array_chunk, array_chunk_size); + remainder_size = contents_size; + } + + /* split out elements */ + for (i = 0; ; ++i) { + marray[i] = chunk2mem(p); + if (i != n_elements-1) { + if (element_size != 0) + size = element_size; + else + size = request2size(sizes[i]); + remainder_size -= size; + set_size_and_pinuse_of_inuse_chunk(m, p, size); + p = chunk_plus_offset(p, size); + } + else { /* the final element absorbs any overallocation slop */ + set_size_and_pinuse_of_inuse_chunk(m, p, remainder_size); + break; + } + } + +#if DEBUG + if (marray != chunks) { + /* final element must have exactly exhausted chunk */ + if (element_size != 0) { + assert(remainder_size == element_size); + } + else { + assert(remainder_size == request2size(sizes[i])); + } + check_inuse_chunk(m, mem2chunk(marray)); + } + for (i = 0; i != n_elements; ++i) + check_inuse_chunk(m, mem2chunk(marray[i])); + +#endif /* DEBUG */ + + POSTACTION(m); + return marray; +} + + +/* -------------------------- public routines ---------------------------- */ + +#if !ONLY_MSPACES + +void* dlmalloc(size_t bytes) { + /* + Basic algorithm: + If a small request (< 256 bytes minus per-chunk overhead): + 1. If one exists, use a remainderless chunk in associated smallbin. + (Remainderless means that there are too few excess bytes to + represent as a chunk.) + 2. If it is big enough, use the dv chunk, which is normally the + chunk adjacent to the one used for the most recent small request. + 3. If one exists, split the smallest available chunk in a bin, + saving remainder in dv. + 4. If it is big enough, use the top chunk. + 5. If available, get memory from system and use it + Otherwise, for a large request: + 1. Find the smallest available binned chunk that fits, and use it + if it is better fitting than dv chunk, splitting if necessary. + 2. If better fitting than any binned chunk, use the dv chunk. + 3. If it is big enough, use the top chunk. + 4. If request size >= mmap threshold, try to directly mmap this chunk. + 5. If available, get memory from system and use it + + The ugly goto's here ensure that postaction occurs along all paths. + */ + + if (!PREACTION(gm)) { + void* mem; + size_t nb; + if (bytes <= MAX_SMALL_REQUEST) { + bindex_t idx; + binmap_t smallbits; + nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes); + idx = small_index(nb); + smallbits = gm->smallmap >> idx; + + if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */ + mchunkptr b, p; + idx += ~smallbits & 1; /* Uses next bin if idx empty */ + b = smallbin_at(gm, idx); + p = b->fd; + assert(chunksize(p) == small_index2size(idx)); + unlink_first_small_chunk(gm, b, p, idx); + set_inuse_and_pinuse(gm, p, small_index2size(idx)); + mem = chunk2mem(p); + check_malloced_chunk(gm, mem, nb); + goto postaction; + } + + else if (nb > gm->dvsize) { + if (smallbits != 0) { /* Use chunk in next nonempty smallbin */ + mchunkptr b, p, r; + size_t rsize; + bindex_t i; + binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx)); + binmap_t leastbit = least_bit(leftbits); + compute_bit2idx(leastbit, i); + b = smallbin_at(gm, i); + p = b->fd; + assert(chunksize(p) == small_index2size(i)); + unlink_first_small_chunk(gm, b, p, i); + rsize = small_index2size(i) - nb; + /* Fit here cannot be remainderless if 4byte sizes */ + if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE) + set_inuse_and_pinuse(gm, p, small_index2size(i)); + else { + set_size_and_pinuse_of_inuse_chunk(gm, p, nb); + r = chunk_plus_offset(p, nb); + set_size_and_pinuse_of_free_chunk(r, rsize); + replace_dv(gm, r, rsize); + } + mem = chunk2mem(p); + check_malloced_chunk(gm, mem, nb); + goto postaction; + } + + else if (gm->treemap != 0 && (mem = tmalloc_small(gm, nb)) != 0) { + check_malloced_chunk(gm, mem, nb); + goto postaction; + } + } + } + else if (bytes >= MAX_REQUEST) + nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */ + else { + nb = pad_request(bytes); + if (gm->treemap != 0 && (mem = tmalloc_large(gm, nb)) != 0) { + check_malloced_chunk(gm, mem, nb); + goto postaction; + } + } + + if (nb <= gm->dvsize) { + size_t rsize = gm->dvsize - nb; + mchunkptr p = gm->dv; + if (rsize >= MIN_CHUNK_SIZE) { /* split dv */ + mchunkptr r = gm->dv = chunk_plus_offset(p, nb); + gm->dvsize = rsize; + set_size_and_pinuse_of_free_chunk(r, rsize); + set_size_and_pinuse_of_inuse_chunk(gm, p, nb); + } + else { /* exhaust dv */ + size_t dvs = gm->dvsize; + gm->dvsize = 0; + gm->dv = 0; + set_inuse_and_pinuse(gm, p, dvs); + } + mem = chunk2mem(p); + check_malloced_chunk(gm, mem, nb); + goto postaction; + } + + else if (nb < gm->topsize) { /* Split top */ + size_t rsize = gm->topsize -= nb; + mchunkptr p = gm->top; + mchunkptr r = gm->top = chunk_plus_offset(p, nb); + r->head = rsize | PINUSE_BIT; + set_size_and_pinuse_of_inuse_chunk(gm, p, nb); + mem = chunk2mem(p); + check_top_chunk(gm, gm->top); + check_malloced_chunk(gm, mem, nb); + goto postaction; + } + + mem = sys_alloc(gm, nb); + + postaction: + POSTACTION(gm); + return mem; + } + + return 0; +} + +void dlfree(void* mem) { + /* + Consolidate freed chunks with preceeding or succeeding bordering + free chunks, if they exist, and then place in a bin. Intermixed + with special cases for top, dv, mmapped chunks, and usage errors. + */ + + if (mem != 0) { + mchunkptr p = mem2chunk(mem); +#if FOOTERS + mstate fm = get_mstate_for(p); + if (!ok_magic(fm)) { + USAGE_ERROR_ACTION(fm, p); + return; + } +#else /* FOOTERS */ +#define fm gm +#endif /* FOOTERS */ + if (!PREACTION(fm)) { + check_inuse_chunk(fm, p); + if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) { + size_t psize = chunksize(p); + mchunkptr next = chunk_plus_offset(p, psize); + if (!pinuse(p)) { + size_t prevsize = p->prev_foot; + if ((prevsize & IS_MMAPPED_BIT) != 0) { + prevsize &= ~IS_MMAPPED_BIT; + psize += prevsize + MMAP_FOOT_PAD; + if (CALL_MUNMAP((char*)p - prevsize, psize) == 0) + fm->footprint -= psize; + goto postaction; + } + else { + mchunkptr prev = chunk_minus_offset(p, prevsize); + psize += prevsize; + p = prev; + if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */ + if (p != fm->dv) { + unlink_chunk(fm, p, prevsize); + } + else if ((next->head & INUSE_BITS) == INUSE_BITS) { + fm->dvsize = psize; + set_free_with_pinuse(p, psize, next); + goto postaction; + } + } + else + goto erroraction; + } + } + + if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) { + if (!cinuse(next)) { /* consolidate forward */ + if (next == fm->top) { + size_t tsize = fm->topsize += psize; + fm->top = p; + p->head = tsize | PINUSE_BIT; + if (p == fm->dv) { + fm->dv = 0; + fm->dvsize = 0; + } + if (should_trim(fm, tsize)) + sys_trim(fm, 0); + goto postaction; + } + else if (next == fm->dv) { + size_t dsize = fm->dvsize += psize; + fm->dv = p; + set_size_and_pinuse_of_free_chunk(p, dsize); + goto postaction; + } + else { + size_t nsize = chunksize(next); + psize += nsize; + unlink_chunk(fm, next, nsize); + set_size_and_pinuse_of_free_chunk(p, psize); + if (p == fm->dv) { + fm->dvsize = psize; + goto postaction; + } + } + } + else + set_free_with_pinuse(p, psize, next); + insert_chunk(fm, p, psize); + check_free_chunk(fm, p); + goto postaction; + } + } + erroraction: + USAGE_ERROR_ACTION(fm, p); + postaction: + POSTACTION(fm); + } + } +#if !FOOTERS +#undef fm +#endif /* FOOTERS */ +} + +void* dlcalloc(size_t n_elements, size_t elem_size) { + void* mem; + size_t req = 0; + if (n_elements != 0) { + req = n_elements * elem_size; + if (((n_elements | elem_size) & ~(size_t)0xffff) && + (req / n_elements != elem_size)) + req = MAX_SIZE_T; /* force downstream failure on overflow */ + } + mem = dlmalloc(req); + if (mem != 0 && calloc_must_clear(mem2chunk(mem))) + memset(mem, 0, req); + return mem; +} + +void* dlrealloc(void* oldmem, size_t bytes) { + if (oldmem == 0) + return dlmalloc(bytes); +#ifdef REALLOC_ZERO_BYTES_FREES + if (bytes == 0) { + dlfree(oldmem); + return 0; + } +#endif /* REALLOC_ZERO_BYTES_FREES */ + else { +#if ! FOOTERS + mstate m = gm; +#else /* FOOTERS */ + mstate m = get_mstate_for(mem2chunk(oldmem)); + if (!ok_magic(m)) { + USAGE_ERROR_ACTION(m, oldmem); + return 0; + } +#endif /* FOOTERS */ + return internal_realloc(m, oldmem, bytes); + } +} + +void* dlmemalign(size_t alignment, size_t bytes) { + return internal_memalign(gm, alignment, bytes); +} + +void** dlindependent_calloc(size_t n_elements, size_t elem_size, + void* chunks[]) { + size_t sz = elem_size; /* serves as 1-element array */ + return ialloc(gm, n_elements, &sz, 3, chunks); +} + +void** dlindependent_comalloc(size_t n_elements, size_t sizes[], + void* chunks[]) { + return ialloc(gm, n_elements, sizes, 0, chunks); +} + +void* dlvalloc(size_t bytes) { + size_t pagesz; + init_mparams(); + pagesz = mparams.page_size; + return dlmemalign(pagesz, bytes); +} + +void* dlpvalloc(size_t bytes) { + size_t pagesz; + init_mparams(); + pagesz = mparams.page_size; + return dlmemalign(pagesz, (bytes + pagesz - SIZE_T_ONE) & ~(pagesz - SIZE_T_ONE)); +} + +int dlmalloc_trim(size_t pad) { + int result = 0; + if (!PREACTION(gm)) { + result = sys_trim(gm, pad); + POSTACTION(gm); + } + return result; +} + +size_t dlmalloc_footprint(void) { + return gm->footprint; +} + +size_t dlmalloc_max_footprint(void) { + return gm->max_footprint; +} + +#if !NO_MALLINFO +struct mallinfo dlmallinfo(void) { + return internal_mallinfo(gm); +} +#endif /* NO_MALLINFO */ + +void dlmalloc_stats() { + internal_malloc_stats(gm); +} + +size_t dlmalloc_usable_size(void* mem) { + if (mem != 0) { + mchunkptr p = mem2chunk(mem); + if (cinuse(p)) + return chunksize(p) - overhead_for(p); + } + return 0; +} + +int dlmallopt(int param_number, int value) { + return change_mparam(param_number, value); +} + +#endif /* !ONLY_MSPACES */ + +/* ----------------------------- user mspaces ---------------------------- */ + +#if MSPACES + +static mstate init_user_mstate(char* tbase, size_t tsize) { + size_t msize = pad_request(sizeof(struct malloc_state)); + mchunkptr mn; + mchunkptr msp = align_as_chunk(tbase); + mstate m = (mstate)(chunk2mem(msp)); + memset(m, 0, msize); + INITIAL_LOCK(&m->mutex); + msp->head = (msize|PINUSE_BIT|CINUSE_BIT); + m->seg.base = m->least_addr = tbase; + m->seg.size = m->footprint = m->max_footprint = tsize; + m->magic = mparams.magic; + m->mflags = mparams.default_mflags; + disable_contiguous(m); + init_bins(m); + mn = next_chunk(mem2chunk(m)); + init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) - TOP_FOOT_SIZE); + check_top_chunk(m, m->top); + return m; +} + +mspace create_mspace(size_t capacity, int locked) { + mstate m = 0; + size_t msize = pad_request(sizeof(struct malloc_state)); + init_mparams(); /* Ensure pagesize etc initialized */ + + if (capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) { + size_t rs = ((capacity == 0)? mparams.granularity : + (capacity + TOP_FOOT_SIZE + msize)); + size_t tsize = granularity_align(rs); + char* tbase = (char*)(CALL_MMAP(tsize)); + if (tbase != CMFAIL) { + m = init_user_mstate(tbase, tsize); + m->seg.sflags = IS_MMAPPED_BIT; + set_lock(m, locked); + } + } + return (mspace)m; +} + +mspace create_mspace_with_base(void* base, size_t capacity, int locked) { + mstate m = 0; + size_t msize = pad_request(sizeof(struct malloc_state)); + init_mparams(); /* Ensure pagesize etc initialized */ + + if (capacity > msize + TOP_FOOT_SIZE && + capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) { + m = init_user_mstate((char*)base, capacity); + m->seg.sflags = EXTERN_BIT; + set_lock(m, locked); + } + return (mspace)m; +} + +size_t destroy_mspace(mspace msp) { + size_t freed = 0; + mstate ms = (mstate)msp; + if (ok_magic(ms)) { + msegmentptr sp = &ms->seg; + while (sp != 0) { + char* base = sp->base; + size_t size = sp->size; + flag_t flag = sp->sflags; + sp = sp->next; + if ((flag & IS_MMAPPED_BIT) && !(flag & EXTERN_BIT) && + CALL_MUNMAP(base, size) == 0) + freed += size; + } + } + else { + USAGE_ERROR_ACTION(ms,ms); + } + return freed; +} + +/* + mspace versions of routines are near-clones of the global + versions. This is not so nice but better than the alternatives. +*/ + + +void* mspace_malloc(mspace msp, size_t bytes) { + mstate ms = (mstate)msp; + if (!ok_magic(ms)) { + USAGE_ERROR_ACTION(ms,ms); + return 0; + } + if (!PREACTION(ms)) { + void* mem; + size_t nb; + if (bytes <= MAX_SMALL_REQUEST) { + bindex_t idx; + binmap_t smallbits; + nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes); + idx = small_index(nb); + smallbits = ms->smallmap >> idx; + + if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */ + mchunkptr b, p; + idx += ~smallbits & 1; /* Uses next bin if idx empty */ + b = smallbin_at(ms, idx); + p = b->fd; + assert(chunksize(p) == small_index2size(idx)); + unlink_first_small_chunk(ms, b, p, idx); + set_inuse_and_pinuse(ms, p, small_index2size(idx)); + mem = chunk2mem(p); + check_malloced_chunk(ms, mem, nb); + goto postaction; + } + + else if (nb > ms->dvsize) { + if (smallbits != 0) { /* Use chunk in next nonempty smallbin */ + mchunkptr b, p, r; + size_t rsize; + bindex_t i; + binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx)); + binmap_t leastbit = least_bit(leftbits); + compute_bit2idx(leastbit, i); + b = smallbin_at(ms, i); + p = b->fd; + assert(chunksize(p) == small_index2size(i)); + unlink_first_small_chunk(ms, b, p, i); + rsize = small_index2size(i) - nb; + /* Fit here cannot be remainderless if 4byte sizes */ + if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE) + set_inuse_and_pinuse(ms, p, small_index2size(i)); + else { + set_size_and_pinuse_of_inuse_chunk(ms, p, nb); + r = chunk_plus_offset(p, nb); + set_size_and_pinuse_of_free_chunk(r, rsize); + replace_dv(ms, r, rsize); + } + mem = chunk2mem(p); + check_malloced_chunk(ms, mem, nb); + goto postaction; + } + + else if (ms->treemap != 0 && (mem = tmalloc_small(ms, nb)) != 0) { + check_malloced_chunk(ms, mem, nb); + goto postaction; + } + } + } + else if (bytes >= MAX_REQUEST) + nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */ + else { + nb = pad_request(bytes); + if (ms->treemap != 0 && (mem = tmalloc_large(ms, nb)) != 0) { + check_malloced_chunk(ms, mem, nb); + goto postaction; + } + } + + if (nb <= ms->dvsize) { + size_t rsize = ms->dvsize - nb; + mchunkptr p = ms->dv; + if (rsize >= MIN_CHUNK_SIZE) { /* split dv */ + mchunkptr r = ms->dv = chunk_plus_offset(p, nb); + ms->dvsize = rsize; + set_size_and_pinuse_of_free_chunk(r, rsize); + set_size_and_pinuse_of_inuse_chunk(ms, p, nb); + } + else { /* exhaust dv */ + size_t dvs = ms->dvsize; + ms->dvsize = 0; + ms->dv = 0; + set_inuse_and_pinuse(ms, p, dvs); + } + mem = chunk2mem(p); + check_malloced_chunk(ms, mem, nb); + goto postaction; + } + + else if (nb < ms->topsize) { /* Split top */ + size_t rsize = ms->topsize -= nb; + mchunkptr p = ms->top; + mchunkptr r = ms->top = chunk_plus_offset(p, nb); + r->head = rsize | PINUSE_BIT; + set_size_and_pinuse_of_inuse_chunk(ms, p, nb); + mem = chunk2mem(p); + check_top_chunk(ms, ms->top); + check_malloced_chunk(ms, mem, nb); + goto postaction; + } + + mem = sys_alloc(ms, nb); + + postaction: + POSTACTION(ms); + return mem; + } + + return 0; +} + +void mspace_free(mspace msp, void* mem) { + if (mem != 0) { + mchunkptr p = mem2chunk(mem); +#if FOOTERS + mstate fm = get_mstate_for(p); +#else /* FOOTERS */ + mstate fm = (mstate)msp; +#endif /* FOOTERS */ + if (!ok_magic(fm)) { + USAGE_ERROR_ACTION(fm, p); + return; + } + if (!PREACTION(fm)) { + check_inuse_chunk(fm, p); + if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) { + size_t psize = chunksize(p); + mchunkptr next = chunk_plus_offset(p, psize); + if (!pinuse(p)) { + size_t prevsize = p->prev_foot; + if ((prevsize & IS_MMAPPED_BIT) != 0) { + prevsize &= ~IS_MMAPPED_BIT; + psize += prevsize + MMAP_FOOT_PAD; + if (CALL_MUNMAP((char*)p - prevsize, psize) == 0) + fm->footprint -= psize; + goto postaction; + } + else { + mchunkptr prev = chunk_minus_offset(p, prevsize); + psize += prevsize; + p = prev; + if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */ + if (p != fm->dv) { + unlink_chunk(fm, p, prevsize); + } + else if ((next->head & INUSE_BITS) == INUSE_BITS) { + fm->dvsize = psize; + set_free_with_pinuse(p, psize, next); + goto postaction; + } + } + else + goto erroraction; + } + } + + if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) { + if (!cinuse(next)) { /* consolidate forward */ + if (next == fm->top) { + size_t tsize = fm->topsize += psize; + fm->top = p; + p->head = tsize | PINUSE_BIT; + if (p == fm->dv) { + fm->dv = 0; + fm->dvsize = 0; + } + if (should_trim(fm, tsize)) + sys_trim(fm, 0); + goto postaction; + } + else if (next == fm->dv) { + size_t dsize = fm->dvsize += psize; + fm->dv = p; + set_size_and_pinuse_of_free_chunk(p, dsize); + goto postaction; + } + else { + size_t nsize = chunksize(next); + psize += nsize; + unlink_chunk(fm, next, nsize); + set_size_and_pinuse_of_free_chunk(p, psize); + if (p == fm->dv) { + fm->dvsize = psize; + goto postaction; + } + } + } + else + set_free_with_pinuse(p, psize, next); + insert_chunk(fm, p, psize); + check_free_chunk(fm, p); + goto postaction; + } + } + erroraction: + USAGE_ERROR_ACTION(fm, p); + postaction: + POSTACTION(fm); + } + } +} + +void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size) { + void* mem; + size_t req = 0; + mstate ms = (mstate)msp; + if (!ok_magic(ms)) { + USAGE_ERROR_ACTION(ms,ms); + return 0; + } + if (n_elements != 0) { + req = n_elements * elem_size; + if (((n_elements | elem_size) & ~(size_t)0xffff) && + (req / n_elements != elem_size)) + req = MAX_SIZE_T; /* force downstream failure on overflow */ + } + mem = internal_malloc(ms, req); + if (mem != 0 && calloc_must_clear(mem2chunk(mem))) + memset(mem, 0, req); + return mem; +} + +void* mspace_realloc(mspace msp, void* oldmem, size_t bytes) { + if (oldmem == 0) + return mspace_malloc(msp, bytes); +#ifdef REALLOC_ZERO_BYTES_FREES + if (bytes == 0) { + mspace_free(msp, oldmem); + return 0; + } +#endif /* REALLOC_ZERO_BYTES_FREES */ + else { +#if FOOTERS + mchunkptr p = mem2chunk(oldmem); + mstate ms = get_mstate_for(p); +#else /* FOOTERS */ + mstate ms = (mstate)msp; +#endif /* FOOTERS */ + if (!ok_magic(ms)) { + USAGE_ERROR_ACTION(ms,ms); + return 0; + } + return internal_realloc(ms, oldmem, bytes); + } +} + +void* mspace_memalign(mspace msp, size_t alignment, size_t bytes) { + mstate ms = (mstate)msp; + if (!ok_magic(ms)) { + USAGE_ERROR_ACTION(ms,ms); + return 0; + } + return internal_memalign(ms, alignment, bytes); +} + +void** mspace_independent_calloc(mspace msp, size_t n_elements, + size_t elem_size, void* chunks[]) { + size_t sz = elem_size; /* serves as 1-element array */ + mstate ms = (mstate)msp; + if (!ok_magic(ms)) { + USAGE_ERROR_ACTION(ms,ms); + return 0; + } + return ialloc(ms, n_elements, &sz, 3, chunks); +} + +void** mspace_independent_comalloc(mspace msp, size_t n_elements, + size_t sizes[], void* chunks[]) { + mstate ms = (mstate)msp; + if (!ok_magic(ms)) { + USAGE_ERROR_ACTION(ms,ms); + return 0; + } + return ialloc(ms, n_elements, sizes, 0, chunks); +} + +int mspace_trim(mspace msp, size_t pad) { + int result = 0; + mstate ms = (mstate)msp; + if (ok_magic(ms)) { + if (!PREACTION(ms)) { + result = sys_trim(ms, pad); + POSTACTION(ms); + } + } + else { + USAGE_ERROR_ACTION(ms,ms); + } + return result; +} + +void mspace_malloc_stats(mspace msp) { + mstate ms = (mstate)msp; + if (ok_magic(ms)) { + internal_malloc_stats(ms); + } + else { + USAGE_ERROR_ACTION(ms,ms); + } +} + +size_t mspace_footprint(mspace msp) { + size_t result; + mstate ms = (mstate)msp; + if (ok_magic(ms)) { + result = ms->footprint; + } + USAGE_ERROR_ACTION(ms,ms); + return result; +} + + +size_t mspace_max_footprint(mspace msp) { + size_t result; + mstate ms = (mstate)msp; + if (ok_magic(ms)) { + result = ms->max_footprint; + } + USAGE_ERROR_ACTION(ms,ms); + return result; +} + + +#if !NO_MALLINFO +struct mallinfo mspace_mallinfo(mspace msp) { + mstate ms = (mstate)msp; + if (!ok_magic(ms)) { + USAGE_ERROR_ACTION(ms,ms); + } + return internal_mallinfo(ms); +} +#endif /* NO_MALLINFO */ + +int mspace_mallopt(int param_number, int value) { + return change_mparam(param_number, value); +} + +#endif /* MSPACES */ + +/* -------------------- Alternative MORECORE functions ------------------- */ + +/* + Guidelines for creating a custom version of MORECORE: + + * For best performance, MORECORE should allocate in multiples of pagesize. + * MORECORE may allocate more memory than requested. (Or even less, + but this will usually result in a malloc failure.) + * MORECORE must not allocate memory when given argument zero, but + instead return one past the end address of memory from previous + nonzero call. + * For best performance, consecutive calls to MORECORE with positive + arguments should return increasing addresses, indicating that + space has been contiguously extended. + * Even though consecutive calls to MORECORE need not return contiguous + addresses, it must be OK for malloc'ed chunks to span multiple + regions in those cases where they do happen to be contiguous. + * MORECORE need not handle negative arguments -- it may instead + just return MFAIL when given negative arguments. + Negative arguments are always multiples of pagesize. MORECORE + must not misinterpret negative args as large positive unsigned + args. You can suppress all such calls from even occurring by defining + MORECORE_CANNOT_TRIM, + + As an example alternative MORECORE, here is a custom allocator + kindly contributed for pre-OSX macOS. It uses virtually but not + necessarily physically contiguous non-paged memory (locked in, + present and won't get swapped out). You can use it by uncommenting + this section, adding some #includes, and setting up the appropriate + defines above: + + #define MORECORE osMoreCore + + There is also a shutdown routine that should somehow be called for + cleanup upon program exit. + + #define MAX_POOL_ENTRIES 100 + #define MINIMUM_MORECORE_SIZE (64 * 1024U) + static int next_os_pool; + void *our_os_pools[MAX_POOL_ENTRIES]; + + void *osMoreCore(int size) + { + void *ptr = 0; + static void *sbrk_top = 0; + + if (size > 0) + { + if (size < MINIMUM_MORECORE_SIZE) + size = MINIMUM_MORECORE_SIZE; + if (CurrentExecutionLevel() == kTaskLevel) + ptr = PoolAllocateResident(size + RM_PAGE_SIZE, 0); + if (ptr == 0) + { + return (void *) MFAIL; + } + // save ptrs so they can be freed during cleanup + our_os_pools[next_os_pool] = ptr; + next_os_pool++; + ptr = (void *) ((((size_t) ptr) + RM_PAGE_MASK) & ~RM_PAGE_MASK); + sbrk_top = (char *) ptr + size; + return ptr; + } + else if (size < 0) + { + // we don't currently support shrink behavior + return (void *) MFAIL; + } + else + { + return sbrk_top; + } + } + + // cleanup any allocated memory pools + // called as last thing before shutting down driver + + void osCleanupMem(void) + { + void **ptr; + + for (ptr = our_os_pools; ptr < &our_os_pools[MAX_POOL_ENTRIES]; ptr++) + if (*ptr) + { + PoolDeallocate(*ptr); + *ptr = 0; + } + } + +*/ + + +/* ----------------------------------------------------------------------- +History: + V2.8.3 Thu Sep 22 11:16:32 2005 Doug Lea (dl at gee) + * Add max_footprint functions + * Ensure all appropriate literals are size_t + * Fix conditional compilation problem for some #define settings + * Avoid concatenating segments with the one provided + in create_mspace_with_base + * Rename some variables to avoid compiler shadowing warnings + * Use explicit lock initialization. + * Better handling of sbrk interference. + * Simplify and fix segment insertion, trimming and mspace_destroy + * Reinstate REALLOC_ZERO_BYTES_FREES option from 2.7.x + * Thanks especially to Dennis Flanagan for help on these. + + V2.8.2 Sun Jun 12 16:01:10 2005 Doug Lea (dl at gee) + * Fix memalign brace error. + + V2.8.1 Wed Jun 8 16:11:46 2005 Doug Lea (dl at gee) + * Fix improper #endif nesting in C++ + * Add explicit casts needed for C++ + + V2.8.0 Mon May 30 14:09:02 2005 Doug Lea (dl at gee) + * Use trees for large bins + * Support mspaces + * Use segments to unify sbrk-based and mmap-based system allocation, + removing need for emulation on most platforms without sbrk. + * Default safety checks + * Optional footer checks. Thanks to William Robertson for the idea. + * Internal code refactoring + * Incorporate suggestions and platform-specific changes. + Thanks to Dennis Flanagan, Colin Plumb, Niall Douglas, + Aaron Bachmann, Emery Berger, and others. + * Speed up non-fastbin processing enough to remove fastbins. + * Remove useless cfree() to avoid conflicts with other apps. + * Remove internal memcpy, memset. Compilers handle builtins better. + * Remove some options that no one ever used and rename others. + + V2.7.2 Sat Aug 17 09:07:30 2002 Doug Lea (dl at gee) + * Fix malloc_state bitmap array misdeclaration + + V2.7.1 Thu Jul 25 10:58:03 2002 Doug Lea (dl at gee) + * Allow tuning of FIRST_SORTED_BIN_SIZE + * Use PTR_UINT as type for all ptr->int casts. Thanks to John Belmonte. + * Better detection and support for non-contiguousness of MORECORE. + Thanks to Andreas Mueller, Conal Walsh, and Wolfram Gloger + * Bypass most of malloc if no frees. Thanks To Emery Berger. + * Fix freeing of old top non-contiguous chunk im sysmalloc. + * Raised default trim and map thresholds to 256K. + * Fix mmap-related #defines. Thanks to Lubos Lunak. + * Fix copy macros; added LACKS_FCNTL_H. Thanks to Neal Walfield. + * Branch-free bin calculation + * Default trim and mmap thresholds now 256K. + + V2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee) + * Introduce independent_comalloc and independent_calloc. + Thanks to Michael Pachos for motivation and help. + * Make optional .h file available + * Allow > 2GB requests on 32bit systems. + * new WIN32 sbrk, mmap, munmap, lock code from . + Thanks also to Andreas Mueller , + and Anonymous. + * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for + helping test this.) + * memalign: check alignment arg + * realloc: don't try to shift chunks backwards, since this + leads to more fragmentation in some programs and doesn't + seem to help in any others. + * Collect all cases in malloc requiring system memory into sysmalloc + * Use mmap as backup to sbrk + * Place all internal state in malloc_state + * Introduce fastbins (although similar to 2.5.1) + * Many minor tunings and cosmetic improvements + * Introduce USE_PUBLIC_MALLOC_WRAPPERS, USE_MALLOC_LOCK + * Introduce MALLOC_FAILURE_ACTION, MORECORE_CONTIGUOUS + Thanks to Tony E. Bennett and others. + * Include errno.h to support default failure action. + + V2.6.6 Sun Dec 5 07:42:19 1999 Doug Lea (dl at gee) + * return null for negative arguments + * Added Several WIN32 cleanups from Martin C. Fong + * Add 'LACKS_SYS_PARAM_H' for those systems without 'sys/param.h' + (e.g. WIN32 platforms) + * Cleanup header file inclusion for WIN32 platforms + * Cleanup code to avoid Microsoft Visual C++ compiler complaints + * Add 'USE_DL_PREFIX' to quickly allow co-existence with existing + memory allocation routines + * Set 'malloc_getpagesize' for WIN32 platforms (needs more work) + * Use 'assert' rather than 'ASSERT' in WIN32 code to conform to + usage of 'assert' in non-WIN32 code + * Improve WIN32 'sbrk()' emulation's 'findRegion()' routine to + avoid infinite loop + * Always call 'fREe()' rather than 'free()' + + V2.6.5 Wed Jun 17 15:57:31 1998 Doug Lea (dl at gee) + * Fixed ordering problem with boundary-stamping + + V2.6.3 Sun May 19 08:17:58 1996 Doug Lea (dl at gee) + * Added pvalloc, as recommended by H.J. Liu + * Added 64bit pointer support mainly from Wolfram Gloger + * Added anonymously donated WIN32 sbrk emulation + * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen + * malloc_extend_top: fix mask error that caused wastage after + foreign sbrks + * Add linux mremap support code from HJ Liu + + V2.6.2 Tue Dec 5 06:52:55 1995 Doug Lea (dl at gee) + * Integrated most documentation with the code. + * Add support for mmap, with help from + Wolfram Gloger (Gloger@lrz.uni-muenchen.de). + * Use last_remainder in more cases. + * Pack bins using idea from colin@nyx10.cs.du.edu + * Use ordered bins instead of best-fit threshhold + * Eliminate block-local decls to simplify tracing and debugging. + * Support another case of realloc via move into top + * Fix error occuring when initial sbrk_base not word-aligned. + * Rely on page size for units instead of SBRK_UNIT to + avoid surprises about sbrk alignment conventions. + * Add mallinfo, mallopt. Thanks to Raymond Nijssen + (raymond@es.ele.tue.nl) for the suggestion. + * Add `pad' argument to malloc_trim and top_pad mallopt parameter. + * More precautions for cases where other routines call sbrk, + courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de). + * Added macros etc., allowing use in linux libc from + H.J. Lu (hjl@gnu.ai.mit.edu) + * Inverted this history list + + V2.6.1 Sat Dec 2 14:10:57 1995 Doug Lea (dl at gee) + * Re-tuned and fixed to behave more nicely with V2.6.0 changes. + * Removed all preallocation code since under current scheme + the work required to undo bad preallocations exceeds + the work saved in good cases for most test programs. + * No longer use return list or unconsolidated bins since + no scheme using them consistently outperforms those that don't + given above changes. + * Use best fit for very large chunks to prevent some worst-cases. + * Added some support for debugging + + V2.6.0 Sat Nov 4 07:05:23 1995 Doug Lea (dl at gee) + * Removed footers when chunks are in use. Thanks to + Paul Wilson (wilson@cs.texas.edu) for the suggestion. + + V2.5.4 Wed Nov 1 07:54:51 1995 Doug Lea (dl at gee) + * Added malloc_trim, with help from Wolfram Gloger + (wmglo@Dent.MED.Uni-Muenchen.DE). + + V2.5.3 Tue Apr 26 10:16:01 1994 Doug Lea (dl at g) + + V2.5.2 Tue Apr 5 16:20:40 1994 Doug Lea (dl at g) + * realloc: try to expand in both directions + * malloc: swap order of clean-bin strategy; + * realloc: only conditionally expand backwards + * Try not to scavenge used bins + * Use bin counts as a guide to preallocation + * Occasionally bin return list chunks in first scan + * Add a few optimizations from colin@nyx10.cs.du.edu + + V2.5.1 Sat Aug 14 15:40:43 1993 Doug Lea (dl at g) + * faster bin computation & slightly different binning + * merged all consolidations to one part of malloc proper + (eliminating old malloc_find_space & malloc_clean_bin) + * Scan 2 returns chunks (not just 1) + * Propagate failure in realloc if malloc returns 0 + * Add stuff to allow compilation on non-ANSI compilers + from kpv@research.att.com + + V2.5 Sat Aug 7 07:41:59 1993 Doug Lea (dl at g.oswego.edu) + * removed potential for odd address access in prev_chunk + * removed dependency on getpagesize.h + * misc cosmetics and a bit more internal documentation + * anticosmetics: mangled names in macros to evade debugger strangeness + * tested on sparc, hp-700, dec-mips, rs6000 + with gcc & native cc (hp, dec only) allowing + Detlefs & Zorn comparison study (in SIGPLAN Notices.) + + Trial version Fri Aug 28 13:14:29 1992 Doug Lea (dl at g.oswego.edu) + * Based loosely on libg++-1.2X malloc. (It retains some of the overall + structure of old version, but most details differ.) + +*/ + +/** @} + */ + Index: uspace/lib/softfloat/Makefile =================================================================== --- uspace/lib/softfloat/Makefile (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/Makefile (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,81 @@ +# +# 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. +# + +## Common compiler flags +# + +LIBC_PREFIX = ../libc +## Setup toolchain +# + +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS +=-Iinclude -Iarch/$(ARCH)/include/ + +## Sources +# + +GENERIC_SOURCES = \ + generic/add.c \ + generic/common.c \ + generic/comparison.c \ + generic/conversion.c \ + generic/div.c \ + generic/mul.c \ + generic/other.c \ + generic/softfloat.c \ + generic/sub.c + +ARCH_SOURCES = + +GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) + +.PHONY: all clean depend + +all: libsoftfloat.a + +-include Makefile.depend + +clean: + -rm -f libsoftfloat.a Makefile.depend + find generic/ -name '*.o' -follow -exec rm \{\} \; + +depend: + -makedepend $(DEFS) $(CFLAGS) -f - $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null + +libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS) + $(AR) rc libsoftfloat.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS) + +%.o: %.S + $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ + +%.o: %.s + $(AS) $(AFLAGS) $< -o $@ + +%.o: %.c + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ Index: uspace/lib/softfloat/arch/amd64/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/amd64/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/arch/amd64/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,77 @@ +/* + * 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 softfloatamd64 amd64 + * @ingroup sfl + * @brief softfloat architecture dependent definitions + * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int64(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int64(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint64(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint64(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int64_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int64_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint64_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint64_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + + +/** @} + */ + Index: uspace/lib/softfloat/arch/arm32/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/arm32/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/arch/arm32/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,76 @@ +/* + * 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 softfloatarm32 arm32 + * @ingroup sfl + * @brief Softfloat architecture dependent definitions. + * @{ + */ +/** @file + * @brief Softfloat architecture dependent definitions. + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int32(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int32(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint32(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint32(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int32_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int32_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint32_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint32_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + +/** @} + */ Index: uspace/lib/softfloat/arch/ia32/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/ia32/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/arch/ia32/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,75 @@ +/* + * 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 softfloatia32 ia32 + * @ingroup sfl + * @brief softfloat architecture dependent definitions + * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int32(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int32(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint32(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint32(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int32_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int32_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint32_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint32_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + +/** @} + */ Index: uspace/lib/softfloat/arch/ia64/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/ia64/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/arch/ia64/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,77 @@ +/* + * 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 softfloatia64 ia64 + * @ingroup sfl + * @brief softfloat architecture dependent definitions + * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int64(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int64(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint64(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint64(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int64_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int64_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint64_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint64_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/arch/mips32/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/mips32/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/arch/mips32/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,77 @@ +/* + * 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 softfloatmips32 mips32 + * @ingroup sfl + * @brief softfloat architecture dependent definitions + * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int32(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int32(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint32(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint32(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int32_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int32_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint32_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint32_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/arch/mips32eb/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/mips32eb/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/arch/mips32eb/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,77 @@ +/* + * 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 softfloatmipseb32 mipseb32 + * @ingroup sfl + * @brief softfloat architecture dependent definitions + * * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int32(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int32(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint32(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint32(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int32_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int32_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint32_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint32_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/arch/ppc32/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/ppc32/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/arch/ppc32/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,77 @@ +/* + * 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 softfloatppc32 ppc32 + * @ingroup sfl + * @brief softfloat architecture dependent definitions + * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int32(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int32(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint32(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint32(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int32_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int32_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint32_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint32_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/arch/ppc64/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/ppc64/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/arch/ppc64/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,76 @@ +/* + * 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 softfloatppc64 ppc64 + * @ingroup sfl + * @brief softfloat architecture dependent definitions + * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int64(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int64(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint64(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint64(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int64_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int64_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint64_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint64_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + + /** @} + */ + Index: uspace/lib/softfloat/arch/sparc64/include/functions.h =================================================================== --- uspace/lib/softfloat/arch/sparc64/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/arch/sparc64/include/functions.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,77 @@ +/* + * 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 softfloatsparc64 sparc64 + * @ingroup sfl + * @brief softfloat architecture dependent definitions + * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_FUNCTIONS_H__ +#define __SOFTFLOAT_FUNCTIONS_H__ + +#define float32_to_int(X) float32_to_int32(X); +#define float32_to_long(X) float32_to_int64(X); +#define float32_to_longlong(X) float32_to_int64(X); + +#define float64_to_int(X) float64_to_int32(X); +#define float64_to_long(X) float64_to_int64(X); +#define float64_to_longlong(X) float64_to_int64(X); + +#define float32_to_uint(X) float32_to_uint32(X); +#define float32_to_ulong(X) float32_to_uint64(X); +#define float32_to_ulonglong(X) float32_to_uint64(X); + +#define float64_to_uint(X) float64_to_uint32(X); +#define float64_to_ulong(X) float64_to_uint64(X); +#define float64_to_ulonglong(X) float64_to_uint64(X); + +#define int_to_float32(X) int32_to_float32(X); +#define long_to_float32(X) int64_to_float32(X); +#define longlong_to_float32(X) int64_to_float32(X); + +#define int_to_float64(X) int32_to_float64(X); +#define long_to_float64(X) int64_to_float64(X); +#define longlong_to_float64(X) int64_to_float64(X); + +#define uint_to_float32(X) uint32_to_float32(X); +#define ulong_to_float32(X) uint64_to_float32(X); +#define ulonglong_to_float32(X) uint64_to_float32(X); + +#define uint_to_float64(X) uint32_to_float64(X); +#define ulong_to_float64(X) uint64_to_float64(X); +#define ulonglong_to_float64(X) uint64_to_float64(X); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/generic/add.c =================================================================== --- uspace/lib/softfloat/generic/add.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/generic/add.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,259 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#include +#include +#include + +/** Add two Float32 numbers with same signs + */ +float32 addFloat32(float32 a, float32 b) +{ + int expdiff; + uint32_t exp1, exp2,frac1, frac2; + + expdiff = a.parts.exp - b.parts.exp; + if (expdiff < 0) { + if (isFloat32NaN(b)) { + /* TODO: fix SigNaN */ + if (isFloat32SigNaN(b)) { + }; + + return b; + }; + + if (b.parts.exp == FLOAT32_MAX_EXPONENT) { + return b; + } + + frac1 = b.parts.fraction; + exp1 = b.parts.exp; + frac2 = a.parts.fraction; + exp2 = a.parts.exp; + expdiff *= -1; + } else { + if ((isFloat32NaN(a)) || (isFloat32NaN(b))) { + /* TODO: fix SigNaN */ + if (isFloat32SigNaN(a) || isFloat32SigNaN(b)) { + }; + return (isFloat32NaN(a)?a:b); + }; + + if (a.parts.exp == FLOAT32_MAX_EXPONENT) { + return a; + } + + frac1 = a.parts.fraction; + exp1 = a.parts.exp; + frac2 = b.parts.fraction; + exp2 = b.parts.exp; + }; + + if (exp1 == 0) { + /* both are denormalized */ + frac1 += frac2; + if (frac1 & FLOAT32_HIDDEN_BIT_MASK ) { + /* result is not denormalized */ + a.parts.exp = 1; + }; + a.parts.fraction = frac1; + return a; + }; + + frac1 |= FLOAT32_HIDDEN_BIT_MASK; /* add hidden bit */ + + if (exp2 == 0) { + /* second operand is denormalized */ + --expdiff; + } else { + /* add hidden bit to second operand */ + frac2 |= FLOAT32_HIDDEN_BIT_MASK; + }; + + /* create some space for rounding */ + frac1 <<= 6; + frac2 <<= 6; + + if (expdiff < (FLOAT32_FRACTION_SIZE + 2) ) { + frac2 >>= expdiff; + frac1 += frac2; + } else { + a.parts.exp = exp1; + a.parts.fraction = (frac1 >> 6) & (~(FLOAT32_HIDDEN_BIT_MASK)); + return a; + } + + if (frac1 & (FLOAT32_HIDDEN_BIT_MASK << 7) ) { + ++exp1; + frac1 >>= 1; + }; + + /* rounding - if first bit after fraction is set then round up */ + frac1 += (0x1 << 5); + + if (frac1 & (FLOAT32_HIDDEN_BIT_MASK << 7)) { + /* rounding overflow */ + ++exp1; + frac1 >>= 1; + }; + + + if ((exp1 == FLOAT32_MAX_EXPONENT ) || (exp2 > exp1)) { + /* overflow - set infinity as result */ + a.parts.exp = FLOAT32_MAX_EXPONENT; + a.parts.fraction = 0; + return a; + } + + a.parts.exp = exp1; + + /*Clear hidden bit and shift */ + a.parts.fraction = ((frac1 >> 6) & (~FLOAT32_HIDDEN_BIT_MASK)) ; + return a; +} + + +/** Add two Float64 numbers with same signs + */ +float64 addFloat64(float64 a, float64 b) +{ + int expdiff; + uint32_t exp1, exp2; + uint64_t frac1, frac2; + + expdiff = ((int )a.parts.exp) - b.parts.exp; + if (expdiff < 0) { + if (isFloat64NaN(b)) { + /* TODO: fix SigNaN */ + if (isFloat64SigNaN(b)) { + }; + + return b; + }; + + /* b is infinity and a not */ + if (b.parts.exp == FLOAT64_MAX_EXPONENT ) { + return b; + } + + frac1 = b.parts.fraction; + exp1 = b.parts.exp; + frac2 = a.parts.fraction; + exp2 = a.parts.exp; + expdiff *= -1; + } else { + if (isFloat64NaN(a)) { + /* TODO: fix SigNaN */ + if (isFloat64SigNaN(a) || isFloat64SigNaN(b)) { + }; + return a; + }; + + /* a is infinity and b not */ + if (a.parts.exp == FLOAT64_MAX_EXPONENT ) { + return a; + } + + frac1 = a.parts.fraction; + exp1 = a.parts.exp; + frac2 = b.parts.fraction; + exp2 = b.parts.exp; + }; + + if (exp1 == 0) { + /* both are denormalized */ + frac1 += frac2; + if (frac1 & FLOAT64_HIDDEN_BIT_MASK) { + /* result is not denormalized */ + a.parts.exp = 1; + }; + a.parts.fraction = frac1; + return a; + }; + + /* add hidden bit - frac1 is sure not denormalized */ + frac1 |= FLOAT64_HIDDEN_BIT_MASK; + + /* second operand ... */ + if (exp2 == 0) { + /* ... is denormalized */ + --expdiff; + } else { + /* is not denormalized */ + frac2 |= FLOAT64_HIDDEN_BIT_MASK; + }; + + /* create some space for rounding */ + frac1 <<= 6; + frac2 <<= 6; + + if (expdiff < (FLOAT64_FRACTION_SIZE + 2) ) { + frac2 >>= expdiff; + frac1 += frac2; + } else { + a.parts.exp = exp1; + a.parts.fraction = (frac1 >> 6) & (~(FLOAT64_HIDDEN_BIT_MASK)); + return a; + } + + if (frac1 & (FLOAT64_HIDDEN_BIT_MASK << 7) ) { + ++exp1; + frac1 >>= 1; + }; + + /* rounding - if first bit after fraction is set then round up */ + frac1 += (0x1 << 5); + + if (frac1 & (FLOAT64_HIDDEN_BIT_MASK << 7)) { + /* rounding overflow */ + ++exp1; + frac1 >>= 1; + }; + + if ((exp1 == FLOAT64_MAX_EXPONENT ) || (exp2 > exp1)) { + /* overflow - set infinity as result */ + a.parts.exp = FLOAT64_MAX_EXPONENT; + a.parts.fraction = 0; + return a; + } + + a.parts.exp = exp1; + /*Clear hidden bit and shift */ + a.parts.fraction = ( (frac1 >> 6 ) & (~FLOAT64_HIDDEN_BIT_MASK)); + + return a; +} + +/** @} + */ Index: uspace/lib/softfloat/generic/common.c =================================================================== --- uspace/lib/softfloat/generic/common.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/generic/common.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,215 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#include +#include + +/* Table for fast leading zeroes counting */ +char zeroTable[256] = { + 8, 7, 7, 6, 6, 6, 6, 4, 4, 4, 4, 4, 4, 4, 4, \ + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + + + +/** Take fraction shifted by 10 bits to left, round it, normalize it and detect exceptions + * @param cexp exponent with bias + * @param cfrac fraction shifted 10 places left with added hidden bit + * @param sign + * @return valied float64 + */ +float64 finishFloat64(int32_t cexp, uint64_t cfrac, char sign) +{ + float64 result; + + result.parts.sign = sign; + + /* find first nonzero digit and shift result and detect possibly underflow */ + while ((cexp > 0) && (cfrac) && (!(cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1 ) )))) { + cexp--; + cfrac <<= 1; + /* TODO: fix underflow */ + }; + + if ((cexp < 0) || ( cexp == 0 && (!(cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1)))))) { + /* FIXME: underflow */ + result.parts.exp = 0; + if ((cexp + FLOAT64_FRACTION_SIZE + 1) < 0) { /* +1 is place for rounding */ + result.parts.fraction = 0; + return result; + } + + while (cexp < 0) { + cexp++; + cfrac >>= 1; + } + + cfrac += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3)); + + if (!(cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1)))) { + + result.parts.fraction = ((cfrac >>(64 - FLOAT64_FRACTION_SIZE - 2) ) & (~FLOAT64_HIDDEN_BIT_MASK)); + return result; + } + } else { + cfrac += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3)); + } + + ++cexp; + + if (cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1 ))) { + ++cexp; + cfrac >>= 1; + } + + /* check overflow */ + if (cexp >= FLOAT64_MAX_EXPONENT ) { + /* FIXME: overflow, return infinity */ + result.parts.exp = FLOAT64_MAX_EXPONENT; + result.parts.fraction = 0; + return result; + } + + result.parts.exp = (uint32_t)cexp; + + result.parts.fraction = ((cfrac >>(64 - FLOAT64_FRACTION_SIZE - 2 ) ) & (~FLOAT64_HIDDEN_BIT_MASK)); + + return result; +} + +/** Counts leading zeroes in 64bit unsigned integer + * @param i + */ +int countZeroes64(uint64_t i) +{ + int j; + for (j =0; j < 64; j += 8) { + if ( i & (0xFFll << (56 - j))) { + return (j + countZeroes8(i >> (56 - j))); + } + } + + return 64; +} + +/** Counts leading zeroes in 32bit unsigned integer + * @param i + */ +int countZeroes32(uint32_t i) +{ + int j; + for (j =0; j < 32; j += 8) { + if ( i & (0xFF << (24 - j))) { + return (j + countZeroes8(i >> (24 - j))); + } + } + + return 32; +} + +/** Counts leading zeroes in byte + * @param i + */ +int countZeroes8(uint8_t i) +{ + return zeroTable[i]; +} + +/** Round and normalize number expressed by exponent and fraction with first bit (equal to hidden bit) at 30. bit + * @param exp exponent + * @param fraction part with hidden bit shifted to 30. bit + */ +void roundFloat32(int32_t *exp, uint32_t *fraction) +{ + /* rounding - if first bit after fraction is set then round up */ + (*fraction) += (0x1 << 6); + + if ((*fraction) & (FLOAT32_HIDDEN_BIT_MASK << 8)) { + /* rounding overflow */ + ++(*exp); + (*fraction) >>= 1; + }; + + if (((*exp) >= FLOAT32_MAX_EXPONENT ) || ((*exp) < 0)) { + /* overflow - set infinity as result */ + (*exp) = FLOAT32_MAX_EXPONENT; + (*fraction) = 0; + return; + } + + return; +} + +/** Round and normalize number expressed by exponent and fraction with first bit (equal to hidden bit) at 62. bit + * @param exp exponent + * @param fraction part with hidden bit shifted to 62. bit + */ +void roundFloat64(int32_t *exp, uint64_t *fraction) +{ + /* rounding - if first bit after fraction is set then round up */ + (*fraction) += (0x1 << 9); + + if ((*fraction) & (FLOAT64_HIDDEN_BIT_MASK << 11)) { + /* rounding overflow */ + ++(*exp); + (*fraction) >>= 1; + }; + + if (((*exp) >= FLOAT64_MAX_EXPONENT ) || ((*exp) < 0)) { + /* overflow - set infinity as result */ + (*exp) = FLOAT64_MAX_EXPONENT; + (*fraction) = 0; + return; + } + + return; +} + +/** @} + */ + Index: uspace/lib/softfloat/generic/comparison.c =================================================================== --- uspace/lib/softfloat/generic/comparison.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/generic/comparison.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,129 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#include +#include + +inline int isFloat32NaN(float32 f) +{ /* NaN : exp = 0xff and nonzero fraction */ + return ((f.parts.exp==0xFF)&&(f.parts.fraction)); +} + +inline int isFloat64NaN(float64 d) +{ /* NaN : exp = 0x7ff and nonzero fraction */ + return ((d.parts.exp==0x7FF)&&(d.parts.fraction)); +} + +inline int isFloat32SigNaN(float32 f) +{ /* SigNaN : exp = 0xff fraction = 0xxxxx..x (binary), where at least one x is nonzero */ + return ((f.parts.exp==0xFF)&&(f.parts.fraction<0x400000)&&(f.parts.fraction)); +} + +inline int isFloat64SigNaN(float64 d) +{ /* SigNaN : exp = 0x7ff fraction = 0xxxxx..x (binary), where at least one x is nonzero */ + return ((d.parts.exp==0x7FF)&&(d.parts.fraction)&&(d.parts.fraction<0x8000000000000ll)); +} + +inline int isFloat32Infinity(float32 f) +{ + return ((f.parts.exp==0xFF)&&(f.parts.fraction==0x0)); +} + +inline int isFloat64Infinity(float64 d) +{ + return ((d.parts.exp==0x7FF)&&(d.parts.fraction==0x0)); +} + +inline int isFloat32Zero(float32 f) +{ + return (((f.binary) & 0x7FFFFFFF) == 0); +} + +inline int isFloat64Zero(float64 d) +{ + return (((d.binary) & 0x7FFFFFFFFFFFFFFFll) == 0); +} + +/** + * @return 1, if both floats are equal - but NaNs are not recognized + */ +inline int isFloat32eq(float32 a, float32 b) +{ + return ((a.binary==b.binary)||(((a.binary| b.binary)&0x7FFFFFFF)==0)); /* a equals to b or both are zeros (with any sign) */ +} + +/** + * @return 1, if ab.binary); + }; + + /* lets negate signs - now will be positive numbers allways bigger than negative (first bit will be set for unsigned integer comparison)*/ + a.parts.sign=!a.parts.sign; + b.parts.sign=!b.parts.sign; + return (a.binaryb - but NaNs are not recognized + */ +inline int isFloat32gt(float32 a, float32 b) +{ + if (((a.binary| b.binary)&0x7FFFFFFF)==0) { + return 0; /* zeroes are equal with any sign */ + }; + + if ((a.parts.sign)&&(b.parts.sign)) { + /*if both are negative, greater is that with smaller binary value*/ + return (a.binaryb.binary); + +} + +/** @} + */ Index: uspace/lib/softfloat/generic/conversion.c =================================================================== --- uspace/lib/softfloat/generic/conversion.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/generic/conversion.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,593 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#include "sftypes.h" +#include "conversion.h" +#include "comparison.h" +#include "common.h" + +float64 convertFloat32ToFloat64(float32 a) +{ + float64 result; + uint64_t frac; + + result.parts.sign = a.parts.sign; + result.parts.fraction = a.parts.fraction; + result.parts.fraction <<= (FLOAT64_FRACTION_SIZE - FLOAT32_FRACTION_SIZE ); + + if ((isFloat32Infinity(a))||(isFloat32NaN(a))) { + result.parts.exp = 0x7FF; + /* TODO; check if its correct for SigNaNs*/ + return result; + }; + + result.parts.exp = a.parts.exp + ( (int)FLOAT64_BIAS - FLOAT32_BIAS ); + if (a.parts.exp == 0) { + /* normalize denormalized numbers */ + + if (result.parts.fraction == 0ll) { /* fix zero */ + result.parts.exp = 0ll; + return result; + } + + frac = result.parts.fraction; + + while (!(frac & (0x10000000000000ll))) { + frac <<= 1; + --result.parts.exp; + }; + + ++result.parts.exp; + result.parts.fraction = frac; + }; + + return result; + +} + +float32 convertFloat64ToFloat32(float64 a) +{ + float32 result; + int32_t exp; + uint64_t frac; + + result.parts.sign = a.parts.sign; + + if (isFloat64NaN(a)) { + + result.parts.exp = 0xFF; + + if (isFloat64SigNaN(a)) { + result.parts.fraction = 0x400000; /* set first bit of fraction nonzero */ + return result; + } + + result.parts.fraction = 0x1; /* fraction nonzero but its first bit is zero */ + return result; + }; + + if (isFloat64Infinity(a)) { + result.parts.fraction = 0; + result.parts.exp = 0xFF; + return result; + }; + + exp = (int)a.parts.exp - FLOAT64_BIAS + FLOAT32_BIAS; + + if (exp >= 0xFF) { + /*FIXME: overflow*/ + result.parts.fraction = 0; + result.parts.exp = 0xFF; + return result; + + } else if (exp <= 0 ) { + + /* underflow or denormalized */ + + result.parts.exp = 0; + + exp *= -1; + if (exp > FLOAT32_FRACTION_SIZE ) { + /* FIXME: underflow */ + result.parts.fraction = 0; + return result; + }; + + /* denormalized */ + + frac = a.parts.fraction; + frac |= 0x10000000000000ll; /* denormalize and set hidden bit */ + + frac >>= (FLOAT64_FRACTION_SIZE - FLOAT32_FRACTION_SIZE + 1); + + while (exp > 0) { + --exp; + frac >>= 1; + }; + result.parts.fraction = frac; + + return result; + }; + + result.parts.exp = exp; + result.parts.fraction = a.parts.fraction >> (FLOAT64_FRACTION_SIZE - FLOAT32_FRACTION_SIZE); + return result; +} + + +/** Helping procedure for converting float32 to uint32 + * @param a floating point number in normalized form (no NaNs or Inf are checked ) + * @return unsigned integer + */ +static uint32_t _float32_to_uint32_helper(float32 a) +{ + uint32_t frac; + + if (a.parts.exp < FLOAT32_BIAS) { + /*TODO: rounding*/ + return 0; + } + + frac = a.parts.fraction; + + frac |= FLOAT32_HIDDEN_BIT_MASK; + /* shift fraction to left so hidden bit will be the most significant bit */ + frac <<= 32 - FLOAT32_FRACTION_SIZE - 1; + + frac >>= 32 - (a.parts.exp - FLOAT32_BIAS) - 1; + if ((a.parts.sign == 1) && (frac != 0)) { + frac = ~frac; + ++frac; + } + + return frac; +} + +/* Convert float to unsigned int32 + * FIXME: Im not sure what to return if overflow/underflow happens + * - now its the biggest or the smallest int + */ +uint32_t float32_to_uint32(float32 a) +{ + if (isFloat32NaN(a)) { + return MAX_UINT32; + } + + if (isFloat32Infinity(a) || (a.parts.exp >= (32 + FLOAT32_BIAS))) { + if (a.parts.sign) { + return MIN_UINT32; + } + return MAX_UINT32; + } + + return _float32_to_uint32_helper(a); +} + +/* Convert float to signed int32 + * FIXME: Im not sure what to return if overflow/underflow happens + * - now its the biggest or the smallest int + */ +int32_t float32_to_int32(float32 a) +{ + if (isFloat32NaN(a)) { + return MAX_INT32; + } + + if (isFloat32Infinity(a) || (a.parts.exp >= (32 + FLOAT32_BIAS))) { + if (a.parts.sign) { + return MIN_INT32; + } + return MAX_INT32; + } + return _float32_to_uint32_helper(a); +} + + +/** Helping procedure for converting float64 to uint64 + * @param a floating point number in normalized form (no NaNs or Inf are checked ) + * @return unsigned integer + */ +static uint64_t _float64_to_uint64_helper(float64 a) +{ + uint64_t frac; + + if (a.parts.exp < FLOAT64_BIAS) { + /*TODO: rounding*/ + return 0; + } + + frac = a.parts.fraction; + + frac |= FLOAT64_HIDDEN_BIT_MASK; + /* shift fraction to left so hidden bit will be the most significant bit */ + frac <<= 64 - FLOAT64_FRACTION_SIZE - 1; + + frac >>= 64 - (a.parts.exp - FLOAT64_BIAS) - 1; + if ((a.parts.sign == 1) && (frac != 0)) { + frac = ~frac; + ++frac; + } + + return frac; +} + +/* Convert float to unsigned int64 + * FIXME: Im not sure what to return if overflow/underflow happens + * - now its the biggest or the smallest int + */ +uint64_t float64_to_uint64(float64 a) +{ + if (isFloat64NaN(a)) { + return MAX_UINT64; + } + + if (isFloat64Infinity(a) || (a.parts.exp >= (64 + FLOAT64_BIAS))) { + if (a.parts.sign) { + return MIN_UINT64; + } + return MAX_UINT64; + } + + return _float64_to_uint64_helper(a); +} + +/* Convert float to signed int64 + * FIXME: Im not sure what to return if overflow/underflow happens + * - now its the biggest or the smallest int + */ +int64_t float64_to_int64(float64 a) +{ + if (isFloat64NaN(a)) { + return MAX_INT64; + } + + if (isFloat64Infinity(a) || (a.parts.exp >= (64 + FLOAT64_BIAS))) { + if (a.parts.sign) { + return MIN_INT64; + } + return MAX_INT64; + } + return _float64_to_uint64_helper(a); +} + + + + + +/** Helping procedure for converting float32 to uint64 + * @param a floating point number in normalized form (no NaNs or Inf are checked ) + * @return unsigned integer + */ +static uint64_t _float32_to_uint64_helper(float32 a) +{ + uint64_t frac; + + if (a.parts.exp < FLOAT32_BIAS) { + /*TODO: rounding*/ + return 0; + } + + frac = a.parts.fraction; + + frac |= FLOAT32_HIDDEN_BIT_MASK; + /* shift fraction to left so hidden bit will be the most significant bit */ + frac <<= 64 - FLOAT32_FRACTION_SIZE - 1; + + frac >>= 64 - (a.parts.exp - FLOAT32_BIAS) - 1; + if ((a.parts.sign == 1) && (frac != 0)) { + frac = ~frac; + ++frac; + } + + return frac; +} + +/* Convert float to unsigned int64 + * FIXME: Im not sure what to return if overflow/underflow happens + * - now its the biggest or the smallest int + */ +uint64_t float32_to_uint64(float32 a) +{ + if (isFloat32NaN(a)) { + return MAX_UINT64; + } + + if (isFloat32Infinity(a) || (a.parts.exp >= (64 + FLOAT32_BIAS))) { + if (a.parts.sign) { + return MIN_UINT64; + } + return MAX_UINT64; + } + + return _float32_to_uint64_helper(a); +} + +/* Convert float to signed int64 + * FIXME: Im not sure what to return if overflow/underflow happens + * - now its the biggest or the smallest int + */ +int64_t float32_to_int64(float32 a) +{ + if (isFloat32NaN(a)) { + return MAX_INT64; + } + + if (isFloat32Infinity(a) || (a.parts.exp >= (64 + FLOAT32_BIAS))) { + if (a.parts.sign) { + return (MIN_INT64); + } + return MAX_INT64; + } + return _float32_to_uint64_helper(a); +} + + +/* Convert float64 to unsigned int32 + * FIXME: Im not sure what to return if overflow/underflow happens + * - now its the biggest or the smallest int + */ +uint32_t float64_to_uint32(float64 a) +{ + if (isFloat64NaN(a)) { + return MAX_UINT32; + } + + if (isFloat64Infinity(a) || (a.parts.exp >= (32 + FLOAT64_BIAS))) { + if (a.parts.sign) { + return MIN_UINT32; + } + return MAX_UINT32; + } + + return (uint32_t)_float64_to_uint64_helper(a); +} + +/* Convert float64 to signed int32 + * FIXME: Im not sure what to return if overflow/underflow happens + * - now its the biggest or the smallest int + */ +int32_t float64_to_int32(float64 a) +{ + if (isFloat64NaN(a)) { + return MAX_INT32; + } + + if (isFloat64Infinity(a) || (a.parts.exp >= (32 + FLOAT64_BIAS))) { + if (a.parts.sign) { + return MIN_INT32; + } + return MAX_INT32; + } + return (int32_t)_float64_to_uint64_helper(a); +} + +/** Convert unsigned integer to float32 + * + * + */ +float32 uint32_to_float32(uint32_t i) +{ + int counter; + int32_t exp; + float32 result; + + result.parts.sign = 0; + result.parts.fraction = 0; + + counter = countZeroes32(i); + + exp = FLOAT32_BIAS + 32 - counter - 1; + + if (counter == 32) { + result.binary = 0; + return result; + } + + if (counter > 0) { + i <<= counter - 1; + } else { + i >>= 1; + } + + roundFloat32(&exp, &i); + + result.parts.fraction = i >> 7; + result.parts.exp = exp; + + return result; +} + +float32 int32_to_float32(int32_t i) +{ + float32 result; + + if (i < 0) { + result = uint32_to_float32((uint32_t)(-i)); + } else { + result = uint32_to_float32((uint32_t)i); + } + + result.parts.sign = i < 0; + + return result; +} + + +float32 uint64_to_float32(uint64_t i) +{ + int counter; + int32_t exp; + uint32_t j; + float32 result; + + result.parts.sign = 0; + result.parts.fraction = 0; + + counter = countZeroes64(i); + + exp = FLOAT32_BIAS + 64 - counter - 1; + + if (counter == 64) { + result.binary = 0; + return result; + } + + /* Shift all to the first 31 bits (31. will be hidden 1)*/ + if (counter > 33) { + i <<= counter - 1 - 32; + } else { + i >>= 1 + 32 - counter; + } + + j = (uint32_t)i; + roundFloat32(&exp, &j); + + result.parts.fraction = j >> 7; + result.parts.exp = exp; + return result; +} + +float32 int64_to_float32(int64_t i) +{ + float32 result; + + if (i < 0) { + result = uint64_to_float32((uint64_t)(-i)); + } else { + result = uint64_to_float32((uint64_t)i); + } + + result.parts.sign = i < 0; + + return result; +} + +/** Convert unsigned integer to float64 + * + * + */ +float64 uint32_to_float64(uint32_t i) +{ + int counter; + int32_t exp; + float64 result; + uint64_t frac; + + result.parts.sign = 0; + result.parts.fraction = 0; + + counter = countZeroes32(i); + + exp = FLOAT64_BIAS + 32 - counter - 1; + + if (counter == 32) { + result.binary = 0; + return result; + } + + frac = i; + frac <<= counter + 32 - 1; + + roundFloat64(&exp, &frac); + + result.parts.fraction = frac >> 10; + result.parts.exp = exp; + + return result; +} + +float64 int32_to_float64(int32_t i) +{ + float64 result; + + if (i < 0) { + result = uint32_to_float64((uint32_t)(-i)); + } else { + result = uint32_to_float64((uint32_t)i); + } + + result.parts.sign = i < 0; + + return result; +} + + +float64 uint64_to_float64(uint64_t i) +{ + int counter; + int32_t exp; + float64 result; + + result.parts.sign = 0; + result.parts.fraction = 0; + + counter = countZeroes64(i); + + exp = FLOAT64_BIAS + 64 - counter - 1; + + if (counter == 64) { + result.binary = 0; + return result; + } + + if (counter > 0) { + i <<= counter - 1; + } else { + i >>= 1; + } + + roundFloat64(&exp, &i); + + result.parts.fraction = i >> 10; + result.parts.exp = exp; + return result; +} + +float64 int64_to_float64(int64_t i) +{ + float64 result; + + if (i < 0) { + result = uint64_to_float64((uint64_t)(-i)); + } else { + result = uint64_to_float64((uint64_t)i); + } + + result.parts.sign = i < 0; + + return result; +} + +/** @} + */ Index: uspace/lib/softfloat/generic/div.c =================================================================== --- uspace/lib/softfloat/generic/div.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/generic/div.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,364 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include + + +float32 divFloat32(float32 a, float32 b) +{ + float32 result; + int32_t aexp, bexp, cexp; + uint64_t afrac, bfrac, cfrac; + + result.parts.sign = a.parts.sign ^ b.parts.sign; + + if (isFloat32NaN(a)) { + if (isFloat32SigNaN(a)) { + /*FIXME: SigNaN*/ + } + /*NaN*/ + return a; + } + + if (isFloat32NaN(b)) { + if (isFloat32SigNaN(b)) { + /*FIXME: SigNaN*/ + } + /*NaN*/ + return b; + } + + if (isFloat32Infinity(a)) { + if (isFloat32Infinity(b)) { + /*FIXME: inf / inf */ + result.binary = FLOAT32_NAN; + return result; + } + /* inf / num */ + result.parts.exp = a.parts.exp; + result.parts.fraction = a.parts.fraction; + return result; + } + + if (isFloat32Infinity(b)) { + if (isFloat32Zero(a)) { + /* FIXME 0 / inf */ + result.parts.exp = 0; + result.parts.fraction = 0; + return result; + } + /* FIXME: num / inf*/ + result.parts.exp = 0; + result.parts.fraction = 0; + return result; + } + + if (isFloat32Zero(b)) { + if (isFloat32Zero(a)) { + /*FIXME: 0 / 0*/ + result.binary = FLOAT32_NAN; + return result; + } + /* FIXME: division by zero */ + result.parts.exp = 0; + result.parts.fraction = 0; + return result; + } + + + afrac = a.parts.fraction; + aexp = a.parts.exp; + bfrac = b.parts.fraction; + bexp = b.parts.exp; + + /* denormalized numbers */ + if (aexp == 0) { + if (afrac == 0) { + result.parts.exp = 0; + result.parts.fraction = 0; + return result; + } + /* normalize it*/ + + afrac <<= 1; + /* afrac is nonzero => it must stop */ + while (! (afrac & FLOAT32_HIDDEN_BIT_MASK) ) { + afrac <<= 1; + aexp--; + } + } + + if (bexp == 0) { + bfrac <<= 1; + /* bfrac is nonzero => it must stop */ + while (! (bfrac & FLOAT32_HIDDEN_BIT_MASK) ) { + bfrac <<= 1; + bexp--; + } + } + + afrac = (afrac | FLOAT32_HIDDEN_BIT_MASK ) << (32 - FLOAT32_FRACTION_SIZE - 1 ); + bfrac = (bfrac | FLOAT32_HIDDEN_BIT_MASK ) << (32 - FLOAT32_FRACTION_SIZE ); + + if ( bfrac <= (afrac << 1) ) { + afrac >>= 1; + aexp++; + } + + cexp = aexp - bexp + FLOAT32_BIAS - 2; + + cfrac = (afrac << 32) / bfrac; + if (( cfrac & 0x3F ) == 0) { + cfrac |= ( bfrac * cfrac != afrac << 32 ); + } + + /* pack and round */ + + /* find first nonzero digit and shift result and detect possibly underflow */ + while ((cexp > 0) && (cfrac) && (!(cfrac & (FLOAT32_HIDDEN_BIT_MASK << 7 )))) { + cexp--; + cfrac <<= 1; + /* TODO: fix underflow */ + }; + + cfrac += (0x1 << 6); /* FIXME: 7 is not sure*/ + + if (cfrac & (FLOAT32_HIDDEN_BIT_MASK << 7)) { + ++cexp; + cfrac >>= 1; + } + + /* check overflow */ + if (cexp >= FLOAT32_MAX_EXPONENT ) { + /* FIXME: overflow, return infinity */ + result.parts.exp = FLOAT32_MAX_EXPONENT; + result.parts.fraction = 0; + return result; + } + + if (cexp < 0) { + /* FIXME: underflow */ + result.parts.exp = 0; + if ((cexp + FLOAT32_FRACTION_SIZE) < 0) { + result.parts.fraction = 0; + return result; + } + cfrac >>= 1; + while (cexp < 0) { + cexp ++; + cfrac >>= 1; + } + + } else { + result.parts.exp = (uint32_t)cexp; + } + + result.parts.fraction = ((cfrac >> 6) & (~FLOAT32_HIDDEN_BIT_MASK)); + + return result; +} + +float64 divFloat64(float64 a, float64 b) +{ + float64 result; + int64_t aexp, bexp, cexp; + uint64_t afrac, bfrac, cfrac; + uint64_t remlo, remhi; + + result.parts.sign = a.parts.sign ^ b.parts.sign; + + if (isFloat64NaN(a)) { + + if (isFloat64SigNaN(b)) { + /*FIXME: SigNaN*/ + return b; + } + + if (isFloat64SigNaN(a)) { + /*FIXME: SigNaN*/ + } + /*NaN*/ + return a; + } + + if (isFloat64NaN(b)) { + if (isFloat64SigNaN(b)) { + /*FIXME: SigNaN*/ + } + /*NaN*/ + return b; + } + + if (isFloat64Infinity(a)) { + if (isFloat64Infinity(b) || isFloat64Zero(b)) { + /*FIXME: inf / inf */ + result.binary = FLOAT64_NAN; + return result; + } + /* inf / num */ + result.parts.exp = a.parts.exp; + result.parts.fraction = a.parts.fraction; + return result; + } + + if (isFloat64Infinity(b)) { + if (isFloat64Zero(a)) { + /* FIXME 0 / inf */ + result.parts.exp = 0; + result.parts.fraction = 0; + return result; + } + /* FIXME: num / inf*/ + result.parts.exp = 0; + result.parts.fraction = 0; + return result; + } + + if (isFloat64Zero(b)) { + if (isFloat64Zero(a)) { + /*FIXME: 0 / 0*/ + result.binary = FLOAT64_NAN; + return result; + } + /* FIXME: division by zero */ + result.parts.exp = 0; + result.parts.fraction = 0; + return result; + } + + + afrac = a.parts.fraction; + aexp = a.parts.exp; + bfrac = b.parts.fraction; + bexp = b.parts.exp; + + /* denormalized numbers */ + if (aexp == 0) { + if (afrac == 0) { + result.parts.exp = 0; + result.parts.fraction = 0; + return result; + } + /* normalize it*/ + + aexp++; + /* afrac is nonzero => it must stop */ + while (! (afrac & FLOAT64_HIDDEN_BIT_MASK) ) { + afrac <<= 1; + aexp--; + } + } + + if (bexp == 0) { + bexp++; + /* bfrac is nonzero => it must stop */ + while (! (bfrac & FLOAT64_HIDDEN_BIT_MASK) ) { + bfrac <<= 1; + bexp--; + } + } + + afrac = (afrac | FLOAT64_HIDDEN_BIT_MASK ) << (64 - FLOAT64_FRACTION_SIZE - 2 ); + bfrac = (bfrac | FLOAT64_HIDDEN_BIT_MASK ) << (64 - FLOAT64_FRACTION_SIZE - 1); + + if ( bfrac <= (afrac << 1) ) { + afrac >>= 1; + aexp++; + } + + cexp = aexp - bexp + FLOAT64_BIAS - 2; + + cfrac = divFloat64estim(afrac, bfrac); + + if (( cfrac & 0x1FF ) <= 2) { /*FIXME:?? */ + mul64integers( bfrac, cfrac, &remlo, &remhi); + /* (__u128)afrac << 64 - ( ((__u128)remhi<<64) + (__u128)remlo )*/ + remhi = afrac - remhi - ( remlo > 0); + remlo = - remlo; + + while ((int64_t) remhi < 0) { + cfrac--; + remlo += bfrac; + remhi += ( remlo < bfrac ); + } + cfrac |= ( remlo != 0 ); + } + + /* round and shift */ + result = finishFloat64(cexp, cfrac, result.parts.sign); + return result; + +} + +uint64_t divFloat64estim(uint64_t a, uint64_t b) +{ + uint64_t bhi; + uint64_t remhi, remlo; + uint64_t result; + + if ( b <= a ) { + return 0xFFFFFFFFFFFFFFFFull; + } + + bhi = b >> 32; + result = ((bhi << 32) <= a) ?( 0xFFFFFFFFull << 32) : ( a / bhi) << 32; + mul64integers(b, result, &remlo, &remhi); + + remhi = a - remhi - (remlo > 0); + remlo = - remlo; + + b <<= 32; + while ( (int64_t) remhi < 0 ) { + result -= 0x1ll << 32; + remlo += b; + remhi += bhi + ( remlo < b ); + } + remhi = (remhi << 32) | (remlo >> 32); + if (( bhi << 32) <= remhi) { + result |= 0xFFFFFFFF; + } else { + result |= remhi / bhi; + } + + + return result; +} + +/** @} + */ Index: uspace/lib/softfloat/generic/mul.c =================================================================== --- uspace/lib/softfloat/generic/mul.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/generic/mul.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,294 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +/** Multiply two 32 bit float numbers + * + */ +float32 mulFloat32(float32 a, float32 b) +{ + float32 result; + uint64_t frac1, frac2; + int32_t exp; + + result.parts.sign = a.parts.sign ^ b.parts.sign; + + if (isFloat32NaN(a) || isFloat32NaN(b) ) { + /* TODO: fix SigNaNs */ + if (isFloat32SigNaN(a)) { + result.parts.fraction = a.parts.fraction; + result.parts.exp = a.parts.exp; + return result; + }; + if (isFloat32SigNaN(b)) { /* TODO: fix SigNaN */ + result.parts.fraction = b.parts.fraction; + result.parts.exp = b.parts.exp; + return result; + }; + /* set NaN as result */ + result.binary = FLOAT32_NAN; + return result; + }; + + if (isFloat32Infinity(a)) { + if (isFloat32Zero(b)) { + /* FIXME: zero * infinity */ + result.binary = FLOAT32_NAN; + return result; + } + result.parts.fraction = a.parts.fraction; + result.parts.exp = a.parts.exp; + return result; + } + + if (isFloat32Infinity(b)) { + if (isFloat32Zero(a)) { + /* FIXME: zero * infinity */ + result.binary = FLOAT32_NAN; + return result; + } + result.parts.fraction = b.parts.fraction; + result.parts.exp = b.parts.exp; + return result; + } + + /* exp is signed so we can easy detect underflow */ + exp = a.parts.exp + b.parts.exp; + exp -= FLOAT32_BIAS; + + if (exp >= FLOAT32_MAX_EXPONENT) { + /* FIXME: overflow */ + /* set infinity as result */ + result.binary = FLOAT32_INF; + result.parts.sign = a.parts.sign ^ b.parts.sign; + return result; + }; + + if (exp < 0) { + /* FIXME: underflow */ + /* return signed zero */ + result.parts.fraction = 0x0; + result.parts.exp = 0x0; + return result; + }; + + frac1 = a.parts.fraction; + if (a.parts.exp > 0) { + frac1 |= FLOAT32_HIDDEN_BIT_MASK; + } else { + ++exp; + }; + + frac2 = b.parts.fraction; + + if (b.parts.exp > 0) { + frac2 |= FLOAT32_HIDDEN_BIT_MASK; + } else { + ++exp; + }; + + frac1 <<= 1; /* one bit space for rounding */ + + frac1 = frac1 * frac2; +/* round and return */ + + while ((exp < FLOAT32_MAX_EXPONENT) && (frac1 >= ( 1 << (FLOAT32_FRACTION_SIZE + 2)))) { + /* 23 bits of fraction + one more for hidden bit (all shifted 1 bit left)*/ + ++exp; + frac1 >>= 1; + }; + + /* rounding */ + /* ++frac1; FIXME: not works - without it is ok */ + frac1 >>= 1; /* shift off rounding space */ + + if ((exp < FLOAT32_MAX_EXPONENT) && (frac1 >= (1 << (FLOAT32_FRACTION_SIZE + 1)))) { + ++exp; + frac1 >>= 1; + }; + + if (exp >= FLOAT32_MAX_EXPONENT ) { + /* TODO: fix overflow */ + /* return infinity*/ + result.parts.exp = FLOAT32_MAX_EXPONENT; + result.parts.fraction = 0x0; + return result; + } + + exp -= FLOAT32_FRACTION_SIZE; + + if (exp <= FLOAT32_FRACTION_SIZE) { + /* denormalized number */ + frac1 >>= 1; /* denormalize */ + while ((frac1 > 0) && (exp < 0)) { + frac1 >>= 1; + ++exp; + }; + if (frac1 == 0) { + /* FIXME : underflow */ + result.parts.exp = 0; + result.parts.fraction = 0; + return result; + }; + }; + result.parts.exp = exp; + result.parts.fraction = frac1 & ( (1 << FLOAT32_FRACTION_SIZE) - 1); + + return result; + +} + +/** Multiply two 64 bit float numbers + * + */ +float64 mulFloat64(float64 a, float64 b) +{ + float64 result; + uint64_t frac1, frac2; + int32_t exp; + + result.parts.sign = a.parts.sign ^ b.parts.sign; + + if (isFloat64NaN(a) || isFloat64NaN(b) ) { + /* TODO: fix SigNaNs */ + if (isFloat64SigNaN(a)) { + result.parts.fraction = a.parts.fraction; + result.parts.exp = a.parts.exp; + return result; + }; + if (isFloat64SigNaN(b)) { /* TODO: fix SigNaN */ + result.parts.fraction = b.parts.fraction; + result.parts.exp = b.parts.exp; + return result; + }; + /* set NaN as result */ + result.binary = FLOAT64_NAN; + return result; + }; + + if (isFloat64Infinity(a)) { + if (isFloat64Zero(b)) { + /* FIXME: zero * infinity */ + result.binary = FLOAT64_NAN; + return result; + } + result.parts.fraction = a.parts.fraction; + result.parts.exp = a.parts.exp; + return result; + } + + if (isFloat64Infinity(b)) { + if (isFloat64Zero(a)) { + /* FIXME: zero * infinity */ + result.binary = FLOAT64_NAN; + return result; + } + result.parts.fraction = b.parts.fraction; + result.parts.exp = b.parts.exp; + return result; + } + + /* exp is signed so we can easy detect underflow */ + exp = a.parts.exp + b.parts.exp - FLOAT64_BIAS; + + frac1 = a.parts.fraction; + + if (a.parts.exp > 0) { + frac1 |= FLOAT64_HIDDEN_BIT_MASK; + } else { + ++exp; + }; + + frac2 = b.parts.fraction; + + if (b.parts.exp > 0) { + frac2 |= FLOAT64_HIDDEN_BIT_MASK; + } else { + ++exp; + }; + + frac1 <<= (64 - FLOAT64_FRACTION_SIZE - 1); + frac2 <<= (64 - FLOAT64_FRACTION_SIZE - 2); + + mul64integers(frac1, frac2, &frac1, &frac2); + + frac2 |= (frac1 != 0); + if (frac2 & (0x1ll << 62)) { + frac2 <<= 1; + exp--; + } + + result = finishFloat64(exp, frac2, result.parts.sign); + return result; +} + +/** Multiply two 64 bit numbers and return result in two parts + * @param a first operand + * @param b second operand + * @param lo lower part from result + * @param hi higher part of result + */ +void mul64integers(uint64_t a,uint64_t b, uint64_t *lo, uint64_t *hi) +{ + uint64_t low, high, middle1, middle2; + uint32_t alow, blow; + + alow = a & 0xFFFFFFFF; + blow = b & 0xFFFFFFFF; + + a >>= 32; + b >>= 32; + + low = ((uint64_t)alow) * blow; + middle1 = a * blow; + middle2 = alow * b; + high = a * b; + + middle1 += middle2; + high += (((uint64_t)(middle1 < middle2)) << 32) + (middle1 >> 32); + middle1 <<= 32; + low += middle1; + high += (low < middle1); + *lo = low; + *hi = high; + + return; +} + +/** @} + */ Index: uspace/lib/softfloat/generic/other.c =================================================================== --- uspace/lib/softfloat/generic/other.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/generic/other.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + + +/** @} + */ Index: uspace/lib/softfloat/generic/softfloat.c =================================================================== --- uspace/lib/softfloat/generic/softfloat.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/generic/softfloat.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,499 @@ +/* + * Copyright (c) 2005 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 softfloat generic + * @ingroup sfl + * @brief Architecture independent parts of FPU software emulation library. + * @{ + */ +/** @file + */ + +#include +#include + +#include +#include +#include +#include + +#include +#include +#include + +#include + +/* Arithmetic functions */ + +float __addsf3(float a, float b) +{ + float32 fa, fb; + fa.f = a; + fb.f = b; + if (fa.parts.sign != fb.parts.sign) { + if (fa.parts.sign) { + fa.parts.sign = 0; + return subFloat32(fb, fa).f; + }; + fb.parts.sign = 0; + return subFloat32(fa, fb).f; + } + return addFloat32(fa, fb).f; +} + +double __adddf3(double a, double b) +{ + float64 da, db; + da.d = a; + db.d = b; + if (da.parts.sign != db.parts.sign) { + if (da.parts.sign) { + da.parts.sign = 0; + return subFloat64(db, da).d; + }; + db.parts.sign = 0; + return subFloat64(da, db).d; + } + return addFloat64(da, db).d; +} + +float __subsf3(float a, float b) +{ + float32 fa, fb; + fa.f = a; + fb.f = b; + if (fa.parts.sign != fb.parts.sign) { + fb.parts.sign = !fb.parts.sign; + return addFloat32(fa, fb).f; + } + return subFloat32(fa, fb).f; +} + +double __subdf3(double a, double b) +{ + float64 da, db; + da.d = a; + db.d = b; + if (da.parts.sign != db.parts.sign) { + db.parts.sign = !db.parts.sign; + return addFloat64(da, db).d; + } + return subFloat64(da, db).d; +} + +float __mulsf3(float a, float b) +{ + float32 fa, fb; + fa.f = a; + fb.f = b; + return mulFloat32(fa, fb).f; +} + +double __muldf3(double a, double b) +{ + float64 da, db; + da.d = a; + db.d = b; + return mulFloat64(da, db).d; +} + +float __divsf3(float a, float b) +{ + float32 fa, fb; + fa.f = a; + fb.f = b; + return divFloat32(fa, fb).f; +} + +double __divdf3(double a, double b) +{ + float64 da, db; + da.d = a; + db.d = b; + return divFloat64(da, db).d; +} + +float __negsf2(float a) +{ + float32 fa; + fa.f = a; + fa.parts.sign = !fa.parts.sign; + return fa.f; +} + +double __negdf2(double a) +{ + float64 fa; + fa.d = a; + fa.parts.sign = !fa.parts.sign; + return fa.d; +} + +/* Conversion functions */ + +double __extendsfdf2(float a) +{ + float32 fa; + fa.f = a; + return convertFloat32ToFloat64(fa).d; +} + +float __truncdfsf2(double a) +{ + float64 da; + da.d = a; + return convertFloat64ToFloat32(da).f; +} + +int __fixsfsi(float a) +{ + float32 fa; + fa.f = a; + + return float32_to_int(fa); +} +int __fixdfsi(double a) +{ + float64 da; + da.d = a; + + return float64_to_int(da); +} + +long __fixsfdi(float a) +{ + float32 fa; + fa.f = a; + + return float32_to_long(fa); +} +long __fixdfdi(double a) +{ + float64 da; + da.d = a; + + return float64_to_long(da); +} + +long long __fixsfti(float a) +{ + float32 fa; + fa.f = a; + + return float32_to_longlong(fa); +} +long long __fixdfti(double a) +{ + float64 da; + da.d = a; + + return float64_to_longlong(da); +} + +unsigned int __fixunssfsi(float a) +{ + float32 fa; + fa.f = a; + + return float32_to_uint(fa); +} +unsigned int __fixunsdfsi(double a) +{ + float64 da; + da.d = a; + + return float64_to_uint(da); +} + +unsigned long __fixunssfdi(float a) +{ + float32 fa; + fa.f = a; + + return float32_to_ulong(fa); +} +unsigned long __fixunsdfdi(double a) +{ + float64 da; + da.d = a; + + return float64_to_ulong(da); +} + +unsigned long long __fixunssfti(float a) +{ + float32 fa; + fa.f = a; + + return float32_to_ulonglong(fa); +} +unsigned long long __fixunsdfti(double a) +{ + float64 da; + da.d = a; + + return float64_to_ulonglong(da); +} + +float __floatsisf(int i) +{ + float32 fa; + + fa = int_to_float32(i); + return fa.f; +} +double __floatsidf(int i) +{ + float64 da; + + da = int_to_float64(i); + return da.d; +} + +float __floatdisf(long i) +{ + float32 fa; + + fa = long_to_float32(i); + return fa.f; +} +double __floatdidf(long i) +{ + float64 da; + + da = long_to_float64(i); + return da.d; +} + +float __floattisf(long long i) +{ + float32 fa; + + fa = longlong_to_float32(i); + return fa.f; +} +double __floattidf(long long i) +{ + float64 da; + + da = longlong_to_float64(i); + return da.d; +} + +float __floatunsisf(unsigned int i) +{ + float32 fa; + + fa = uint_to_float32(i); + return fa.f; +} +double __floatunsidf(unsigned int i) +{ + float64 da; + + da = uint_to_float64(i); + return da.d; +} + +float __floatundisf(unsigned long i) +{ + float32 fa; + + fa = ulong_to_float32(i); + return fa.f; +} +double __floatundidf(unsigned long i) +{ + float64 da; + + da = ulong_to_float64(i); + return da.d; +} + +float __floatuntisf(unsigned long long i) +{ + float32 fa; + + fa = ulonglong_to_float32(i); + return fa.f; +} +double __floatuntidf(unsigned long long i) +{ + float64 da; + + da = ulonglong_to_float64(i); + return da.d; +} + +/* Comparison functions */ +/* Comparison functions */ + +/* ab .. 1 + * */ + +int __cmpsf2(float a, float b) +{ + float32 fa, fb; + fa.f = a; + fb.f = b; + if ( (isFloat32NaN(fa)) || (isFloat32NaN(fb)) ) { + return 1; /* no special constant for unordered - maybe signaled? */ + }; + + + if (isFloat32eq(fa, fb)) { + return 0; + }; + + if (isFloat32lt(fa, fb)) { + return -1; + }; + return 1; +} + +int __unordsf2(float a, float b) +{ + float32 fa, fb; + fa.f = a; + fb.f = b; + return ( (isFloat32NaN(fa)) || (isFloat32NaN(fb)) ); +} + +/** + * @return zero, if neither argument is a NaN and are equal + * */ +int __eqsf2(float a, float b) +{ + float32 fa, fb; + fa.f = a; + fb.f = b; + if ( (isFloat32NaN(fa)) || (isFloat32NaN(fb)) ) { + /* TODO: sigNaNs*/ + return 1; + }; + return isFloat32eq(fa, fb) - 1; +} + +/* strange behavior, but it was in gcc documentation */ +int __nesf2(float a, float b) +{ + return __eqsf2(a, b); +} + +/* return value >= 0 if a>=b and neither is NaN */ +int __gesf2(float a, float b) +{ + float32 fa, fb; + fa.f = a; + fb.f = b; + if ( (isFloat32NaN(fa)) || (isFloat32NaN(fb)) ) { + /* TODO: sigNaNs*/ + return -1; + }; + + if (isFloat32eq(fa, fb)) { + return 0; + }; + + if (isFloat32gt(fa, fb)) { + return 1; + }; + + return -1; +} + +/** Return negative value, if ab and neither is NaN*/ +int __gtsf2(float a, float b) +{ + float32 fa, fb; + fa.f = a; + fb.f = b; + if ( (isFloat32NaN(fa)) || (isFloat32NaN(fb)) ) { + /* TODO: sigNaNs*/ + return -1; + }; + if (isFloat32gt(fa, fb)) { + return 1; + }; + return 0; +} + +/* Other functions */ + +float __powisf2(float a, int b) +{ +/* TODO: */ + float32 fa; + fa.binary = FLOAT32_NAN; + return fa.f; +} + + +/** @} + */ + Index: uspace/lib/softfloat/generic/sub.c =================================================================== --- uspace/lib/softfloat/generic/sub.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/generic/sub.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,265 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#include +#include +#include + +/** Subtract two float32 numbers with same signs + */ +float32 subFloat32(float32 a, float32 b) +{ + int expdiff; + uint32_t exp1, exp2, frac1, frac2; + float32 result; + + result.f = 0; + + expdiff = a.parts.exp - b.parts.exp; + if ((expdiff < 0 ) || ((expdiff == 0) && (a.parts.fraction < b.parts.fraction))) { + if (isFloat32NaN(b)) { + /* TODO: fix SigNaN */ + if (isFloat32SigNaN(b)) { + }; + return b; + }; + + if (b.parts.exp == FLOAT32_MAX_EXPONENT) { + b.parts.sign = !b.parts.sign; /* num -(+-inf) = -+inf */ + return b; + } + + result.parts.sign = !a.parts.sign; + + frac1 = b.parts.fraction; + exp1 = b.parts.exp; + frac2 = a.parts.fraction; + exp2 = a.parts.exp; + expdiff *= -1; + } else { + if (isFloat32NaN(a)) { + /* TODO: fix SigNaN */ + if (isFloat32SigNaN(a) || isFloat32SigNaN(b)) { + }; + return a; + }; + + if (a.parts.exp == FLOAT32_MAX_EXPONENT) { + if (b.parts.exp == FLOAT32_MAX_EXPONENT) { + /* inf - inf => nan */ + /* TODO: fix exception */ + result.binary = FLOAT32_NAN; + return result; + }; + return a; + } + + result.parts.sign = a.parts.sign; + + frac1 = a.parts.fraction; + exp1 = a.parts.exp; + frac2 = b.parts.fraction; + exp2 = b.parts.exp; + }; + + if (exp1 == 0) { + /* both are denormalized */ + result.parts.fraction = frac1-frac2; + if (result.parts.fraction > frac1) { + /* TODO: underflow exception */ + return result; + }; + result.parts.exp = 0; + return result; + }; + + /* add hidden bit */ + frac1 |= FLOAT32_HIDDEN_BIT_MASK; + + if (exp2 == 0) { + /* denormalized */ + --expdiff; + } else { + /* normalized */ + frac2 |= FLOAT32_HIDDEN_BIT_MASK; + }; + + /* create some space for rounding */ + frac1 <<= 6; + frac2 <<= 6; + + if (expdiff > FLOAT32_FRACTION_SIZE + 1) { + goto done; + }; + + frac1 = frac1 - (frac2 >> expdiff); +done: + /* TODO: find first nonzero digit and shift result and detect possibly underflow */ + while ((exp1 > 0) && (!(frac1 & (FLOAT32_HIDDEN_BIT_MASK << 6 )))) { + --exp1; + frac1 <<= 1; + /* TODO: fix underflow - frac1 == 0 does not necessary means underflow... */ + }; + + /* rounding - if first bit after fraction is set then round up */ + frac1 += 0x20; + + if (frac1 & (FLOAT32_HIDDEN_BIT_MASK << 7)) { + ++exp1; + frac1 >>= 1; + }; + + /*Clear hidden bit and shift */ + result.parts.fraction = ((frac1 >> 6) & (~FLOAT32_HIDDEN_BIT_MASK)); + result.parts.exp = exp1; + + return result; +} + +/** Subtract two float64 numbers with same signs + */ +float64 subFloat64(float64 a, float64 b) +{ + int expdiff; + uint32_t exp1, exp2; + uint64_t frac1, frac2; + float64 result; + + result.d = 0; + + expdiff = a.parts.exp - b.parts.exp; + if ((expdiff < 0 ) || ((expdiff == 0) && (a.parts.fraction < b.parts.fraction))) { + if (isFloat64NaN(b)) { + /* TODO: fix SigNaN */ + if (isFloat64SigNaN(b)) { + }; + return b; + }; + + if (b.parts.exp == FLOAT64_MAX_EXPONENT) { + b.parts.sign = !b.parts.sign; /* num -(+-inf) = -+inf */ + return b; + } + + result.parts.sign = !a.parts.sign; + + frac1 = b.parts.fraction; + exp1 = b.parts.exp; + frac2 = a.parts.fraction; + exp2 = a.parts.exp; + expdiff *= -1; + } else { + if (isFloat64NaN(a)) { + /* TODO: fix SigNaN */ + if (isFloat64SigNaN(a) || isFloat64SigNaN(b)) { + }; + return a; + }; + + if (a.parts.exp == FLOAT64_MAX_EXPONENT) { + if (b.parts.exp == FLOAT64_MAX_EXPONENT) { + /* inf - inf => nan */ + /* TODO: fix exception */ + result.binary = FLOAT64_NAN; + return result; + }; + return a; + } + + result.parts.sign = a.parts.sign; + + frac1 = a.parts.fraction; + exp1 = a.parts.exp; + frac2 = b.parts.fraction; + exp2 = b.parts.exp; + }; + + if (exp1 == 0) { + /* both are denormalized */ + result.parts.fraction = frac1 - frac2; + if (result.parts.fraction > frac1) { + /* TODO: underflow exception */ + return result; + }; + result.parts.exp = 0; + return result; + }; + + /* add hidden bit */ + frac1 |= FLOAT64_HIDDEN_BIT_MASK; + + if (exp2 == 0) { + /* denormalized */ + --expdiff; + } else { + /* normalized */ + frac2 |= FLOAT64_HIDDEN_BIT_MASK; + }; + + /* create some space for rounding */ + frac1 <<= 6; + frac2 <<= 6; + + if (expdiff > FLOAT64_FRACTION_SIZE + 1) { + goto done; + }; + + frac1 = frac1 - (frac2 >> expdiff); +done: + /* TODO: find first nonzero digit and shift result and detect possibly underflow */ + while ((exp1 > 0) && (!(frac1 & (FLOAT64_HIDDEN_BIT_MASK << 6 )))) { + --exp1; + frac1 <<= 1; + /* TODO: fix underflow - frac1 == 0 does not necessary means underflow... */ + }; + + /* rounding - if first bit after fraction is set then round up */ + frac1 += 0x20; + + if (frac1 & (FLOAT64_HIDDEN_BIT_MASK << 7)) { + ++exp1; + frac1 >>= 1; + }; + + /*Clear hidden bit and shift */ + result.parts.fraction = ((frac1 >> 6) & (~FLOAT64_HIDDEN_BIT_MASK)); + result.parts.exp = exp1; + + return result; +} + + + /** @} + */ + Index: uspace/lib/softfloat/include/add.h =================================================================== --- uspace/lib/softfloat/include/add.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/add.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __ADD_H__ +#define __ADD_H__ + +float32 addFloat32(float32 a, float32 b); + +float64 addFloat64(float64 a, float64 b); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/include/common.h =================================================================== --- uspace/lib/softfloat/include/common.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/common.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __COMMON_H__ +#define __COMMON_H__ + +#include + +float64 finishFloat64(int32_t cexp, uint64_t cfrac, char sign); + +int countZeroes64(uint64_t i); +int countZeroes32(uint32_t i); +int countZeroes8(uint8_t i); + +void roundFloat32(int32_t *exp, uint32_t *fraction); +void roundFloat64(int32_t *exp, uint64_t *fraction); + +#endif + + /** @} + */ + Index: uspace/lib/softfloat/include/comparison.h =================================================================== --- uspace/lib/softfloat/include/comparison.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/comparison.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __COMPARISON_H__ +#define __COMPARISON_H__ + +inline int isFloat32NaN(float32 f); +inline int isFloat32SigNaN(float32 f); + +inline int isFloat32Infinity(float32 f); +inline int isFloat32Zero(float32 f); + +inline int isFloat64NaN(float64 d); +inline int isFloat64SigNaN(float64 d); + +inline int isFloat64Infinity(float64 d); +inline int isFloat64Zero(float64 d); + +inline int isFloat32eq(float32 a, float32 b); +inline int isFloat32lt(float32 a, float32 b); +inline int isFloat32gt(float32 a, float32 b); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/include/conversion.h =================================================================== --- uspace/lib/softfloat/include/conversion.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/conversion.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __CONVERSION_H__ +#define __CONVERSION_H__ + +float64 convertFloat32ToFloat64(float32 a); + +float32 convertFloat64ToFloat32(float64 a); + +uint32_t float32_to_uint32(float32 a); +int32_t float32_to_int32(float32 a); + +uint64_t float32_to_uint64(float32 a); +int64_t float32_to_int64(float32 a); + +uint64_t float64_to_uint64(float64 a); +int64_t float64_to_int64(float64 a); + +uint32_t float64_to_uint32(float64 a); +int32_t float64_to_int32(float64 a); + +float32 uint32_to_float32(uint32_t i); +float32 int32_to_float32(int32_t i); + +float32 uint64_to_float32(uint64_t i); +float32 int64_to_float32(int64_t i); + +float64 uint32_to_float64(uint32_t i); +float64 int32_to_float64(int32_t i); + +float64 uint64_to_float64(uint64_t i); +float64 int64_to_float64(int64_t i); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/include/div.h =================================================================== --- uspace/lib/softfloat/include/div.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/div.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __DIV_H__ +#define __DIV_H__ + +float32 divFloat32(float32 a, float32 b); +float64 divFloat64(float64 a, float64 b); + +uint64_t divFloat64estim(uint64_t a, uint64_t b); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/include/mul.h =================================================================== --- uspace/lib/softfloat/include/mul.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/mul.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __MUL_H__ +#define __MUL_H__ + +float32 mulFloat32(float32 a, float32 b); + +float64 mulFloat64(float64 a, float64 b); + +void mul64integers(uint64_t a,uint64_t b, uint64_t *lo, uint64_t *hi); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/include/other.h =================================================================== --- uspace/lib/softfloat/include/other.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/other.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __OTHER_H__ +#define __OTHER_H__ + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/include/sftypes.h =================================================================== --- uspace/lib/softfloat/include/sftypes.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/sftypes.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __SFTYPES_H__ +#define __SFTYPES_H__ + +#include +#include + +typedef union { + float f; + uint32_t binary; + + struct { + #if __BYTE_ORDER == __BIG_ENDIAN + uint32_t sign:1; + uint32_t exp:8; + uint32_t fraction:23; + #elif __BYTE_ORDER == __LITTLE_ENDIAN + uint32_t fraction:23; + uint32_t exp:8; + uint32_t sign:1; + #else + #error "Unknown endians." + #endif + } parts __attribute__ ((packed)); + } float32; + +typedef union { + double d; + uint64_t binary; + + struct { + #if __BYTE_ORDER == __BIG_ENDIAN + uint64_t sign:1; + uint64_t exp:11; + uint64_t fraction:52; + #elif __BYTE_ORDER == __LITTLE_ENDIAN + uint64_t fraction:52; + uint64_t exp:11; + uint64_t sign:1; + #else + #error "Unknown endians." + #endif + } parts __attribute__ ((packed)); + } float64; + +#define FLOAT32_MAX 0x7f800000 +#define FLOAT32_MIN 0xff800000 +#define FLOAT64_MAX +#define FLOAT64_MIN + +/* For recognizing NaNs or infinity use isFloat32NaN and is Float32Inf, comparing with this constants is not sufficient */ +#define FLOAT32_NAN 0x7FC00001 +#define FLOAT32_SIGNAN 0x7F800001 +#define FLOAT32_INF 0x7F800000 + +#define FLOAT64_NAN 0x7FF8000000000001ll +#define FLOAT64_SIGNAN 0x7FF0000000000001ll +#define FLOAT64_INF 0x7FF0000000000000ll + +#define FLOAT32_FRACTION_SIZE 23 +#define FLOAT64_FRACTION_SIZE 52 + +#define FLOAT32_HIDDEN_BIT_MASK 0x800000 +#define FLOAT64_HIDDEN_BIT_MASK 0x10000000000000ll + +#define FLOAT32_MAX_EXPONENT 0xFF +#define FLOAT64_MAX_EXPONENT 0x7FF + +#define FLOAT32_BIAS 0x7F +#define FLOAT64_BIAS 0x3FF +#define FLOAT80_BIAS 0x3FFF + + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/include/softfloat.h =================================================================== --- uspace/lib/softfloat/include/softfloat.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/softfloat.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,174 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __SOFTFLOAT_H__ +#define __SOFTFLOAT_H__ + +float __addsf3(float a, float b); +double __adddf3(double a, double b); +long double __addtf3(long double a, long double b); +long double __addxf3(long double a, long double b); + +float __subsf3(float a, float b); +double __subdf3(double a, double b); +long double __subtf3(long double a, long double b); +long double __subxf3(long double a, long double b); + +float __mulsf3(float a, float b); +double __muldf3(double a, double b); +long double __multf3(long double a, long double b); +long double __mulxf3(long double a, long double b); + +float __divsf3(float a, float b); +double __divdf3(double a, double b); +long double __divtf3(long double a, long double b); +long double __divxf3(long double a, long double b); + +float __negsf2(float a); +double __negdf2(double a); +long double __negtf2(long double a); +long double __negxf2(long double a); + +double __extendsfdf2(float a); +long double __extendsftf2(float a); +long double __extendsfxf2(float a); +long double __extenddftf2(double a); +long double __extenddfxf2(double a); + +double __truncxfdf2(long double a); +double __trunctfdf2(long double a); +float __truncxfsf2(long double a); +float __trunctfsf2(long double a); +float __truncdfsf2(double a); + +int __fixsfsi(float a); +int __fixdfsi(double a); +int __fixtfsi(long double a); +int __fixxfsi(long double a); + +long __fixsfdi(float a); +long __fixdfdi(double a); +long __fixtfdi(long double a); +long __fixxfdi(long double a); + +long long __fixsfti(float a); +long long __fixdfti(double a); +long long __fixtfti(long double a); +long long __fixxfti(long double a); + +unsigned int __fixunssfsi(float a); +unsigned int __fixunsdfsi(double a); +unsigned int __fixunstfsi(long double a); +unsigned int __fixunsxfsi(long double a); + +unsigned long __fixunssfdi(float a); +unsigned long __fixunsdfdi(double a); +unsigned long __fixunstfdi(long double a); +unsigned long __fixunsxfdi(long double a); + +unsigned long long __fixunssfti(float a); +unsigned long long __fixunsdfti(double a); +unsigned long long __fixunstfti(long double a); +unsigned long long __fixunsxfti(long double a); + +float __floatsisf(int i); +double __floatsidf(int i); +long double __floatsitf(int i); +long double __floatsixf(int i); + +float __floatdisf(long i); +double __floatdidf(long i); +long double __floatditf(long i); +long double __floatdixf(long i); + +float __floattisf(long long i); +double __floattidf(long long i); +long double __floattitf(long long i); +long double __floattixf(long long i); + +float __floatunsisf(unsigned int i); +double __floatunsidf(unsigned int i); +long double __floatunsitf(unsigned int i); +long double __floatunsixf(unsigned int i); + +float __floatundisf(unsigned long i); +double __floatundidf(unsigned long i); +long double __floatunditf(unsigned long i); +long double __floatundixf(unsigned long i); + +float __floatuntisf(unsigned long long i); +double __floatuntidf(unsigned long long i); +long double __floatuntitf(unsigned long long i); +long double __floatuntixf(unsigned long long i); + +int __cmpsf2(float a, float b); +int __cmpdf2(double a, double b); +int __cmptf2(long double a, long double b); + +int __unordsf2(float a, float b); +int __unorddf2(double a, double b); +int __unordtf2(long double a, long double b); + +int __eqsf2(float a, float b); +int __eqdf2(double a, double b); +int __eqtf2(long double a, long double b); + +int __nesf2(float a, float b); +int __nedf2(double a, double b); +int __netf2(long double a, long double b); + +int __gesf2(float a, float b); +int __gedf2(double a, double b); +int __getf2(long double a, long double b); + +int __ltsf2(float a, float b); +int __ltdf2(double a, double b); +int __lttf2(long double a, long double b); +int __lesf2(float a, float b); +int __ledf2(double a, double b); +int __letf2(long double a, long double b); + +int __gtsf2(float a, float b); +int __gtdf2(double a, double b); +int __gttf2(long double a, long double b); + +/* Not implemented yet*/ +float __powisf2(float a, int b); + +#endif + + + /** @} + */ + Index: uspace/lib/softfloat/include/sub.h =================================================================== --- uspace/lib/softfloat/include/sub.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softfloat/include/sub.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2005 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 softfloat + * @{ + */ +/** @file + */ + +#ifndef __SUB_H__ +#define __SUB_H__ + +float32 subFloat32(float32 a, float32 b); + +float64 subFloat64(float64 a, float64 b); + +#endif + + + /** @} + */ + Index: uspace/lib/softint/Makefile =================================================================== --- uspace/lib/softint/Makefile (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softint/Makefile (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,73 @@ +# +# 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. +# + +## Common compiler flags +# + +LIBC_PREFIX = ../libc +## Setup toolchain +# + +include $(LIBC_PREFIX)/Makefile.toolchain + +CFLAGS += -Iinclude + +## Sources +# + +ARCH_SOURCES = + +GENERIC_SOURCES = \ + generic/division.c + +GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) + +.PHONY: all clean depend + +all: libsoftint.a + +-include Makefile.depend + +clean: + -rm -f libsoftint.a Makefile.depend + find generic/ -name '*.o' -follow -exec rm \{\} \; + +depend: + -makedepend $(DEFS) $(CFLAGS) -f - $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null + +libsoftint.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS) + $(AR) rc libsoftint.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS) + +%.o: %.S + $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@ + +%.o: %.s + $(AS) $(AFLAGS) $< -o $@ + +%.o: %.c + $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ Index: uspace/lib/softint/generic/division.c =================================================================== --- uspace/lib/softint/generic/division.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softint/generic/division.c (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,197 @@ +/* + * 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 softint + * @{ + */ +/** + * @file + * SW implementation of 32 and 64 bit division and modulo. + */ + +#include + +#define ABSVAL(x) ( (x) > 0 ? (x) : -(x)) +#define SGN(x) ( (x) >= 0 ? 1 : 0 ) + +static unsigned int divandmod32(unsigned int a, unsigned int b, unsigned int *remainder) +{ + unsigned int result; + int steps = sizeof(unsigned int) * 8; + + *remainder = 0; + result = 0; + + if (b == 0) { + /* FIXME: division by zero */ + return 0; + } + + if ( a < b) { + *remainder = a; + return 0; + } + + for ( ; steps > 0; steps--) { + /* shift one bit to remainder */ + *remainder = ( (*remainder) << 1) | (( a >> 31) & 0x1); + result <<= 1; + + if (*remainder >= b) { + *remainder -= b; + result |= 0x1; + } + a <<= 1; + } + + return result; +} + + +static unsigned long long divandmod64(unsigned long long a, unsigned long long b, unsigned long long *remainder) +{ + unsigned long long result; + int steps = sizeof(unsigned long long) * 8; + + *remainder = 0; + result = 0; + + if (b == 0) { + /* FIXME: division by zero */ + return 0; + } + + if ( a < b) { + *remainder = a; + return 0; + } + + for ( ; steps > 0; steps--) { + /* shift one bit to remainder */ + *remainder = ( (*remainder) << 1) | ((a >> 63) & 0x1); + result <<= 1; + + if (*remainder >= b) { + *remainder -= b; + result |= 0x1; + } + a <<= 1; + } + + return result; +} + +/* 32bit integer division */ +int __divsi3(int a, int b) +{ + unsigned int rem; + int result; + + result = (int)divandmod32(ABSVAL(a), ABSVAL(b), &rem); + + if ( SGN(a) == SGN(b)) return result; + return -result; +} + +/* 64bit integer division */ +long long __divdi3(long long a, long long b) +{ + unsigned long long rem; + long long result; + + result = (long long)divandmod64(ABSVAL(a), ABSVAL(b), &rem); + + if ( SGN(a) == SGN(b)) return result; + return -result; +} + +/* 32bit unsigned integer division */ +unsigned int __udivsi3(unsigned int a, unsigned int b) +{ + unsigned int rem; + return divandmod32(a, b, &rem); +} + +/* 64bit unsigned integer division */ +unsigned long long __udivdi3(unsigned long long a, unsigned long long b) +{ + unsigned long long rem; + return divandmod64(a, b, &rem); +} + +/* 32bit remainder of the signed division */ +int __modsi3(int a, int b) +{ + unsigned int rem; + divandmod32(a, b, &rem); + + /* if divident is negative, remainder must be too */ + if (!(SGN(a))) { + return -((int)rem); + } + + return (int)rem; +} + +/* 64bit remainder of the signed division */ +long long __moddi3(long long a,long long b) +{ + unsigned long long rem; + divandmod64(a, b, &rem); + + /* if divident is negative, remainder must be too */ + if (!(SGN(a))) { + return -((long long)rem); + } + + return (long long)rem; +} + +/* 32bit remainder of the unsigned division */ +unsigned int __umodsi3(unsigned int a, unsigned int b) +{ + unsigned int rem; + divandmod32(a, b, &rem); + return rem; +} + +/* 64bit remainder of the unsigned division */ +unsigned long long __umoddi3(unsigned long long a, unsigned long long b) +{ + unsigned long long rem; + divandmod64(a, b, &rem); + return rem; +} + +unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b, unsigned long long *c) +{ + return divandmod64(a, b, c); +} + +/** @} + */ Index: uspace/lib/softint/include/division.h =================================================================== --- uspace/lib/softint/include/division.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) +++ uspace/lib/softint/include/division.h (revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0) @@ -0,0 +1,70 @@ +/* + * 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 softint + * @{ + */ +/** + * @file + */ + +#ifndef __SOFTINT_DIVISION_H__ +#define __SOFTINT_DIVISION_H__ + + +/* 32bit integer division */ +int __divsi3(int a, int b); + +/* 64bit integer division */ +long long __divdi3(long long a, long long b); + +/* 32bit unsigned integer division */ +unsigned int __udivsi3(unsigned int a, unsigned int b); + +/* 64bit unsigned integer division */ +unsigned long long __udivdi3(unsigned long long a, unsigned long long b); + +/* 32bit remainder of the signed division */ +int __modsi3(int a, int b); + +/* 64bit remainder of the signed division */ +long long __moddi3(long long a, long long b); + +/* 32bit remainder of the unsigned division */ +unsigned int __umodsi3(unsigned int a, unsigned int b); + +/* 64bit remainder of the unsigned division */ +unsigned long long __umoddi3(unsigned long long a, unsigned long long b); + +unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b, unsigned long long *c); + +#endif + +/** @} + */ +