Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/Makefile (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -113,5 +113,6 @@ generic/arg_parse.c \ generic/sort.c \ - generic/stats.c + generic/stats.c \ + generic/assert.c \ SOURCES = \ Index: uspace/lib/c/Makefile.toolchain =================================================================== --- uspace/lib/c/Makefile.toolchain (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,128 +1,0 @@ -# -# Copyright (C) 2005 Martin Decky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \ - -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ - -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ - -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ - -Werror-implicit-function-declaration -pipe -g -D__$(ENDIANESS)__ - -ICC_CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \ - -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ - -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ - -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ - -Werror-implicit-function-declaration -pipe -g -D__$(ENDIANESS)__ - -CLANG_CFLAGS = -I$(LIBC_PREFIX)/include -O3 -imacros $(LIBC_PREFIX)/../../../config.h \ - -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ - -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \ - -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \ - -Werror-implicit-function-declaration -pipe -g -arch $(CLANG_ARCH) \ - -D__$(ENDIANESS)__ - -LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a -AFLAGS = - -## Cross-toolchain prefix -# - -ifndef CROSS_PREFIX - CROSS_PREFIX = /usr/local -endif - -## Setup platform configuration -# - --include $(LIBC_PREFIX)/../../../Makefile.config --include $(LIBC_PREFIX)/../../../config.defs --include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc - -## Simple detection of the host system -# -HOST = $(shell uname) - -## On Solaris, some utilities have different names -# -ifeq ($(HOST),SunOS) - BINUTILS_PREFIX = "g" -else - BINUTILS_PREFIX = "" -endif - -## Toolchain configuration -# - -JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py - -ifeq ($(COMPILER),gcc_cross) - CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc - GCC = $(CC) - 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 - CFLAGS = $(GCC_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif - -ifeq ($(COMPILER),gcc_native) - CC = gcc - GCC = $(CC) - AS = $(BINUTILS_PREFIX)as - LD = $(BINUTILS_PREFIX)ld - AR = $(BINUTILS_PREFIX)ar - OBJCOPY = $(BINUTILS_PREFIX)objcopy - OBJDUMP = $(BINUTILS_PREFIX)objdump - CFLAGS = $(GCC_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif - -ifeq ($(COMPILER),icc) - CC = icc - GCC = gcc - AS = as - LD = ld - AR = ar - OBJCOPY = objcopy - OBJDUMP = objdump - CFLAGS = $(ICC_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif - -ifeq ($(COMPILER),clang) - CC = clang - GCC = gcc - AS = $(BINUTILS_PREFIX)as - LD = $(BINUTILS_PREFIX)ld - AR = $(BINUTILS_PREFIX)ar - OBJCOPY = $(BINUTILS_PREFIX)objcopy - OBJDUMP = $(BINUTILS_PREFIX)objdump - CFLAGS = $(CLANG_CFLAGS) - DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) -endif Index: uspace/lib/c/arch/amd64/include/limits.h =================================================================== --- uspace/lib/c/arch/amd64/include/limits.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcamd64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_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/c/arch/arm32/include/limits.h =================================================================== --- uspace/lib/c/arch/arm32/include/limits.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcarm32 - * @{ - */ -/** @file - * @brief 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/c/arch/ia32/include/config.h =================================================================== --- uspace/lib/c/arch/ia32/include/config.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/arch/ia32/include/config.h (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -36,6 +36,9 @@ #define LIBC_ia32_CONFIG_H_ -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define USER_ADDRESS_SPACE_START_ARCH UINT32_C(0x00000000) +#define USER_ADDRESS_SPACE_END_ARCH UINT32_C(0x7fffffff) #endif Index: uspace/lib/c/arch/ia32/include/ddi.h =================================================================== --- uspace/lib/c/arch/ia32/include/ddi.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/arch/ia32/include/ddi.h (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -37,5 +37,5 @@ #include -#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) +#define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) static inline uint8_t pio_read_8(ioport8_t *port) Index: uspace/lib/c/arch/ia32/include/faddr.h =================================================================== --- uspace/lib/c/arch/ia32/include/faddr.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/arch/ia32/include/faddr.h (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -38,5 +38,5 @@ #include -#define FADDR(fptr) ((uintptr_t) (fptr)) +#define FADDR(fptr) ((uintptr_t) (fptr)) #endif Index: uspace/lib/c/arch/ia32/include/fibril.h =================================================================== --- uspace/lib/c/arch/ia32/include/fibril.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/arch/ia32/include/fibril.h (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -42,5 +42,5 @@ * panic sooner or later */ -#define SP_DELTA (12) +#define SP_DELTA 12 #define context_set(c, _pc, stack, size, ptls) \ @@ -51,6 +51,7 @@ (c)->ebp = 0; \ } while (0) - -/* We include only registers that must be preserved + +/* + * We include only registers that must be preserved * during function call */ Index: uspace/lib/c/arch/ia32/include/limits.h =================================================================== --- uspace/lib/c/arch/ia32/include/limits.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup 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/c/arch/ia32/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/ia32/src/stacktrace.c (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/arch/ia32/src/stacktrace.c (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -35,16 +35,16 @@ */ +#include #include #include - #include -#define FRAME_OFFSET_FP_PREV 0 -#define FRAME_OFFSET_RA 4 +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 4 bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) { (void) st; - return fp != 0; + return (fp != 0) && (fp <= USER_ADDRESS_SPACE_END_ARCH); } Index: uspace/lib/c/arch/ia64/_link.ld.in =================================================================== --- uspace/lib/c/arch/ia64/_link.ld.in (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/arch/ia64/_link.ld.in (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -22,5 +22,6 @@ .got : { - _gp = .; + /* Tell the linker where we expect GP to point. */ + __gp = .; *(.got .got.*); } :data Index: uspace/lib/c/arch/ia64/include/limits.h =================================================================== --- uspace/lib/c/arch/ia64/include/limits.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcia64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_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/c/arch/ia64/src/entry.s =================================================================== --- uspace/lib/c/arch/ia64/src/entry.s (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/arch/ia64/src/entry.s (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -39,5 +39,5 @@ __entry: alloc loc0 = ar.pfs, 0, 1, 2, 0 - movl gp = _gp + movl gp = __gp # Pass PCB pointer as the first argument to __main Index: uspace/lib/c/arch/ia64/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/ia64/src/thread_entry.s (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/arch/ia64/src/thread_entry.s (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -37,5 +37,5 @@ alloc loc0 = ar.pfs, 0, 1, 1, 0 - movl gp = _gp + movl gp = __gp # Index: uspace/lib/c/arch/mips32/include/limits.h =================================================================== --- uspace/lib/c/arch/mips32/include/limits.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup 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/c/arch/mips32eb/include/limits.h =================================================================== --- uspace/lib/c/arch/mips32eb/include/limits.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,1 +1,0 @@ -../../mips32/include/limits.h Index: uspace/lib/c/arch/ppc32/include/limits.h =================================================================== --- uspace/lib/c/arch/ppc32/include/limits.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcppc32 - * @{ - */ -/** @file - */ - -#ifndef LIBC_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/c/arch/sparc64/include/limits.h =================================================================== --- uspace/lib/c/arch/sparc64/include/limits.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libcsparc64 - * @{ - */ -/** @file - */ - -#ifndef LIBC_sparc64_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/c/generic/assert.c =================================================================== --- uspace/lib/c/generic/assert.c (revision 74c8f34494162616317c01dd0cbff697b306111a) +++ uspace/lib/c/generic/assert.c (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2011 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 + * @{ + */ + +#include +#include +#include +#include + +void assert_abort(const char *cond, const char *file, unsigned int line) +{ + printf("Assertion failed (%s) in file \"%s\", line %u.\n", + cond, file, line); + stacktrace_print(); + abort(); +} + +/** @} + */ Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/generic/async.c (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -102,4 +102,6 @@ #include #include +#include +#include #include "private/async.h" Index: uspace/lib/c/generic/async_sess.c =================================================================== --- uspace/lib/c/generic/async_sess.c (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/generic/async_sess.c (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -105,4 +105,5 @@ #include #include +#include #include "private/async_sess.h" Index: uspace/lib/c/generic/errno.c =================================================================== --- uspace/lib/c/generic/errno.c (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/generic/errno.c (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -36,5 +36,10 @@ #include -int _errno; +static fibril_local int fibril_errno; + +int *__errno(void) +{ + return &fibril_errno; +} /** @} Index: uspace/lib/c/generic/fibril_synch.c =================================================================== --- uspace/lib/c/generic/fibril_synch.c (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/generic/fibril_synch.c (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -43,4 +43,5 @@ #include #include +#include #include "private/async.h" Index: uspace/lib/c/generic/malloc.c =================================================================== --- uspace/lib/c/generic/malloc.c (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/generic/malloc.c (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -44,4 +44,5 @@ #include #include +#include #include #include "private/malloc.h" Index: uspace/lib/c/generic/stacktrace.c =================================================================== --- uspace/lib/c/generic/stacktrace.c (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/generic/stacktrace.c (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -61,9 +61,11 @@ stacktrace_prepare(); stacktrace_print_fp_pc(stacktrace_fp_get(), stacktrace_pc_get()); + /* * Prevent the tail call optimization of the previous call by * making it a non-tail call. */ - (void) stacktrace_fp_get(); + + printf("-- end of stack trace --\n"); } Index: uspace/lib/c/include/assert.h =================================================================== --- uspace/lib/c/include/assert.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/include/assert.h (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -40,5 +40,5 @@ * * If NDEBUG is not set, the assert() macro - * evaluates expr and if it is false prints + * evaluates expr and if it is false prints * error message and terminate program. * @@ -47,16 +47,10 @@ */ -#include -#include - #ifndef NDEBUG #define assert(expr) \ do { \ - if (!(expr)) { \ - printf("Assertion failed (%s) at file '%s', " \ - "line %d.\n", #expr, __FILE__, __LINE__); \ - abort(); \ - } \ + if (!(expr)) \ + assert_abort(#expr, __FILE__, __LINE__); \ } while (0) @@ -67,4 +61,7 @@ #endif /* NDEBUG */ +extern void assert_abort(const char *, const char *, unsigned int) + __attribute__((noreturn)); + #endif Index: uspace/lib/c/include/errno.h =================================================================== --- uspace/lib/c/include/errno.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/include/errno.h (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -39,7 +39,7 @@ #include -#define errno _errno +#define errno (*(__errno())) -extern int _errno; +extern int *__errno(void) __attribute__((const)); #define EMFILE (-18) Index: uspace/lib/c/include/fibril_synch.h =================================================================== --- uspace/lib/c/include/fibril_synch.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ uspace/lib/c/include/fibril_synch.h (revision 74c8f34494162616317c01dd0cbff697b306111a) @@ -36,12 +36,12 @@ #define LIBC_FIBRIL_SYNCH_H_ -#include #include #include #include #include +#include typedef struct { - fibril_owner_info_t oi; /* Keep this the first thing. */ + fibril_owner_info_t oi; /**< Keep this the first thing. */ int counter; link_t waiters; @@ -64,5 +64,5 @@ typedef struct { - fibril_owner_info_t oi; /* Keep this the first thing. */ + fibril_owner_info_t oi; /**< Keep this the first thing. */ unsigned writers; unsigned readers; Index: uspace/lib/c/include/limits.h =================================================================== --- uspace/lib/c/include/limits.h (revision 82582e4b3fc0fb2c1cdcef538faa051d1123f9a0) +++ (revision ) @@ -1,74 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup 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 - -/** @} - */