Changes in kernel/arch/ia32/src/asm.S [b8230b9:62baed17] in mainline

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