Index: uspace/lib/libc/arch/amd64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/amd64/Makefile.inc (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/amd64/Makefile.inc (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -37,5 +37,6 @@ arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -fno-omit-frame-pointer Index: uspace/lib/libc/arch/amd64/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/amd64/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/amd64/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_amd64_INTTYPES_H_ +#define LIBC_amd64_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "lld" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "llo" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "llu" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "llx" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "llX" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/amd64/include/istate.h =================================================================== --- uspace/lib/libc/arch/amd64/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/amd64/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_ISTATE_H_ +#define LIBC_amd64_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rsi; + uint64_t rdi; + uint64_t r8; + uint64_t r9; + uint64_t r10; + uint64_t r11; + uint64_t rbp; + uint64_t error_word; + uint64_t rip; + uint64_t cs; + uint64_t rflags; + uint64_t stack[]; /* Additional data on stack */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->rip; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->rbp; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/amd64/include/types.h =================================================================== --- uspace/lib/libc/arch/amd64/include/types.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/amd64/include/types.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -36,4 +36,6 @@ #define LIBC_amd64_TYPES_H_ +#define __64_BITS__ + typedef unsigned long long sysarg_t; Index: uspace/lib/libc/arch/amd64/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/amd64/src/stacktrace.S (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ (revision ) @@ -1,55 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - movq %rbp, %rax - ret - -frame_pointer_prev: - movq (%rdi), %rax - ret - -frame_pointer_validate: - movq %rdi, %rax - ret - -return_address_get: - movq 8(%rdi), %rax - ret - -program_counter_get: - movq (%rsp), %rax - ret Index: uspace/lib/libc/arch/amd64/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/amd64/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/amd64/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 amd64 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 8 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/amd64/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/amd64/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/amd64/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,44 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + ret + +stacktrace_fp_get: + movq %rbp, %rax + ret + +stacktrace_pc_get: + movq (%rsp), %rax + ret Index: uspace/lib/libc/arch/arm32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/arm32/Makefile.inc (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/arm32/Makefile.inc (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -38,5 +38,6 @@ arch/$(UARCH)/src/tls.c \ arch/$(UARCH)/src/eabi.S \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -ffixed-r9 -mtp=soft -mapcs-frame -fno-omit-frame-pointer Index: uspace/lib/libc/arch/arm32/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/arm32/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/arm32/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcarm32 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_arm32_INTTYPES_H_ +#define LIBC_arm32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/istate.h =================================================================== --- uspace/lib/libc/arch/arm32/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/arm32/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcarm32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_arm32__ISTATE_H_ +#define LIBC_arm32__ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t spsr; + uint32_t sp; + uint32_t lr; + + uint32_t r0; + uint32_t r1; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + uint32_t fp; + uint32_t r12; + + uint32_t pc; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->pc; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->fp; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/types.h =================================================================== --- uspace/lib/libc/arch/arm32/include/types.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/arm32/include/types.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -37,4 +37,6 @@ #define LIBC_arm32_TYPES_H_ +#define __32_BITS__ + typedef unsigned int sysarg_t; Index: uspace/lib/libc/arch/arm32/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/arm32/src/stacktrace.S (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ (revision ) @@ -1,55 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - mov r0, fp - mov pc, lr - -frame_pointer_prev: - ldr r0, [r0, #-12] - mov pc, lr - -frame_pointer_validate: - mov pc, lr - -return_address_get: - ldr r0, [r0, #-4] - mov pc, lr - -program_counter_get: - mov r0, lr - mov pc, lr - Index: uspace/lib/libc/arch/arm32/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/arm32/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/arm32/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcarm32 arm32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV -12 +#define FRAME_OFFSET_RA -4 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/arm32/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/arm32/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/arm32/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,44 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + mov pc, lr + +stacktrace_fp_get: + mov r0, fp + mov pc, lr + +stacktrace_pc_get: + mov r0, lr + mov pc, lr Index: uspace/lib/libc/arch/ia32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ia32/Makefile.inc (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/ia32/Makefile.inc (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -38,5 +38,6 @@ arch/$(UARCH)/src/tls.c \ arch/$(UARCH)/src/setjmp.S \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -march=pentium Index: uspace/lib/libc/arch/ia32/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/ia32/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ia32/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_ia32_INTTYPES_H_ +#define LIBC_ia32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/include/istate.h =================================================================== --- uspace/lib/libc/arch/ia32/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ia32/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup debug + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32__ISTATE_H_ +#define LIBC_ia32__ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t eax; + uint32_t ecx; + uint32_t edx; + uint32_t ebp; + + uint32_t gs; + uint32_t fs; + uint32_t es; + uint32_t ds; + + uint32_t error_word; + uint32_t eip; + uint32_t cs; + uint32_t eflags; + uint32_t stack[]; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->eip; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->ebp; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/include/types.h =================================================================== --- uspace/lib/libc/arch/ia32/include/types.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/ia32/include/types.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -36,4 +36,6 @@ #define LIBC_ia32_TYPES_H_ +#define __32_BITS__ + typedef unsigned int sysarg_t; Index: uspace/lib/libc/arch/ia32/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/ia32/src/stacktrace.S (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ (revision ) @@ -1,57 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - movl %ebp, %eax - ret - -frame_pointer_prev: - movl 4(%esp), %eax - movl (%eax), %eax - ret - -frame_pointer_validate: - movl 4(%esp), %eax - ret - -return_address_get: - movl 4(%esp), %eax - movl 4(%eax), %eax - ret - -program_counter_get: - movl (%esp), %eax - ret Index: uspace/lib/libc/arch/ia32/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/ia32/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ia32/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 ia32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 4 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/ia32/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/ia32/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ia32/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,44 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + ret + +stacktrace_fp_get: + movl %ebp, %eax + ret + +stacktrace_pc_get: + movl (%esp), %eax + ret Index: uspace/lib/libc/arch/ia64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ia64/Makefile.inc (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/ia64/Makefile.inc (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -37,5 +37,6 @@ arch/$(UARCH)/src/tls.c \ arch/$(UARCH)/src/ddi.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -fno-unwind-tables Index: uspace/lib/libc/arch/ia64/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/ia64/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ia64/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libia64 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_ia64_INTTYPES_H_ +#define LIBC_ia64_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "ld" +#define PRIdPTR "ld" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "lo" +#define PRIoPTR "lo" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "lu" +#define PRIuPTR "lu" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "lx" +#define PRIxPTR "lx" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "lX" +#define PRIXPTR "lX" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/istate.h =================================================================== --- uspace/lib/libc/arch/ia64/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ia64/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_ISTATE_H_ +#define LIBC_ia64_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + /* TODO */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + /* TODO */ + return 0; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/types.h =================================================================== --- uspace/lib/libc/arch/ia64/include/types.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/ia64/include/types.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -36,4 +36,6 @@ #define LIBC_ia64_TYPES_H_ +#define __64_BITS__ + typedef unsigned long long sysarg_t; Index: uspace/lib/libc/arch/ia64/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/ia64/src/stacktrace.S (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ (revision ) @@ -1,43 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: -frame_pointer_prev: -frame_pointer_validate: -return_address_get: -program_counter_get: - mov r8 = r0 - br.ret.sptk.many b0 Index: uspace/lib/libc/arch/ia64/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/ia64/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ia64/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia64 ia64 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include +#include + +#include + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; (void) fp; + return false; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + (void) st; (void) fp; (void) prev; + return ENOTSUP; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + (void) st; (void) fp; (void) ra; + return ENOTSUP; +} + +/** @} + */ Index: uspace/lib/libc/arch/ia64/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/ia64/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ia64/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,41 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + br.ret.sptk.many b0 + +stacktrace_fp_get: +stacktrace_pc_get: + mov r8 = r0 + br.ret.sptk.many b0 Index: uspace/lib/libc/arch/mips32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/mips32/Makefile.inc (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/mips32/Makefile.inc (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -36,5 +36,6 @@ arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -mips3 Index: uspace/lib/libc/arch/mips32/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/mips32/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/mips32/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips32 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_mips32_INTTYPES_H_ +#define LIBC_mips32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "x" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/include/istate.h =================================================================== --- uspace/lib/libc/arch/mips32/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/mips32/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips32__ISTATE_H_ +#define LIBC_mips32__ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t at; + uint32_t v0; + uint32_t v1; + uint32_t a0; + uint32_t a1; + uint32_t a2; + uint32_t a3; + uint32_t t0; + uint32_t t1; + uint32_t t2; + uint32_t t3; + uint32_t t4; + uint32_t t5; + uint32_t t6; + uint32_t t7; + uint32_t t8; + uint32_t t9; + uint32_t gp; + uint32_t sp; + uint32_t ra; + + uint32_t lo; + uint32_t hi; + + uint32_t status; /* cp0_status */ + uint32_t epc; /* cp0_epc */ + uint32_t k1; /* We use it as thread-local pointer */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->epc; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/include/types.h =================================================================== --- uspace/lib/libc/arch/mips32/include/types.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/mips32/include/types.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -37,4 +37,6 @@ #define LIBC_mips32_TYPES_H_ +#define __32_BITS__ + typedef unsigned int sysarg_t; Index: uspace/lib/libc/arch/mips32/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/mips32/src/stacktrace.S (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ (revision ) @@ -1,46 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.set noat -.set noreorder - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: -frame_pointer_prev: -frame_pointer_validate: -return_address_get: -program_counter_get: - j $ra - xor $v0, $v0 Index: uspace/lib/libc/arch/mips32/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/mips32/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/mips32/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips32 mips32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include +#include + +#include + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; (void) fp; + return false; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + (void) st; (void) fp; (void) prev; + return ENOTSUP; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + (void) st; (void) fp; (void) ra; + return ENOTSUP; +} + +/** @} + */ Index: uspace/lib/libc/arch/mips32/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/mips32/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/mips32/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,42 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.set noat +.set noreorder + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: +stacktrace_fp_get: +stacktrace_pc_get: + j $ra + xor $v0, $v0 Index: uspace/lib/libc/arch/mips32eb/Makefile.inc =================================================================== --- uspace/lib/libc/arch/mips32eb/Makefile.inc (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/mips32eb/Makefile.inc (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -36,5 +36,6 @@ arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -mips3 Index: uspace/lib/libc/arch/mips32eb/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/mips32eb/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,1 @@ +../../mips32/include/inttypes.h Index: uspace/lib/libc/arch/mips32eb/include/istate.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/mips32eb/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,1 @@ +../../mips32/include/istate.h Index: uspace/lib/libc/arch/ppc32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ppc32/Makefile.inc (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/ppc32/Makefile.inc (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -36,5 +36,6 @@ arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -mcpu=powerpc -msoft-float -m32 Index: uspace/lib/libc/arch/ppc32/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ppc32/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcppc32 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_ppc32_INTTYPES_H_ +#define LIBC_ppc32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/include/istate.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ppc32/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_ISTATE_H_ +#define LIBC_ppc32_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t r0; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + uint32_t r11; + uint32_t r13; + uint32_t r14; + uint32_t r15; + uint32_t r16; + uint32_t r17; + uint32_t r18; + uint32_t r19; + uint32_t r20; + uint32_t r21; + uint32_t r22; + uint32_t r23; + uint32_t r24; + uint32_t r25; + uint32_t r26; + uint32_t r27; + uint32_t r28; + uint32_t r29; + uint32_t r30; + uint32_t r31; + uint32_t cr; + uint32_t pc; + uint32_t srr1; + uint32_t lr; + uint32_t ctr; + uint32_t xer; + uint32_t dar; + uint32_t r12; + uint32_t sp; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->pc; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->sp; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/include/types.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/types.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/ppc32/include/types.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -36,4 +36,6 @@ #define LIBC_ppc32_TYPES_H_ +#define __32_BITS__ + typedef unsigned int sysarg_t; Index: uspace/lib/libc/arch/ppc32/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/ppc32/src/stacktrace.S (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ (revision ) @@ -1,56 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -#include - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - mr r3, sp - blr - -frame_pointer_prev: - lwz r3, 0(r3) - blr - -frame_pointer_validate: - blr - -return_address_get: - lwz r3, 4(r3) - blr - -program_counter_get: - mflr r3 - blr Index: uspace/lib/libc/arch/ppc32/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/ppc32/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ppc32/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcppc32 ppc32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 4 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/ppc32/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/ppc32/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,46 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +#include + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + blr + +stacktrace_fp_get: + mr r3, sp + blr + +stacktrace_pc_get: + mflr r3 + blr Index: uspace/lib/libc/arch/sparc64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/sparc64/Makefile.inc (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/sparc64/Makefile.inc (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -35,5 +35,6 @@ ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -mcpu=ultrasparc -m64 Index: uspace/lib/libc/arch/sparc64/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/sparc64/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcsparc64 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_sparc64_INTTYPES_H_ +#define LIBC_sparc64_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "lld" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "llo" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "llu" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "llx" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "llX" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/include/istate.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/sparc64/include/istate.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_ISTATE_H_ +#define LIBC_sparc64_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + /* TODO */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + /* TODO */ + return 0; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/include/types.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/types.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/arch/sparc64/include/types.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -36,4 +36,6 @@ #define LIBC_sparc64_TYPES_H_ +#define __64_BITS__ + typedef unsigned long sysarg_t; Index: uspace/lib/libc/arch/sparc64/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/sparc64/src/stacktrace.S (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ (revision ) @@ -1,71 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -#include - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - # Add the stack bias to %sp to get the actual address. - retl - add %sp, STACK_BIAS, %o0 - -frame_pointer_prev: - save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp - # Flush all other windows to memory so that we can read their contents. - flushw - # Read the %fp from the window save area. - ldx [%i0 + 14 * 8], %i0 - # Add the stack bias to the %fp read from the window save area. - add %i0, STACK_BIAS, %i0 - ret - restore - -frame_pointer_validate: - retl - nop - -return_address_get: - save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp - # Flush all other windows to memory so that we can read their contents. - flushw - # Read the %i7 from the window save area. - ldx [%i0 + 15 * 8], %i0 - ret - restore - -program_counter_get: - retl - mov %o7, %o0 - Index: uspace/lib/libc/arch/sparc64/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/sparc64/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/sparc64/src/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup sparc64 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV (14 * 8) +#define FRAME_OFFSET_RA (15 * 8) + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + uintptr_t bprev; + int rc; + + rc = (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, &bprev); + if (rc == EOK) + *prev = bprev + STACK_BIAS; + return rc; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/sparc64/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/arch/sparc64/src/stacktrace_asm.S (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,51 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +#include + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp + # Flush all other windows to memory so that we can read their contents. + flushw + ret + restore + +stacktrace_fp_get: + # Add the stack bias to %sp to get the actual address. + retl + add %sp, STACK_BIAS, %o0 + +stacktrace_pc_get: + retl + mov %o7, %o0 Index: uspace/lib/libc/generic/stacktrace.c =================================================================== --- uspace/lib/libc/generic/stacktrace.c (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/generic/stacktrace.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda * All rights reserved. * @@ -36,22 +37,40 @@ #include #include +#include -void stack_trace_fp_pc(uintptr_t fp, uintptr_t pc) +static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data); + +void stacktrace_print_fp_pc(uintptr_t fp, uintptr_t pc) { - while (frame_pointer_validate(fp)) { + stacktrace_t st; + uintptr_t nfp; + + st.op_arg = NULL; + st.read_uintptr = stacktrace_read_uintptr; + + while (stacktrace_fp_valid(&st, fp)) { printf("%p: %p()\n", fp, pc); - pc = return_address_get(fp); - fp = frame_pointer_prev(fp); + (void) stacktrace_ra_get(&st, fp, &pc); + (void) stacktrace_fp_prev(&st, fp, &nfp); + fp = nfp; } } -void stack_trace(void) +void stacktrace_print(void) { - stack_trace_fp_pc(frame_pointer_get(), program_counter_get()); + 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) frame_pointer_get(); + (void) stacktrace_fp_get(); +} + +static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data) +{ + (void) arg; + *data = *((uintptr_t *) addr); + return EOK; } Index: uspace/lib/libc/generic/udebug.c =================================================================== --- uspace/lib/libc/generic/udebug.c (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/generic/udebug.c (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -69,4 +69,34 @@ } +int udebug_name_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed) +{ + ipcarg_t a_copied, a_needed; + int rc; + + rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_NAME_READ, + (sysarg_t)buffer, n, NULL, &a_copied, &a_needed); + + *copied = (size_t)a_copied; + *needed = (size_t)a_needed; + + return rc; +} + +int udebug_areas_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed) +{ + ipcarg_t a_copied, a_needed; + int rc; + + rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_AREAS_READ, + (sysarg_t)buffer, n, NULL, &a_copied, &a_needed); + + *copied = (size_t)a_copied; + *needed = (size_t)a_needed; + + return rc; +} + int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n) { @@ -78,4 +108,10 @@ { return async_req_3_0(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_ARGS_READ, + tid, (sysarg_t)buffer); +} + +int udebug_regs_read(int phoneid, thash_t tid, void *buffer) +{ + return async_req_3_0(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_REGS_READ, tid, (sysarg_t)buffer); } Index: uspace/lib/libc/include/inttypes.h =================================================================== --- uspace/lib/libc/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/include/inttypes.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_INTTYPES_H_ +#define LIBC_INTTYPES_H_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/include/ipc/adb.h =================================================================== --- uspace/lib/libc/include/ipc/adb.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/include/ipc/adb.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcipc + * @{ + */ +/** @file + * @brief ADB device interface. + */ + +#ifndef LIBC_IPC_ADB_H_ +#define LIBC_IPC_ADB_H_ + +#include + +typedef enum { + ADB_REG_WRITE = IPC_FIRST_USER_METHOD +} adb_request_t; + + +typedef enum { + ADB_REG_NOTIF = IPC_FIRST_USER_METHOD +} adb_notif_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/include/stacktrace.h =================================================================== --- uspace/lib/libc/include/stacktrace.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/include/stacktrace.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda * All rights reserved. * @@ -39,15 +40,22 @@ #include -extern void stack_trace(void); -extern void stack_trace_fp_pc(uintptr_t, uintptr_t); +typedef struct { + void *op_arg; + int (*read_uintptr)(void *, uintptr_t, uintptr_t *); +} stacktrace_t; + +extern void stacktrace_print(void); +extern void stacktrace_print_fp_pc(uintptr_t, uintptr_t); /* * The following interface is to be implemented by each architecture. */ -extern bool frame_pointer_validate(uintptr_t); -extern uintptr_t frame_pointer_get(void); -extern uintptr_t frame_pointer_prev(uintptr_t); -extern uintptr_t return_address_get(uintptr_t); -extern uintptr_t program_counter_get(); +extern bool stacktrace_fp_valid(stacktrace_t *, uintptr_t); +extern int stacktrace_fp_prev(stacktrace_t *, uintptr_t, uintptr_t *); +extern int stacktrace_ra_get(stacktrace_t *, uintptr_t, uintptr_t *); + +extern void stacktrace_prepare(void); +extern uintptr_t stacktrace_fp_get(void); +extern uintptr_t stacktrace_pc_get(); #endif Index: uspace/lib/libc/include/stdlib.h =================================================================== --- uspace/lib/libc/include/stdlib.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/include/stdlib.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -42,5 +42,5 @@ #define abort() \ do { \ - stack_trace(); \ + stacktrace_print(); \ _exit(1); \ } while (0) Index: uspace/lib/libc/include/sys/typefmt.h =================================================================== --- uspace/lib/libc/include/sys/typefmt.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) +++ uspace/lib/libc/include/sys/typefmt.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file Formatting macros for types from sys/types.h and some other + * system types. + */ + +#ifndef LIBC_SYS_TYPEFMT_H_ +#define LIBC_SYS_TYPEFMT_H_ + +#include + +/* off_t */ +#define PRIdOFF "ld" +#define PRIuOFF "lu" +#define PRIxOFF "lx" +#define PRIXOFF "lX" + +/* bn_t */ +#define PRIdBN PRId64 +#define PRIuBN PRIu64 +#define PRIxBN PRIx64 +#define PRIXBN PRIX64 + +/* (s)size_t */ +#define PRIdSIZE PRIdPTR +#define PRIuSIZE PRIuPTR +#define PRIxSIZE PRIxPTR +#define PRIXSIZE PRIXPTR + +/* sysarg_t */ +#define PRIdSYSARG PRIdPTR +#define PRIuSYSARG PRIuPTR +#define PRIxSYSARG PRIxPTR +#define PRIXSYSARG PRIxPTR + +/* ipcarg_t */ +#define PRIdIPCARG PRIdPTR +#define PRIuIPCARG PRIuPTR +#define PRIxIPCARG PRIxPTR +#define PRIXIPCARG PRIXPTR + +/* taskid_t */ +#define PRIdTASKID PRId64 +#define PRIuTASKID PRIu64 +#define PRIxTASKID PRIx64 +#define PRIXTASKID PRIx64 + +#endif + +/** @} + */ Index: uspace/lib/libc/include/udebug.h =================================================================== --- uspace/lib/libc/include/udebug.h (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ uspace/lib/libc/include/udebug.h (revision 7d6f7d2b21be2ad76c0bd09a71d0a5510212b096) @@ -47,6 +47,11 @@ int udebug_thread_read(int phoneid, void *buffer, size_t n, size_t *copied, size_t *needed); +int udebug_name_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed); +int udebug_areas_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed); int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n); int udebug_args_read(int phoneid, thash_t tid, sysarg_t *buffer); +int udebug_regs_read(int phoneid, thash_t tid, void *buffer); int udebug_go(int phoneid, thash_t tid, udebug_event_t *ev_type, sysarg_t *val0, sysarg_t *val1); Index: uspace/lib/libpci/Makefile.build =================================================================== --- uspace/lib/libpci/Makefile.build (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ (revision ) @@ -1,64 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -## Setup toolchain -# - -include Makefile.common -include $(LIBC_PREFIX)/Makefile.toolchain - -## Sources -# - -SOURCES = \ - access.c \ - generic.c \ - names.c \ - i386-ports.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all - -all: $(LIBPCI) - --include $(DEPEND) - -$(LIBPCI): $(OBJECTS) - $(AR) rc $@ $(OBJECTS) - -%.o: %.c $(DEPEND) - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ -ifeq ($(PRECHECK),y) - $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) -endif - -$(DEPEND): - makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null - -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/lib/libpci/Makefile.common =================================================================== --- uspace/lib/libpci/Makefile.common (revision 64bc4b64c8edb8a4e08c8eeeb6c7e60eadcf8a39) +++ (revision ) @@ -1,37 +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. -# - - -## Common names -# - -LIBC_PREFIX = ../../../../../lib/libc -DEPEND = Makefile.depend -DEPEND_PREV = $(DEPEND).prev -JOB = libpci.job -LIBPCI = libpci.a