Index: kernel/arch/amd64/Makefile.inc =================================================================== --- kernel/arch/amd64/Makefile.inc (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/amd64/Makefile.inc (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -38,5 +38,5 @@ FPU_NO_CFLAGS = -mno-sse -mno-sse2 -CMN1 = -m64 -mcmodel=kernel -mno-red-zone -fno-unwind-tables +CMN1 = -m64 -mcmodel=kernel -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer GCC_CFLAGS += $(CMN1) ICC_CFLAGS += $(CMN1) @@ -60,4 +60,6 @@ arch/$(KARCH)/src/boot/boot.S \ arch/$(KARCH)/src/boot/memmap.c \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/debug/stacktrace_asm.S \ arch/$(KARCH)/src/pm.c \ arch/$(KARCH)/src/context.S \ Index: kernel/arch/amd64/_link.ld.in =================================================================== --- kernel/arch/amd64/_link.ld.in (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/amd64/_link.ld.in (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -44,4 +44,5 @@ *(COMMON); /* global variables */ + . = ALIGN(8); symbol_table = .; *(symtab.*); /* Symbol table, must be LAST symbol!*/ Index: kernel/arch/amd64/include/context.h =================================================================== --- kernel/arch/amd64/include/context.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/amd64/include/context.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -46,4 +46,11 @@ #define SP_DELTA 16 +#define context_set(c, _pc, stack, size) \ + do { \ + (c)->pc = (uintptr_t) (_pc); \ + (c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \ + (c)->rbp = 0; \ + } while (0) + #endif /* KERNEL */ Index: kernel/arch/amd64/include/interrupt.h =================================================================== --- kernel/arch/amd64/include/interrupt.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/amd64/include/interrupt.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -70,5 +70,5 @@ /** This is passed to interrupt handlers */ -typedef struct { +typedef struct istate { uint64_t rax; uint64_t rcx; @@ -80,4 +80,5 @@ uint64_t r10; uint64_t r11; + uint64_t rbp; uint64_t error_word; uint64_t rip; @@ -101,4 +102,8 @@ return istate->rip; } +static inline unative_t istate_get_fp(istate_t *istate) +{ + return istate->rbp; +} extern void (* disable_irqs_function)(uint16_t irqmask); Index: kernel/arch/amd64/src/asm_utils.S =================================================================== --- kernel/arch/amd64/src/asm_utils.S (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/amd64/src/asm_utils.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -27,5 +27,5 @@ # -#define IREGISTER_SPACE 72 +#define IREGISTER_SPACE 80 #define IOFFSET_RAX 0x0 @@ -38,4 +38,5 @@ #define IOFFSET_R10 0x38 #define IOFFSET_R11 0x40 +#define IOFFSET_RBP 0x48 # Mask for interrupts 0 - 31 (bits 0 - 31) where 0 means that int has no error word @@ -179,4 +180,5 @@ movq %r10, IOFFSET_R10(%rsp) movq %r11, IOFFSET_R11(%rsp) + movq %rbp, IOFFSET_RBP(%rsp) .endm @@ -191,4 +193,5 @@ movq IOFFSET_R10(%rsp), %r10 movq IOFFSET_R11(%rsp), %r11 + movq IOFFSET_RBP(%rsp), %rbp .endm @@ -235,4 +238,7 @@ cld + # Stop stack traces here + xorq %rbp, %rbp + movq $(\i), %rdi # %rdi - first parameter movq %rsp, %rsi # %rsi - pointer to istate Index: kernel/arch/amd64/src/boot/boot.S =================================================================== --- kernel/arch/amd64/src/boot/boot.S (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/amd64/src/boot/boot.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -174,4 +174,8 @@ call arch_pre_main + # create the first stack frame + pushq $0 + movq %rsp, %rbp + call main_bsp @@ -329,11 +333,11 @@ extended_cpuid_msg: - .asciz "Extended CPUID not supported. System halted." + .asciz "Error: Extended CPUID not supported -- CPU is not 64-bit. System halted." long_mode_msg: - .asciz "64 bit long mode not supported. System halted." + .asciz "Error: 64-bit long mode not supported. System halted." noexecute_msg: - .asciz "No-execute pages not supported. System halted." + .asciz "Error: No-execute pages not supported. System halted." fx_msg: - .asciz "FXSAVE/FXRESTORE instructions not supported. System halted." + .asciz "Error: FXSAVE/FXRESTORE instructions not supported. System halted." sse2_msg: - .asciz "SSE2 instructions not supported. System halted." + .asciz "Error: SSE2 instructions not supported. System halted." Index: kernel/arch/amd64/src/debug/stacktrace.c =================================================================== --- kernel/arch/amd64/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/amd64/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup amd64 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 1 + +bool kernel_frame_pointer_validate(uintptr_t fp) +{ + return fp != 0; +} + +bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + uint64_t *stack = (void *) fp; + *prev = stack[FRAME_OFFSET_FP_PREV]; + return true; +} + +bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + uint64_t *stack = (void *) fp; + *ra = stack[FRAME_OFFSET_RA]; + return true; +} + +bool uspace_frame_pointer_validate(uintptr_t fp) +{ + return fp != 0; +} + +bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return !copy_from_uspace((void *) prev, + (uint64_t *) fp + FRAME_OFFSET_FP_PREV, sizeof(*prev)); +} + +bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return !copy_from_uspace((void *) ra, (uint64_t *) fp + FRAME_OFFSET_RA, + sizeof(*ra)); +} + +/** @} + */ Index: kernel/arch/amd64/src/debug/stacktrace_asm.S =================================================================== --- kernel/arch/amd64/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/amd64/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,40 @@ +# +# Copyright (c) 2010 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 program_counter_get + +frame_pointer_get: + movq %rbp, %rax + ret + +program_counter_get: + movq (%rsp), %rax + ret Index: kernel/arch/amd64/src/interrupt.c =================================================================== --- kernel/arch/amd64/src/interrupt.c (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/amd64/src/interrupt.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -53,4 +53,5 @@ #include #include +#include /* @@ -80,4 +81,6 @@ istate->r10, istate->r11); printf("%%rsp=%#llx\n", &istate->stack[0]); + + stack_trace_istate(istate); } Index: kernel/arch/amd64/src/mm/page.c =================================================================== --- kernel/arch/amd64/src/mm/page.c (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/amd64/src/mm/page.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -203,5 +203,6 @@ { if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) - panic("Unable to map physical memory %p (%d bytes).", physaddr, size) + panic("Unable to map physical memory %p (%d bytes).", physaddr, + size); uintptr_t virtaddr = PA2KA(last_frame); Index: kernel/arch/amd64/src/smp/ap.S =================================================================== --- kernel/arch/amd64/src/smp/ap.S (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/amd64/src/smp/ap.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -99,4 +99,6 @@ start64: movq (ctx), %rsp + pushq $0 + movq %rsp, %rbp call main_ap - AP_BOOT_OFFSET + BOOT_OFFSET # never returns Index: kernel/arch/arm32/Makefile.inc =================================================================== --- kernel/arch/arm32/Makefile.inc (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/arm32/Makefile.inc (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -57,4 +57,6 @@ arch/$(KARCH)/src/exception.c \ arch/$(KARCH)/src/userspace.c \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/debug/stacktrace_asm.S \ arch/$(KARCH)/src/mm/as.c \ arch/$(KARCH)/src/mm/frame.c \ Index: kernel/arch/arm32/_link.ld.in =================================================================== --- kernel/arch/arm32/_link.ld.in (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/arm32/_link.ld.in (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -34,4 +34,5 @@ *(.sdata); *(.reginfo); + . = ALIGN(8); symbol_table = .; *(symtab.*); Index: kernel/arch/arm32/include/exception.h =================================================================== --- kernel/arch/arm32/include/exception.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/arm32/include/exception.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -86,5 +86,5 @@ /** Struct representing CPU state saved when an exception occurs. */ -typedef struct { +typedef struct istate { uint32_t spsr; uint32_t sp; @@ -133,4 +133,9 @@ } +static inline unative_t istate_get_fp(istate_t *istate) +{ + return istate->r11; +} + extern void install_exception_handlers(void); Index: kernel/arch/arm32/src/debug/stacktrace.c =================================================================== --- kernel/arch/arm32/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/arm32/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup arm32 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +bool kernel_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +bool uspace_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +/** @} + */ Index: kernel/arch/arm32/src/debug/stacktrace_asm.S =================================================================== --- kernel/arch/arm32/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/arm32/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,38 @@ +# +# Copyright (c) 2010 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 program_counter_get + +frame_pointer_get: + mov pc, lr + +program_counter_get: + mov pc, lr Index: kernel/arch/arm32/src/mm/page.c =================================================================== --- kernel/arch/arm32/src/mm/page.c (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/arm32/src/mm/page.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -88,5 +88,5 @@ KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) { panic("Unable to map physical memory %p (%d bytes).", - physaddr, size) + physaddr, size); } Index: kernel/arch/ia32/Makefile.inc =================================================================== --- kernel/arch/ia32/Makefile.inc (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia32/Makefile.inc (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -78,4 +78,6 @@ arch/$(KARCH)/src/context.S \ arch/$(KARCH)/src/debug/panic.s \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/debug/stacktrace_asm.S \ arch/$(KARCH)/src/delay.s \ arch/$(KARCH)/src/asm.S \ Index: kernel/arch/ia32/_link.ld.in =================================================================== --- kernel/arch/ia32/_link.ld.in (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia32/_link.ld.in (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -42,4 +42,5 @@ hardcoded_unmapped_kdata_size = .; LONG(unmapped_kdata_end - unmapped_kdata_start); + . = ALIGN(8); symbol_table = .; *(symtab.*); /* Symbol table, must be LAST symbol! */ Index: kernel/arch/ia32/include/context.h =================================================================== --- kernel/arch/ia32/include/context.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia32/include/context.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -49,4 +49,11 @@ #define SP_DELTA (8 + STACK_ITEM_SIZE) +#define context_set(c, _pc, stack, size) \ + do { \ + (c)->pc = (uintptr_t) (_pc); \ + (c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \ + (c)->ebp = 0; \ + } while (0) + #endif /* KERNEL */ Index: kernel/arch/ia32/include/interrupt.h =================================================================== --- kernel/arch/ia32/include/interrupt.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia32/include/interrupt.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -69,8 +69,9 @@ #define VECTOR_DEBUG_IPI (IVT_FREEBASE + 2) -typedef struct { +typedef struct istate { uint32_t eax; uint32_t ecx; uint32_t edx; + uint32_t ebp; uint32_t gs; @@ -102,4 +103,9 @@ } +static inline unative_t istate_get_fp(istate_t *istate) +{ + return istate->ebp; +} + extern void (* disable_irqs_function)(uint16_t irqmask); extern void (* enable_irqs_function)(uint16_t irqmask); Index: kernel/arch/ia32/src/asm.S =================================================================== --- kernel/arch/ia32/src/asm.S (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia32/src/asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -269,4 +269,5 @@ pushl %gs + pushl %ebp pushl %edx pushl %ecx @@ -278,5 +279,6 @@ movw %ax, %es - cld + # stop stack traces here + xorl %ebp, %ebp pushl %esp # *istate @@ -290,4 +292,5 @@ popl %ecx popl %edx + popl %ebp popl %gs Index: kernel/arch/ia32/src/boot/boot.S =================================================================== --- kernel/arch/ia32/src/boot/boot.S (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia32/src/boot/boot.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -94,4 +94,8 @@ pushl grub_eax call arch_pre_main + + # Create the first stack frame + pushl $0 + movl %esp, %ebp call main_bsp Index: kernel/arch/ia32/src/debug/stacktrace.c =================================================================== --- kernel/arch/ia32/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/ia32/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 1 + +bool kernel_frame_pointer_validate(uintptr_t fp) +{ + return fp != 0; +} + +bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + uint32_t *stack = (void *) fp; + *prev = stack[FRAME_OFFSET_FP_PREV]; + return true; +} + +bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + uint32_t *stack = (void *) fp; + *ra = stack[FRAME_OFFSET_RA]; + return true; +} + +bool uspace_frame_pointer_validate(uintptr_t fp) +{ + return fp != 0; +} + +bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return !copy_from_uspace((void *) prev, + (uint32_t *) fp + FRAME_OFFSET_FP_PREV, sizeof(*prev)); +} + +bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return !copy_from_uspace((void *) ra, (uint32_t *) fp + FRAME_OFFSET_RA, + sizeof(*ra)); +} + +/** @} + */ Index: kernel/arch/ia32/src/debug/stacktrace_asm.S =================================================================== --- kernel/arch/ia32/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/ia32/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,40 @@ +# +# Copyright (c) 2010 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 program_counter_get + +frame_pointer_get: + movl %ebp, %eax + ret + +program_counter_get: + movl (%esp), %eax + ret Index: kernel/arch/ia32/src/interrupt.c =================================================================== --- kernel/arch/ia32/src/interrupt.c (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia32/src/interrupt.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -53,4 +53,5 @@ #include #include +#include /* @@ -79,4 +80,6 @@ printf("stack: %#lx, %#lx, %#lx, %#lx\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]); printf(" %#lx, %#lx, %#lx, %#lx\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]); + + stack_trace_istate(istate); } Index: kernel/arch/ia32/src/mm/page.c =================================================================== --- kernel/arch/ia32/src/mm/page.c (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia32/src/mm/page.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -80,5 +80,5 @@ { if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) - panic("Unable to map physical memory %p (%d bytes).", physaddr, size) + panic("Unable to map physical memory %p (%d bytes).", physaddr, size); uintptr_t virtaddr = PA2KA(last_frame); Index: kernel/arch/ia32/src/smp/ap.S =================================================================== --- kernel/arch/ia32/src/smp/ap.S (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia32/src/smp/ap.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -78,4 +78,7 @@ addl $0x80000000, %esp # PA2KA(ctx.sp) + pushl $0 # create the first stack frame + movl %esp, %ebp + jmpl $KTEXT, $main_ap Index: kernel/arch/ia64/Makefile.inc =================================================================== --- kernel/arch/ia64/Makefile.inc (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia64/Makefile.inc (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -53,4 +53,6 @@ arch/$(KARCH)/src/context.S \ arch/$(KARCH)/src/cpu/cpu.c \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/debug/stacktrace_asm.S \ arch/$(KARCH)/src/ivt.S \ arch/$(KARCH)/src/interrupt.c \ Index: kernel/arch/ia64/_link.ld.in =================================================================== --- kernel/arch/ia64/_link.ld.in (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia64/_link.ld.in (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -37,4 +37,5 @@ *(COMMON); + . = ALIGN(8); symbol_table = .; *(symtab.*); /* Symbol table, must be LAST symbol!*/ Index: kernel/arch/ia64/include/interrupt.h =================================================================== --- kernel/arch/ia64/include/interrupt.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia64/include/interrupt.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -72,5 +72,5 @@ #define EOI 0 /**< The actual value doesn't matter. */ -typedef struct { +typedef struct istate { uint128_t f2; uint128_t f3; @@ -143,4 +143,9 @@ } +static inline unative_t istate_get_fp(istate_t *istate) +{ + return 0; /* FIXME */ +} + static inline int istate_from_uspace(istate_t *istate) { Index: kernel/arch/ia64/include/mm/asid.h =================================================================== --- kernel/arch/ia64/include/mm/asid.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia64/include/mm/asid.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -50,14 +50,16 @@ * but those extra bits are not used by the kernel. */ -#define RIDS_PER_ASID 7 +#define RIDS_PER_ASID 8 #define RID_MAX 262143 /* 2^18 - 1 */ -#define RID_KERNEL 0 -#define RID_INVALID 1 +#define RID_KERNEL7 7 -#define ASID2RID(asid, vrn) (((asid)>RIDS_PER_ASID)?(((asid)*RIDS_PER_ASID)+(vrn)):(asid)) -#define RID2ASID(rid) ((rid)/RIDS_PER_ASID) +#define ASID2RID(asid, vrn) \ + ((asid) * RIDS_PER_ASID + (vrn)) -#define ASID_MAX_ARCH (RID_MAX/RIDS_PER_ASID) +#define RID2ASID(rid) \ + ((rid) / RIDS_PER_ASID) + +#define ASID_MAX_ARCH (RID_MAX / RIDS_PER_ASID) #endif Index: kernel/arch/ia64/src/debug/stacktrace.c =================================================================== --- kernel/arch/ia64/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/ia64/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia64 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +bool kernel_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +bool uspace_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +/** @} + */ Index: kernel/arch/ia64/src/debug/stacktrace_asm.S =================================================================== --- kernel/arch/ia64/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/ia64/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,40 @@ +# +# Copyright (c) 2010 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 program_counter_get + +frame_pointer_get: + mov r8 = r0 + br.ret.sptk.many b0 + +program_counter_get: + mov r8 = r0 + br.ret.sptk.many b0 Index: kernel/arch/ia64/src/mm/page.c =================================================================== --- kernel/arch/ia64/src/mm/page.c (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia64/src/mm/page.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -71,26 +71,12 @@ /* - * First set up kernel region register. - * This is redundant (see start.S) but we keep it here just for sure. - */ - rr.word = rr_read(VRN_KERNEL); - rr.map.ve = 0; /* disable VHPT walker */ - rr.map.ps = PAGE_WIDTH; - rr.map.rid = ASID2RID(ASID_KERNEL, VRN_KERNEL); - rr_write(VRN_KERNEL, rr.word); - srlz_i(); - srlz_d(); - - /* - * And setup the rest of region register. + * Set up kernel region registers. + * VRN_KERNEL has already been set in start.S. + * For paranoia reasons, we set it again. */ for(i = 0; i < REGION_REGISTERS; i++) { - /* skip kernel rr */ - if (i == VRN_KERNEL) - continue; - rr.word = rr_read(i); rr.map.ve = 0; /* disable VHPT walker */ - rr.map.rid = RID_KERNEL; + rr.map.rid = ASID2RID(ASID_KERNEL, i); rr.map.ps = PAGE_WIDTH; rr_write(i, rr.word); Index: kernel/arch/ia64/src/start.S =================================================================== --- kernel/arch/ia64/src/start.S (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ia64/src/start.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -74,5 +74,5 @@ movl r10 = (RR_MASK) and r9 = r10, r9 - movl r10 = ((RID_KERNEL << RID_SHIFT) | (KERNEL_PAGE_WIDTH << PS_SHIFT)) + movl r10 = (((RID_KERNEL7) << RID_SHIFT) | (KERNEL_PAGE_WIDTH << PS_SHIFT)) or r9 = r10, r9 Index: kernel/arch/mips32/Makefile.inc =================================================================== --- kernel/arch/mips32/Makefile.inc (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/mips32/Makefile.inc (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -70,4 +70,6 @@ arch/$(KARCH)/src/debugger.c \ arch/$(KARCH)/src/cpu/cpu.c \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/debug/stacktrace_asm.S \ arch/$(KARCH)/src/mm/frame.c \ arch/$(KARCH)/src/mm/page.c \ Index: kernel/arch/mips32/_link.ld.in =================================================================== --- kernel/arch/mips32/_link.ld.in (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/mips32/_link.ld.in (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -38,4 +38,5 @@ *(.bss); /* uninitialized static variables */ *(COMMON); /* global variables */ + . = ALIGN(8); symbol_table = .; *(symtab.*); Index: kernel/arch/mips32/include/exception.h =================================================================== --- kernel/arch/mips32/include/exception.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/mips32/include/exception.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -58,5 +58,5 @@ #define EXC_VCED 31 -typedef struct { +typedef struct istate { uint32_t at; uint32_t v0; @@ -102,4 +102,8 @@ return istate->epc; } +static inline unative_t istate_get_fp(istate_t *istate) +{ + return 0; /* FIXME */ +} extern void exception(istate_t *istate); Index: kernel/arch/mips32/src/debug/stacktrace.c =================================================================== --- kernel/arch/mips32/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/mips32/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup mips32 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +bool kernel_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +bool uspace_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +/** @} + */ Index: kernel/arch/mips32/src/debug/stacktrace_asm.S =================================================================== --- kernel/arch/mips32/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/mips32/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,43 @@ +# +# Copyright (c) 2010 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 program_counter_get + +frame_pointer_get: + j $ra + xor $v0, $v0 + +program_counter_get: + j $ra + xor $v0, $v0 Index: kernel/arch/ppc32/Makefile.inc =================================================================== --- kernel/arch/ppc32/Makefile.inc (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ppc32/Makefile.inc (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -46,4 +46,6 @@ arch/$(KARCH)/src/context.S \ arch/$(KARCH)/src/debug/panic.s \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/debug/stacktrace_asm.S \ arch/$(KARCH)/src/fpu_context.S \ arch/$(KARCH)/src/boot/boot.S \ Index: kernel/arch/ppc32/_link.ld.in =================================================================== --- kernel/arch/ppc32/_link.ld.in (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ppc32/_link.ld.in (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -51,4 +51,5 @@ *(COMMON); /* global variables */ + . = ALIGN(8); symbol_table = .; *(symtab.*); /* Symbol table, must be LAST symbol!*/ Index: kernel/arch/ppc32/include/exception.h =================================================================== --- kernel/arch/ppc32/include/exception.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ppc32/include/exception.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -39,5 +39,5 @@ #include -typedef struct { +typedef struct istate { uint32_t r0; uint32_t r2; @@ -98,4 +98,9 @@ } +static inline unative_t istate_get_fp(istate_t *istate) +{ + return istate->sp; +} + #endif Index: kernel/arch/ppc32/src/debug/stacktrace.c =================================================================== --- kernel/arch/ppc32/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/ppc32/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ppc32 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +bool kernel_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +bool uspace_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +/** @} + */ Index: kernel/arch/ppc32/src/debug/stacktrace_asm.S =================================================================== --- kernel/arch/ppc32/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/ppc32/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,38 @@ +# +# Copyright (c) 2010 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 program_counter_get + +frame_pointer_get: + blr + +program_counter_get: + blr Index: kernel/arch/ppc32/src/mm/page.c =================================================================== --- kernel/arch/ppc32/src/mm/page.c (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/ppc32/src/mm/page.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -51,5 +51,5 @@ KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) panic("Unable to map physical memory %p (%" PRIs " bytes).", - physaddr, size) + physaddr, size); uintptr_t virtaddr = PA2KA(last_frame); Index: kernel/arch/sparc64/Makefile.inc =================================================================== --- kernel/arch/sparc64/Makefile.inc (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/sparc64/Makefile.inc (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -54,4 +54,6 @@ ARCH_SOURCES = \ arch/$(KARCH)/src/cpu/cpu.c \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/debug/stacktrace_asm.S \ arch/$(KARCH)/src/asm.S \ arch/$(KARCH)/src/panic.S \ Index: kernel/arch/sparc64/_link.ld.in =================================================================== --- kernel/arch/sparc64/_link.ld.in (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/sparc64/_link.ld.in (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -36,4 +36,5 @@ *(COMMON); /* global variables */ + . = ALIGN(8); symbol_table = .; *(symtab.*); /* Symbol table, must be LAST symbol!*/ Index: kernel/arch/sparc64/include/interrupt.h =================================================================== --- kernel/arch/sparc64/include/interrupt.h (revision 03a447629f9551ddecdf060bfcbf8b615b241e55) +++ kernel/arch/sparc64/include/interrupt.h (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -50,5 +50,5 @@ }; -typedef struct { +typedef struct istate { uint64_t tnpc; uint64_t tpc; @@ -71,4 +71,9 @@ } +static inline unative_t istate_get_fp(istate_t *istate) +{ + return 0; /* TODO */ +} + #endif Index: kernel/arch/sparc64/src/debug/stacktrace.c =================================================================== --- kernel/arch/sparc64/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/sparc64/src/debug/stacktrace.c (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup sparc64 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +bool kernel_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +bool uspace_frame_pointer_validate(uintptr_t fp) +{ + return false; +} + +bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev) +{ + return false; +} + +bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra) +{ + return false; +} + +/** @} + */ Index: kernel/arch/sparc64/src/debug/stacktrace_asm.S =================================================================== --- kernel/arch/sparc64/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) +++ kernel/arch/sparc64/src/debug/stacktrace_asm.S (revision 070e05aa939a4cbaed698ba35f5d2f7a7efee35c) @@ -0,0 +1,41 @@ +# +# Copyright (c) 2010 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 program_counter_get + +frame_pointer_get: + retl + nop + +program_counter_get: + retl + nop +