Changeset 40d4c1d in mainline for kernel/arch/ia32/src

Timestamp:

2010-01-08T22:13:34Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

234e39e

Parents:

eb0bc90 (diff), 6d7f9bfe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge the stack tracing branch.

The merge includes generic and amd64 and ia32 support for kernel stack traces.
The kernel will now print a stack trace for each killed task and also for
each bad trap and panic. The rest of the architectures have dummy support,
i.e. they compile and run, but the kernel cannot print the stack trace.

Location:

kernel/arch/ia32/src

Files:

• asm.S (modified) (3 diffs)
• boot/boot.S (modified) (1 diff)
• debug/stacktrace.c (added)
• debug/stacktrace_asm.S (added)
• interrupt.c (modified) (2 diffs)
• mm/page.c (modified) (1 diff)
• smp/ap.S (modified) (1 diff)

kernel/arch/ia32/src/asm.S

@@ -269 +269 @@
         pushl %gs
 
+        pushl %ebp
         pushl %edx
         pushl %ecx
@@ -278 +279 @@
         movw %ax, %es
 
-        cld
+        # stop stack traces here
+        xorl %ebp, %ebp
 
         pushl %esp          # *istate
@@ -290 +292 @@
         popl %ecx
         popl %edx
+        popl %ebp
         
         popl %gs

kernel/arch/ia32/src/boot/boot.S

@@ -94 +94 @@
         pushl grub_eax
         call arch_pre_main
+
+        # Create the first stack frame
+        pushl $0
+        movl %esp, %ebp
         
         call main_bsp

kernel/arch/ia32/src/interrupt.c

@@ -53 +53 @@
 #include <ddi/irq.h>
 #include <symtab.h>
+#include <stacktrace.h>
 
 /*
@@ -79 +80 @@
         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);
 }
 

kernel/arch/ia32/src/mm/page.c

@@ -80 +80 @@
 {
         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);

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

@@ -78 +78 @@
         addl $0x80000000, %esp                  # PA2KA(ctx.sp)
         
+        pushl $0                                # create the first stack frame
+        movl %esp, %ebp
+
         jmpl $KTEXT, $main_ap