Changeset 615e83d in mainline for uspace/lib/c/arch/amd64/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/amd64/src/fibril.S (modified) (3 diffs)

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

@@ -35 +35 @@
 #
 # Save CPU context to 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)
         movq (%rsp), %rdx     # the caller's return %eip
 
@@ -54 +54 @@
         movq %rax, CONTEXT_OFFSET_TLS(%rdi)
 
-        xorl %eax, %eax                      # context_save returns 1
-        incl %eax
+        xorq %rax, %rax                      # setjmp returns 0
         ret
-FUNCTION_END(context_save)
+FUNCTION_END(setjmp)
 
 ## Restore current CPU context
 #
 # Restore CPU context from context_t variable
-# pointed by the 1st argument. Returns 0 in EAX.
+# pointed by the 1st argument. Returns RSI in EAX.
 #
-FUNCTION_BEGIN(context_restore)
+FUNCTION_BEGIN(__longjmp)
         movq CONTEXT_OFFSET_R15(%rdi), %r15
         movq CONTEXT_OFFSET_R14(%rdi), %r14
@@ -81 +80 @@
         movq %rdi, %fs:0
 
-        xorl %eax, %eax                      # context_restore returns 0
+        movq %rsi, %rax                      # __longjmp returns second argument
         ret
-FUNCTION_END(context_restore)
+FUNCTION_END(__longjmp)