Changeset 304342e in mainline

Timestamp:

2010-01-08T20:58:33Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

49924b4

Parents:

fabc883

Message:

Add amd64 specific support for kernel stack traces.

Location:

kernel/arch/amd64

Files:

• Makefile.inc (modified) (2 diffs)
• include/context.h (modified) (1 diff)
• include/interrupt.h (modified) (3 diffs)
• src/asm_utils.S (modified) (5 diffs)
• src/boot/boot.S (modified) (1 diff)
• src/debug/stacktrace.c (added)
• src/debug/stacktrace_asm.S (added)
• src/interrupt.c (modified) (2 diffs)
• src/smp/ap.S (modified) (1 diff)

kernel/arch/amd64/Makefile.inc

@@ -38 +38 @@
 
 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 +60 @@
         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 \

kernel/arch/amd64/include/context.h

@@ -46 +46 @@
 #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 */
 

kernel/arch/amd64/include/interrupt.h

@@ -70 +70 @@
 
 /** This is passed to interrupt handlers */
-typedef struct {
+typedef struct istate {
         uint64_t rax;
         uint64_t rcx;
@@ -80 +80 @@
         uint64_t r10;
         uint64_t r11;
+        uint64_t rbp;
         uint64_t error_word;
         uint64_t rip;
@@ -101 +102 @@
         return istate->rip;
 }
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return istate->rbp;
+}
 
 extern void (* disable_irqs_function)(uint16_t irqmask);

kernel/arch/amd64/src/asm_utils.S

@@ -27 +27 @@
 #
 
-#define IREGISTER_SPACE 72 
+#define IREGISTER_SPACE 80
 
 #define IOFFSET_RAX     0x0
@@ -38 +38 @@
 #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 +180 @@
         movq %r10, IOFFSET_R10(%rsp)
         movq %r11, IOFFSET_R11(%rsp)
+        movq %rbp, IOFFSET_RBP(%rsp)
 .endm
 
@@ -191 +193 @@
         movq IOFFSET_R10(%rsp), %r10
         movq IOFFSET_R11(%rsp), %r11
+        movq IOFFSET_RBP(%rsp), %rbp
 .endm
 
@@ -235 +238 @@
         cld
 
+        # Stop stack traces here
+        xorq %rbp, %rbp
+
         movq $(\i), %rdi        # %rdi - first parameter
         movq %rsp, %rsi         # %rsi - pointer to istate

kernel/arch/amd64/src/boot/boot.S

@@ -174 +174 @@
         call arch_pre_main
         
+        # create the first stack frame
+        pushq $0
+        movq %rsp, %rbp
+
         call main_bsp
         

kernel/arch/amd64/src/interrupt.c

@@ -53 +53 @@
 #include <ddi/irq.h>
 #include <symtab.h>
+#include <stacktrace.h>
 
 /*
@@ -80 +81 @@
             istate->r10, istate->r11);
         printf("%%rsp=%#llx\n", &istate->stack[0]);
+        
+        stack_trace_istate(istate);
 }
 

kernel/arch/amd64/src/smp/ap.S

@@ -99 +99 @@
 start64:
         movq (ctx), %rsp
+        pushq $0
+        movq %rsp, %rbp
         call main_ap - AP_BOOT_OFFSET + BOOT_OFFSET   # never returns