---

nikomatsakis · nikomatsakis · commit ef5b0975c0dc · 2011-11-08T21:14:09.000-08:00
yaml --- r: 6213 b: refs/heads/master c: 1a28ad4 h: refs/heads/master i: 6211: 83f8578 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b30a76ed1b5f5d35560d00a621bf91d6024c478e
+refs/heads/master: 1a28ad4fa4c3b2dfa3f57eed9e0115559d4263e7
diff --git a/trunk/src/rt/arch/x86_64/_context.S b/trunk/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

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: b30a76ed1b5f5d35560d00a621bf91d6024c478e`
	`2`	`+refs/heads/master: 1a28ad4fa4c3b2dfa3f57eed9e0115559d4263e7`