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

Timestamp:

2018-03-12T17:13:46Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

b127e4af

Parents:

f3d47c97

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-12 17:13:46)

git-committer:

GitHub <noreply@…> (2018-03-12 17:13:46)

Message:

Turn context_save/context_restore into standard setjmp/longjmp. (#24)

Turn context_save()/context_restore() into semi-standard __setjmp()/__longjmp().

The original context_* functions are similar to setjmp()/longjmp(), except that the return value is more restricted for the former, and with inverted meaning. This commit adopts the standard return value semantics and acknowledges that these functions are "standard setjmp()/longjmp() with additional implementation-specific properties" by changing the name. The only divergence from the standard is that __longjmp() causes __setjmp() to return its value unchanged, even if it is zero. This is just to avoid extra assembly, and longjmp() checks this in C.

Note that the original use of context_save()/context_restore() to implement context switching in fibril implementation has already been delegated to context_create()/context_swap(), which provide more natural control flow.

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)