Changes in / [439ba77:fd608dc] in mainline

Location:

kernel/arch/arm32

Files:

• Makefile.inc (modified) (1 diff)
• include/context.h (modified) (2 diffs)
• include/exception.h (modified) (2 diffs)
• src/debug/stacktrace.c (modified) (1 diff)
• src/debug/stacktrace_asm.S (modified) (1 diff)
• src/exc_handler.S (modified) (1 diff)
• src/exception.c (modified) (2 diffs)
• src/mm/page_fault.c (modified) (2 diffs)
• src/start.S (modified) (1 diff)

kernel/arch/arm32/Makefile.inc

@@ -38 +38 @@
 ATSIGN = %
 
-GCC_CFLAGS += -fno-zero-initialized-in-bss
+GCC_CFLAGS += -fno-zero-initialized-in-bss -mapcs-frame
 
 BITS = 32

kernel/arch/arm32/include/context.h

@@ -43 +43 @@
 #define SP_DELTA  (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
+#define context_set(c, _pc, stack, size) \
+        do { \
+                (c)->pc = (uintptr_t) (_pc); \
+                (c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \
+                (c)->fp = 0; \
+        } while (0)
+
 #ifndef __ASM__
 
@@ -62 +69 @@
         uint32_t r9;
         uint32_t r10;
-        uint32_t r11;
+        uint32_t fp;    /* r11 */
         
         ipl_t ipl;

kernel/arch/arm32/include/exception.h

@@ -102 +102 @@
         uint32_t r9;
         uint32_t r10;
-        uint32_t r11;
+        uint32_t fp;
         uint32_t r12;
 
@@ -135 +135 @@
 static inline unative_t istate_get_fp(istate_t *istate)
 {
-        return istate->r11;
+        return istate->fp;
 }
 

kernel/arch/arm32/src/debug/stacktrace.c

@@ -38 +38 @@
 #include <typedefs.h>
 
+#define FRAME_OFFSET_FP_PREV    -3
+#define FRAME_OFFSET_RA         -1
+
 bool kernel_frame_pointer_validate(uintptr_t fp)
 {
-        return false;
+        return fp != 0;
 }
 
 bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
 {
-        return false;
+        uint32_t *stack = (void *) fp;
+
+        *prev = stack[FRAME_OFFSET_FP_PREV];
+        return true;
 }
 
 bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra)
 {
-        return false;
+        uint32_t *stack = (void *) fp;
+
+        *ra = stack[FRAME_OFFSET_RA];
+        return true;
 }
 
 bool uspace_frame_pointer_validate(uintptr_t fp)
 {
-        return false;
+        return fp != 0;
 }
 
 bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
 {
-        return false;
+        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 false;
+        return !copy_from_uspace((void *) ra, (uint32_t *) fp + FRAME_OFFSET_RA,
+            sizeof(*ra));
 }
 

kernel/arch/arm32/src/debug/stacktrace_asm.S

@@ -33 +33 @@
 
 frame_pointer_get:
+        mov r0, fp
         mov pc, lr
 
 program_counter_get:
+        mov r0, lr
         mov pc, lr

kernel/arch/arm32/src/exc_handler.S

@@ -123 +123 @@
         stmfd r13!, {r2}
 2:
+        # Stop stack traces here
+        mov fp, #0
 .endm
 

kernel/arch/arm32/src/exception.c

@@ -42 +42 @@
 #include <print.h>
 #include <syscall/syscall.h>
+#include <stacktrace.h>
 
 #ifdef MACHINE_testarm
@@ -183 +184 @@
         printf(" r4: %x    r5: %x    r6: %x    r7: %x\n", 
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf(" r8: %x    r8: %x   r10: %x   r11: %x\n", 
-            istate->r8, istate->r9, istate->r10, istate->r11);
+        printf(" r8: %x    r8: %x   r10: %x    fp: %x\n", 
+            istate->r8, istate->r9, istate->r10, istate->fp);
         printf(" r12: %x    sp: %x    lr: %x  spsr: %x\n",
             istate->r12, istate->sp, istate->lr, istate->spsr);
         
         printf(" pc: %x\n", istate->pc);
+
+        stack_trace_istate(istate);
 }
 

kernel/arch/arm32/src/mm/page_fault.c

@@ -181 +181 @@
 
         if (ret == AS_PF_FAULT) {
+                fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
                 print_istate(istate);
                 printf("page fault - pc: %x, va: %x, status: %x(%x), "
@@ -186 +187 @@
                     access);
                 
-                fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
                 panic("Page fault.");
         }

kernel/arch/arm32/src/start.S

@@ -69 +69 @@
         bl arch_pre_main
         
+        #
+        # Create the first stack frame.
+        #
+        mov fp, #0
+        mov ip, sp
+        push {fp, ip, lr, pc}
+        sub fp, ip, #4
+
         bl main_bsp