Changeset b4f1171 in mainline for uspace/lib/c/arch/amd64/src/fibril.S

Timestamp:

2019-02-03T14:56:13Z (6 years ago)

Author:

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

Branches:

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

Children:

8f99dbf

Parents:

a5c78a18

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-03 14:49:38)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-03 14:56:13)

Message:

Rename setjmp/longjmp to context_save/context_restore

Once upon a time, I renamed context_save/context_restore to
setjmp/longjmp with the reasoning that they are almost
the same as setjmp/longjmp. I never got rid of the "almost",
so it ended up being somewhat confusing.
This is just a late correction of the old change.

File:

• uspace/lib/c/arch/amd64/src/fibril.S (modified) (4 diffs)

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

@@ -37 +37 @@
 # pointed by the 1st argument. Returns 0 in RAX.
 #
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
         movq (%rsp), %rdx     # the caller's return %eip
 
@@ -54 +54 @@
         movq %rax, __CONTEXT_OFFSET_TLS(%rdi)
 
-        xorq %rax, %rax                      # __setjmp returns 0
+        xorq %rax, %rax                      # __context_save returns 0
         ret
-FUNCTION_END(__setjmp)
+FUNCTION_END(__context_save)
 
 ## Restore current CPU context
@@ -63 +63 @@
 # pointed by the 1st argument. Returns second argument in RAX.
 #
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
         movq __CONTEXT_OFFSET_R15(%rdi), %r15
         movq __CONTEXT_OFFSET_R14(%rdi), %r14
@@ -80 +80 @@
         movq %rdi, %fs:0
 
-        movq %rsi, %rax                      # __longjmp returns second argument
+        movq %rsi, %rax                      # __context_restore returns second argument
         ret
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)