Changeset 46c20c8 in mainline for kernel/arch/amd64/src/context.S

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/amd64/src/context.S (modified) (2 diffs)

kernel/arch/amd64/src/context.S

@@ -41 +41 @@
 context_save_arch:
         movq (%rsp), %rdx     # the caller's return %eip
-
-        # In %edi is passed 1st argument
-        CONTEXT_SAVE_ARCH_CORE %rdi %rdx 
         
-        xorq %rax,%rax          # context_save returns 1
-        incq %rax
+        # 1st argument passed in %edi
+        CONTEXT_SAVE_ARCH_CORE %rdi %rdx
+        
+        xorl %eax, %eax       # context_save returns 1
+        incl %eax
         ret
 
@@ -55 +55 @@
 # pointed by the 1st argument. Returns 0 in EAX.
 #
-context_restore_arch:   
-
+context_restore_arch:
         CONTEXT_RESTORE_ARCH_CORE %rdi %rdx
-
-        movq %rdx,(%rsp)
-
-        xorq %rax,%rax          # context_restore returns 0
+        
+        movq %rdx, (%rsp)
+        
+        xorl %eax, %eax       # context_restore returns 0
         ret