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

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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.

Message:

Merge mainline changes

File:

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

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

@@ -32 +32 @@
 .global context_restore
 
-#include <libarch/context_offset.h>
+#include <libarch/fibril_context.h>
 
 ## Save current CPU context
@@ -42 +42 @@
         movq (%rsp), %rdx     # the caller's return %eip
         
-        # in %edi is passed 1st argument
-        CONTEXT_SAVE_ARCH_CORE %rdi %rdx 
+        # in %rdi is passed 1st argument
+        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)
         
         # save TLS
         movq %fs:0, %rax
-        movq %rax, OFFSET_TLS(%rdi)
+        movq %rax, CONTEXT_OFFSET_TLS(%rdi)
         
-        xorl %eax, %eax       # context_save returns 1
+        xorl %eax, %eax                      # context_save returns 1
         incl %eax
         ret
@@ -60 +68 @@
 context_restore:
         
-        CONTEXT_RESTORE_ARCH_CORE %rdi %rdx
+        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_PC(%rdi), %rdx
         
         movq %rdx,(%rsp)
         
         # Set thread local storage
-        movq OFFSET_TLS(%rdi), %rdi  # Set arg1 to TLS addr
-        movl $1, %eax                # SYS_TLS_SET
+        movq CONTEXT_OFFSET_TLS(%rdi), %rdi  # Set arg1 to TLS addr
+        movl $1, %eax                        # SYS_TLS_SET
         syscall
         
-        xorl %eax, %eax              # context_restore returns 0
+        xorl %eax, %eax                      # context_restore returns 0
         ret
+