Changeset 1dbfe98 in mainline for uspace

Timestamp:

2008-03-15T10:22:07Z (17 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

8476a8d

Parents:

baac911

Message:

Unified context handling code for amd64.

Location:

uspace/lib/libc/arch/amd64

Files:

• include/context_offset.h (deleted)
• src/fibril.S (modified) (3 diffs)

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

@@ -32 +32 @@
 .global context_restore
 
-#include <libarch/context_offset.h>
+#include <kernel/arch/context_offset.h>
 
 ## Save current CPU context
@@ -41 +41 @@
 context_save:
         movq (%rsp), %rdx     # the caller's return %eip
+        
         # In %edi is passed 1st argument
-        movq %rdx, OFFSET_PC(%rdi)
-        movq %rsp, OFFSET_SP(%rdi)
+        CONTEXT_SAVE_ARCH_CORE %rdi %rdx 
         
-        movq %rbx, OFFSET_RBX(%rdi)
-        movq %rbp, OFFSET_RBP(%rdi)
-        movq %r12, OFFSET_R12(%rdi)
-        movq %r13, OFFSET_R13(%rdi)
-        movq %r14, OFFSET_R14(%rdi)
-        movq %r15, OFFSET_R15(%rdi)
-
         # Save TLS
         movq %fs:0, %rax
@@ -67 +60 @@
 #
 context_restore:
-        movq OFFSET_R15(%rdi), %r15
-        movq OFFSET_R14(%rdi), %r14
-        movq OFFSET_R13(%rdi), %r13
-        movq OFFSET_R12(%rdi), %r12
-        movq OFFSET_RBP(%rdi), %rbp
-        movq OFFSET_RBX(%rdi), %rbx     
         
-        movq OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
+        CONTEXT_RESTORE_ARCH_CORE %rdi %rdx
         
-        movq OFFSET_PC(%rdi), %rdx
         movq %rdx,(%rsp)