Changeset a043e39 in mainline for kernel/arch/amd64/src/asm_utils.S

Timestamp:

2010-06-25T04:23:47Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8e374ea7

Parents:

06737a0

Message:

Switch amd64 to use the unified panic architecture.

File:

• kernel/arch/amd64/src/asm_utils.S (modified) (4 diffs)

kernel/arch/amd64/src/asm_utils.S

@@ -50 +50 @@
 .global interrupt_handlers
 .global syscall_entry
-.global panic_printf
-
-panic_printf:
-        movq $halt, (%rsp)
-        jmp printf
 
 .global cpuid
@@ -232 +227 @@
         cld
 
-        # Stop stack traces here
-        xorq %rbp, %rbp
+        #
+        # Stop stack traces here if we came from userspace.
+        #
+        movq %cs, %rax
+        xorq %rdx, %rdx
+        cmpq %rax, IREGISTER_SPACE+16(%rsp)
+        cmovneq %rdx, %rbp
 
         movq $(\i), %rdi        # %rdi - first parameter
@@ -287 +287 @@
         pushq %rcx
         pushq %r11
+        pushq %rbp
+
+        xorq %rbp, %rbp         # stop the stack traces here
 
         movq %r10, %rcx         # Copy the 4th argument where it is expected 
@@ -293 +296 @@
         addq $8, %rsp
                 
+        popq %rbp
         popq %r11
         popq %rcx