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

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/c/arch/amd64/src/fibril.S (modified) (2 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
 
         # in %rdi is passed 1st argument
-        movq %rdx, CONTEXT_OFFSET_PC(%rdi)
-        movq %rsp, CONTEXT_OFFSET_SP(%rdi)
+        movq %rdx, __CONTEXT_OFFSET_PC(%rdi)
+        movq %rsp, __CONTEXT_OFFSET_SP(%rdi)
 
-        movq %rbx, CONTEXT_OFFSET_RBX(%rdi)
-        movq %rbp, CONTEXT_OFFSET_RBP(%rdi)
-        movq %r12, CONTEXT_OFFSET_R12(%rdi)
-        movq %r13, CONTEXT_OFFSET_R13(%rdi)
-        movq %r14, CONTEXT_OFFSET_R14(%rdi)
-        movq %r15, CONTEXT_OFFSET_R15(%rdi)
+        movq %rbx, __CONTEXT_OFFSET_RBX(%rdi)
+        movq %rbp, __CONTEXT_OFFSET_RBP(%rdi)
+        movq %r12, __CONTEXT_OFFSET_R12(%rdi)
+        movq %r13, __CONTEXT_OFFSET_R13(%rdi)
+        movq %r14, __CONTEXT_OFFSET_R14(%rdi)
+        movq %r15, __CONTEXT_OFFSET_R15(%rdi)
 
         movq %fs:0, %rax
-        movq %rax, CONTEXT_OFFSET_TLS(%rdi)
+        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)
-        movq CONTEXT_OFFSET_R15(%rdi), %r15
-        movq CONTEXT_OFFSET_R14(%rdi), %r14
-        movq CONTEXT_OFFSET_R13(%rdi), %r13
-        movq CONTEXT_OFFSET_R12(%rdi), %r12
-        movq CONTEXT_OFFSET_RBP(%rdi), %rbp
-        movq CONTEXT_OFFSET_RBX(%rdi), %rbx
+FUNCTION_BEGIN(__context_restore)
+        movq __CONTEXT_OFFSET_R15(%rdi), %r15
+        movq __CONTEXT_OFFSET_R14(%rdi), %r14
+        movq __CONTEXT_OFFSET_R13(%rdi), %r13
+        movq __CONTEXT_OFFSET_R12(%rdi), %r12
+        movq __CONTEXT_OFFSET_RBP(%rdi), %rbp
+        movq __CONTEXT_OFFSET_RBX(%rdi), %rbx
 
-        movq CONTEXT_OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
+        movq __CONTEXT_OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
 
-        movq CONTEXT_OFFSET_PC(%rdi), %rdx
+        movq __CONTEXT_OFFSET_PC(%rdi), %rdx
 
         movq %rdx,(%rsp)
 
-        movq CONTEXT_OFFSET_TLS(%rdi), %rdi
+        movq __CONTEXT_OFFSET_TLS(%rdi), %rdi
         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)