Changeset 615e83d in mainline for uspace/lib/c/arch/ia32/src/fibril.S

Timestamp:

2018-03-08T18:25:31Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

55f068c

Parents:

e0a4686

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-08 17:43:06)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-08 18:25:31)

Message:

Turn context_save/context_restore into standard setjmp/longjmp.

File:

• uspace/lib/c/arch/ia32/src/fibril.S (modified) (3 diffs)

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

@@ -35 +35 @@
 #
 # Save CPU context to the context_t variable
-# pointed by the 1st argument. Returns 1 in EAX.
+# pointed by the 1st argument. Returns 0 in EAX.
 #
-FUNCTION_BEGIN(context_save)
+FUNCTION_BEGIN(setjmp)
         movl 0(%esp), %eax  # the caller's return %eip
         movl 4(%esp), %edx  # address of the context variable to save context to
@@ -53 +53 @@
         movl %eax, CONTEXT_OFFSET_TLS(%edx)     # tls -> ctx->tls
 
-        xorl %eax, %eax         # context_save returns 1
-        incl %eax
+        xorl %eax, %eax         # setjmp returns 0
         ret
-FUNCTION_END(context_save)
+FUNCTION_END(setjmp)
 
 ## Restore saved CPU context
 #
 # Restore CPU context from context_t variable
-# pointed by the 1st argument. Returns 0 in EAX.
+# pointed by the 1st argument. Returns second argument in EAX.
 #
-FUNCTION_BEGIN(context_restore)
+FUNCTION_BEGIN(__longjmp)
         movl 4(%esp), %eax  # address of the context variable to restore context from
+        movl 8(%esp), %ecx  # return value
 
         # restore registers from the context structure
@@ -80 +80 @@
         movl %edx, %gs:0
 
-        xorl %eax, %eax         # context_restore returns 0
+        movl %ecx, %eax
         ret
-FUNCTION_END(context_restore)
+FUNCTION_END(__longjmp)