Changeset 0dc2fec in mainline for kernel/arch/amd64/src/context.S

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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

@@ -39 +39 @@
 #
 FUNCTION_BEGIN(context_save_arch)
-        movq (%rsp), %rdx     # the caller's return %eip
+        movq (%rsp), %rdx     # the caller's return %rip
         
-        # 1st argument passed in %edi
         movq %rdx, CONTEXT_OFFSET_PC(%rdi)
         movq %rsp, CONTEXT_OFFSET_SP(%rdi)
@@ -75 +74 @@
         movq CONTEXT_OFFSET_RBX(%rdi), %rbx
         
-        movq CONTEXT_OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
+        movq CONTEXT_OFFSET_SP(%rdi), %rsp
         
         movq CONTEXT_OFFSET_PC(%rdi), %rdx