| /trunk/kernel/arch/amd64/include/context_offset.h |
|---|
| 37,17 → 37,41 |
| #define OFFSET_R13 0x28 |
| #define OFFSET_R14 0x30 |
| #define OFFSET_R15 0x38 |
| #define OFFSET_IPL 0x40 |
| #ifdef KERNEL |
| # define OFFSET_IPL 0x40 |
| #else |
| # define OFFSET_TLS 0x40 |
| #endif |
| #ifdef __ASM__ |
| # ctx: address of the structure with saved context |
| # pc: return address |
| .macro CONTEXT_SAVE_ARCH_CORE ctx:req pc:req |
| movq \pc, OFFSET_PC(\ctx) |
| movq %rsp, OFFSET_SP(\ctx) |
| movq %rbx, OFFSET_RBX(\ctx) |
| movq %rbp, OFFSET_RBP(\ctx) |
| movq %r12, OFFSET_R12(\ctx) |
| movq %r13, OFFSET_R13(\ctx) |
| movq %r14, OFFSET_R14(\ctx) |
| movq %r15, OFFSET_R15(\ctx) |
| .endm |
| # ctx: address of the structure with saved context |
| .macro CONTEXT_RESTORE_ARCH_CORE ctx:req pc:req |
| movq OFFSET_R15(\ctx), %r15 |
| movq OFFSET_R14(\ctx), %r14 |
| movq OFFSET_R13(\ctx), %r13 |
| movq OFFSET_R12(\ctx), %r12 |
| movq OFFSET_RBP(\ctx), %rbp |
| movq OFFSET_RBX(\ctx), %rbx |
| movq OFFSET_SP(\ctx), %rsp # ctx->sp -> %rsp |
| movq OFFSET_PC(\ctx), \pc |
| .endm |
| #endif |
| /trunk/kernel/arch/amd64/src/context.S |
|---|
| 40,17 → 40,10 |
| # |
| context_save_arch: |
| 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) |
| xorq %rax,%rax # context_save returns 1 |
| incq %rax |
| ret |
| 62,16 → 55,9 |
| # pointed by the 1st argument. Returns 0 in EAX. |
| # |
| context_restore_arch: |
| 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 |
| movq OFFSET_PC(%rdi), %rdx |
| CONTEXT_RESTORE_ARCH_CORE %rdi %rdx |
| movq %rdx,(%rsp) |
| xorq %rax,%rax # context_restore returns 0 |
| /trunk/uspace/lib/libc/arch/amd64/include/context_offset.h |
|---|
| File deleted |
| /trunk/uspace/lib/libc/arch/amd64/src/fibril.S |
|---|
| 31,7 → 31,7 |
| .global context_save |
| .global context_restore |
| #include <libarch/context_offset.h> |
| #include <kernel/arch/context_offset.h> |
| ## Save current CPU context |
| # |
| 40,17 → 40,10 |
| # |
| 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 |
| movq %rax, OFFSET_TLS(%rdi) |
| 66,16 → 59,9 |
| # pointed by the 1st argument. Returns 0 in EAX. |
| # |
| 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) |
| # Set thread local storage |