about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2011-11-08 16:04:29 -0800
committerNiko Matsakis <niko@alum.mit.edu>2011-11-08 21:14:09 -0800
commit1a28ad4fa4c3b2dfa3f57eed9e0115559d4263e7 (patch)
treeb9ada96b33ab656436465c1174c8512fa74312d0
parentb30a76ed1b5f5d35560d00a621bf91d6024c478e (diff)
downloadrust-1a28ad4fa4c3b2dfa3f57eed9e0115559d4263e7.tar.gz
rust-1a28ad4fa4c3b2dfa3f57eed9e0115559d4263e7.zip
fix bug in loading argument regs
-rw-r--r--src/rt/arch/x86_64/_context.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rt/arch/x86_64/_context.S b/src/rt/arch/x86_64/_context.S
index 5632df932f3..39df5b6610b 100644
--- a/src/rt/arch/x86_64/_context.S
+++ b/src/rt/arch/x86_64/_context.S
@@ -98,8 +98,8 @@ swap_registers:
         mov (RUSTRT_R15*8)(%rsi), %r15
 
         // Restore relevant argument registers:
-        mov (RUSTRT_RCX*8)(%rdi), %rcx
-        mov (RUSTRT_RDI*8)(%rdi), %rdi
+        mov (RUSTRT_RCX*8)(%rsi), %rcx
+        mov (RUSTRT_RDI*8)(%rsi), %rdi
 
         // Restore non-volatile XMM registers:
         movapd (RUSTRT_XMM0*8)(%rsi), %xmm0