Changeset 15d0046 in mainline for kernel/arch/ia32/src/context.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:

• kernel/arch/ia32/src/context.S (modified) (3 diffs)

kernel/arch/ia32/src/context.S

@@ -27 +27 @@
 #
 
-#include <arch/context_offset.h>
+#include <arch/context_struct.h>
 
 .text
@@ -41 +41 @@
 #
 context_save_arch:
-        movl 0(%esp),%eax       # save pc value into eax        
-        movl 4(%esp),%edx       # address of the context variable to save context to 
+        movl 0(%esp), %eax      # save pc value into eax        
+        movl 4(%esp), %edx      # address of the context variable to save context to 
 
-                # save registers to given structure
-        CONTEXT_SAVE_ARCH_CORE %edx %eax
+        # save registers to given structure
+        movl %esp, CONTEXT_OFFSET_SP(%edx)      # %esp -> ctx->sp
+        movl %eax, CONTEXT_OFFSET_PC(%edx)      # %eip -> ctx->pc
+        movl %ebx, CONTEXT_OFFSET_EBX(%edx)     # %ebx -> ctx->ebx
+        movl %esi, CONTEXT_OFFSET_ESI(%edx)     # %esi -> ctx->esi
+        movl %edi, CONTEXT_OFFSET_EDI(%edx)     # %edi -> ctx->edi
+        movl %ebp, CONTEXT_OFFSET_EBP(%edx)     # %ebp -> ctx->ebp
 
-        xorl %eax,%eax          # context_save returns 1
+        xorl %eax, %eax         # context_save returns 1
         incl %eax
         ret
@@ -58 +63 @@
 #
 context_restore_arch:
-        movl 4(%esp),%eax       # address of the context variable to restore context from
+        movl 4(%esp), %eax      # address of the context variable to restore context from
 
-                # restore registers from given structure
-        CONTEXT_RESTORE_ARCH_CORE %eax %edx
+        # restore registers from given structure
+        movl CONTEXT_OFFSET_SP(%eax), %esp      # ctx->sp -> %esp
+        movl CONTEXT_OFFSET_PC(%eax), %edx      # ctx->pc -> \pc
+        movl CONTEXT_OFFSET_EBX(%eax), %ebx     # ctx->ebx -> %ebx
+        movl CONTEXT_OFFSET_ESI(%eax), %esi     # ctx->esi -> %esi
+        movl CONTEXT_OFFSET_EDI(%eax), %edi     # ctx->edi -> %edi
+        movl CONTEXT_OFFSET_EBP(%eax), %ebp     # ctx->ebp -> %ebp
 
-        movl %edx,0(%esp)       # put saved pc on stack
-        xorl %eax,%eax          # context_restore returns 0
+        movl %edx, 0(%esp)      # put saved pc on stack
+        xorl %eax, %eax         # context_restore returns 0
         ret
+