Changeset 0aee9b4 in mainline

Timestamp:

2014-09-02T20:31:13Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b3222a3

Parents:

4dc7a84

Message:

Autogenerate amd64 kernel context_t and its offsets.

Location:

kernel/arch/amd64

Files:

• Makefile.inc (modified) (1 diff)
• include/arch/context.h (modified) (2 diffs)
• include/arch/context_offset.h (deleted)
• include/arch/context_struct.ag (added)
• src/context.S (modified) (4 diffs)

kernel/arch/amd64/Makefile.inc

@@ -88 +88 @@
 
 ARCH_AUTOGENS_AG = \
-        arch/$(KARCH)/include/arch/istate_struct.ag
+        arch/$(KARCH)/include/arch/istate_struct.ag \
+        arch/$(KARCH)/include/arch/context_struct.ag
 

kernel/arch/amd64/include/arch/context.h

@@ -36 +36 @@
 #define KERN_amd64_CONTEXT_H_
 
-#include <typedefs.h>
+#include <arch/context_struct.h>
 
 /*
@@ -52 +52 @@
         } while (0)
 
-/* We include only registers that must be preserved
- * during function call
- */
-typedef struct {
-        uintptr_t sp;
-        uintptr_t pc;
-        
-        uint64_t rbx;
-        uint64_t rbp;
-        
-        uint64_t r12;
-        uint64_t r13;
-        uint64_t r14;
-        uint64_t r15;
-        
-        ipl_t ipl;
-} __attribute__ ((packed)) context_t;
-
 #endif
 

kernel/arch/amd64/src/context.S

@@ -32 +32 @@
 .global context_restore_arch
 
-#include <arch/context_offset.h>
+#include <arch/context_struct.h>
 
 ## Save current CPU context
@@ -43 +43 @@
         
         # 1st argument passed in %edi
-        CONTEXT_SAVE_ARCH_CORE %rdi %rdx
+        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)
         
         xorl %eax, %eax       # context_save returns 1
@@ -56 +64 @@
 #
 context_restore_arch:
-        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)
@@ -62 +79 @@
         xorl %eax, %eax       # context_restore returns 0
         ret
+