Changeset 2d1195c0 in mainline

Timestamp:

2013-03-29T15:33:54Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8a5a902

Parents:

26c02b22

git-author:

Wolf Ramovsky <wolf.ramovsky@…> (2013-03-29 15:33:54)

git-committer:

Martin Decky <martin@…> (2013-03-29 15:33:54)

Message:

fix setjmp() and longjmp() argument type

Location:

uspace/lib/c

Files:

• arch/ia32/src/setjmp.S (modified) (1 diff)
• include/setjmp.h (modified) (2 diffs)

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

@@ -35 +35 @@
 .type setjmp,@function
 setjmp:
-        movl 0(%esp),%eax       # save pc value into eax        
-        movl 4(%esp),%edx       # address of the jmp_buf structure to save context to 
-
-                # save registers to the jmp_buf structure
+        movl 0(%esp),%eax  # save pc value into eax
+        movl 4(%esp),%edx  # address of the jmp_buf structure to save context to
+        
+        # save registers to the jmp_buf structure
         CONTEXT_SAVE_ARCH_CORE %edx %eax
-
-        xorl %eax,%eax          # set_jmp returns 0
+        
+        xorl %eax,%eax  # set_jmp returns 0
         ret
 
 .type longjmp,@function
 longjmp:
-
-        movl 4(%esp), %ecx      # put address of jmp_buf into ecx
-        movl 8(%esp), %eax      # put return value into eax     
-
-                # restore registers from the jmp_buf structure
+        movl 4(%esp), %ecx  # put address of jmp_buf into ecx
+        movl 8(%esp), %eax  # put return value into eax
+        
+        # restore registers from the jmp_buf structure
         CONTEXT_RESTORE_ARCH_CORE %ecx %edx
-
-        movl %edx,0(%esp)       # put saved pc on stack
+        
+        movl %edx,0(%esp)  # put saved pc on stack
         ret
-

uspace/lib/c/include/setjmp.h

@@ -38 +38 @@
 #include <libarch/fibril.h>
 
-typedef context_t jmp_buf;
+typedef context_t jmp_buf[1];
 
 extern int setjmp(jmp_buf env);
@@ -47 +47 @@
 /** @}
  */
-