Changeset e3038b4 in mainline for kernel/arch/ia32/src/asm.S

Timestamp:

2010-06-28T22:45:51Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49eb681

Parents:

05e3cb8 (diff), e4a4b44 (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 unified panic architecture (Phase 1).

Note that this is still work in progress as there are the following sharp edges:

• imprecise detection of read/write accesses on some architectures
• missing or imperfect capability to print stack traces on some architectures
• istate_t on some architectures may contain too little valuable information
• basically all trap frames need to be reorganized to look like a normal stack frame on the stack trace so that there are no missing frames
• panic_common() could print more information about the current context such as the task name, thread name, ASID etc.
• functions that call panic_*() should be protected against inlining to avoid missing or confusing stack frames in the stack trace

File:

• kernel/arch/ia32/src/asm.S (modified) (5 diffs)

kernel/arch/ia32/src/asm.S

@@ -163 +163 @@
         pushl %edi      # remember return user address
 
+        xorl %ebp, %ebp # stop stack traces here
+
         pushl %gs       # remember TLS
 
@@ -196 +198 @@
 # and call exc_dispatch().
 #
-#define INTERRUPT_ALIGN 64
+#define INTERRUPT_ALIGN 128 
 .macro handler i n
         
@@ -224 +226 @@
                 movw %ax, %ds
                 movw %ax, %es
-                
+        
+                xorl %ebp, %ebp
+
                 cld
                 sti
@@ -230 +234 @@
                 call syscall_handler
                 cli
-                addl $28, %esp         # clean-up of parameters
+
+                movl 20(%esp), %ebp     # restore EBP
+                addl $28, %esp          # clean-up of parameters
                 
                 popl %gs
@@ -280 +286 @@
                 movw %ax, %es
                 
-                # stop stack traces here
+                # stop stack traces here if we came from userspace
+                cmpl $8, 40(%esp)
+                jz 0f
                 xorl %ebp, %ebp
-                
+
+0:              
                 pushl %esp          # *istate
                 pushl $(\i)         # intnum