ariadne
/
libucontext
1
1
Fork 1
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

fix x86_64 register order for swapcontext 

rbp and rsi were reversed causing argument passing to fail since
rsi is used to pass 2nd argument.

fixes #9
pull/10/head
Timo Teräs 2018-07-18 15:47:27 +03:00
parent 7b1a302ed4
commit 790ed28aff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86_64/swapcontext.S
View File

@ -23,8 +23,8 @@ __swapcontext:
movq %r14, 88(%rdi) movq %r14, 88(%rdi)
movq %r15, 96(%rdi) movq %r15, 96(%rdi)
movq %rdi, 104(%rdi) movq %rdi, 104(%rdi)
movq %rbp, 112(%rdi) movq %rsi, 112(%rdi)
movq %rsi, 120(%rdi) movq %rbp, 120(%rdi)
movq %rbx, 128(%rdi) movq %rbx, 128(%rdi)
movq %rdx, 136(%rdi) movq %rdx, 136(%rdi)
movq $1, 144(%rdi) /* $1 is %rax */ movq $1, 144(%rdi) /* $1 is %rax */
@ -51,7 +51,7 @@ __swapcontext:
movq 88(%rsi), %r14 movq 88(%rsi), %r14
movq 96(%rsi), %r15 movq 96(%rsi), %r15
movq 104(%rsi), %rdi movq 104(%rsi), %rdi
movq 112(%rsi), %rbp movq 120(%rsi), %rbp
movq 128(%rsi), %rbx movq 128(%rsi), %rbx
movq 136(%rsi), %rdx movq 136(%rsi), %rdx
movq 144(%rsi), %rax movq 144(%rsi), %rax
@ -63,7 +63,7 @@ __swapcontext:
pushq 168(%rsi) pushq 168(%rsi)
/* finally, set %rsi correctly since we do not need it anymore. */ /* finally, set %rsi correctly since we do not need it anymore. */
movq 120(%rsi), %rsi movq 112(%rsi), %rsi
/* we're all done here, return 0 */ /* we're all done here, return 0 */
xorl %eax, %eax xorl %eax, %eax