Changeset d2fa31f7 in mainline for uspace/lib/libc/arch/ia32/src/setjmp.S

Timestamp:

2008-03-15T08:48:18Z (17 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

7397c73

Parents:

cbd6545f

Message:

United headers using context_t in uspace.

File:

• uspace/lib/libc/arch/ia32/src/setjmp.S (modified) (3 diffs)

uspace/lib/libc/arch/ia32/src/setjmp.S

@@ -27 +27 @@
 #
 
+#include <kernel/arch/context_offset.h>
+
 .text
 .global setjmp
@@ -33 +35 @@
 .type setjmp,@function
 setjmp:
-        movl    0(%esp), %ecx   # save current pc
-        leal    4(%esp), %edx   # save stack pointer
-        movl    (%edx), %eax    # get jmp_buf pointer
+        movl 0(%esp),%eax       # save pc value into eax        
+        movl 4(%esp),%edx       # address of the context variable to save context to 
 
-                # Save registers 
-        movl %ebx, 0(%eax)
-        movl %esi, 4(%eax)
-        movl %edi, 8(%eax)
-        movl %ebp, 12(%eax)
-        movl %edx, 16(%eax)
+                # save registers to given structure
+        CONTEXT_SAVE_ARCH_CORE %edx %eax
 
-        movl %ecx, 20(%eax) # save pc
+        xorl %eax,%eax          # set_jmp returns 0
         ret
 
@@ -53 +50 @@
         movl 8(%esp), %eax      # put return value into eax     
 
-                # restore all registers
-        movl 0(%ecx), %ebx
-        movl 4(%ecx), %esi
-        movl 8(%ecx), %edi
-        movl 12(%ecx), %ebp
-        movl 16(%ecx), %esp
-        
-        movl 20(%ecx), %edx # saved return address 
-        jmp *%edx
+                # restore registers from jmp_buf
+        CONTEXT_RESTORE_ARCH_CORE %ecx %edx
+
+        movl %edx,0(%esp)       # put saved pc on stack
+        ret
+