Changeset 1aede82 in mainline

Timestamp:

2008-03-15T09:21:51Z (17 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

baac911

Parents:

7397c73

Message:

Added missing ia32/context.S from last commit.

File:

• kernel/arch/ia32/src/context.S (moved) (moved from kernel/arch/ia32/src/context.s ) (3 diffs)

kernel/arch/ia32/src/context.S

@@ -27 +27 @@
 #
 
+#include <arch/context_offset.h>
+
 .text
 
@@ -39 +41 @@
 #
 context_save_arch:
-        movl 0(%esp),%eax       # the caller's return %eip
-        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 
 
-        movl %esp,0(%edx)       # %esp -> ctx->sp
-        movl %eax,4(%edx)       # %eip -> ctx->pc
-        movl %ebx,8(%edx)       # %ebx -> ctx->ebx
-        movl %esi,12(%edx)      # %esi -> ctx->esi
-        movl %edi,16(%edx)      # %edi -> ctx->edi
-        movl %ebp,20(%edx)      # %ebp -> ctx->ebp
+                # save registers to given structure
+        CONTEXT_SAVE_ARCH_CORE %edx %eax
 
         xorl %eax,%eax          # context_save returns 1
@@ -61 +59 @@
 context_restore_arch:
         movl 4(%esp),%eax       # address of the context variable to restore context from
-        movl 0(%eax),%esp       # ctx->sp -> %esp
-        movl 4(%eax),%edx       # ctx->pc -> %edx
-        movl 8(%eax),%ebx       # ctx->ebx -> %ebx
-        movl 12(%eax),%esi      # ctx->esi -> %esi
-        movl 16(%eax),%edi      # ctx->edi -> %edi
-        movl 20(%eax),%ebp      # ctx->ebp -> %ebp
 
-        movl %edx,0(%esp)       # ctx->pc -> saver's return %eip
+                # restore registers from given structure
+        CONTEXT_RESTORE_ARCH_CORE %eax %edx
+
+        movl %edx,0(%esp)       # put saved pc on stack
         xorl %eax,%eax          # context_restore returns 0
         ret