From: John Hodge <tpg@mutabah.net>
Date: Sat, 12 Nov 2011 08:53:03 +0000 (+0800)
Subject: Usermode/ld-acess - Fixing x86_64 entrypoint
X-Git-Tag: rel0.14~106
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=2826faf8dc09e92249a315b6a0c4ca5048c08a33;p=tpg%2Facess2.git

Usermode/ld-acess - Fixing x86_64 entrypoint
---

diff --git a/Usermode/Libraries/ld-acess.so_src/arch/x86_64.asm.h b/Usermode/Libraries/ld-acess.so_src/arch/x86_64.asm.h
index 6c3ac0f2..9c520980 100644
--- a/Usermode/Libraries/ld-acess.so_src/arch/x86_64.asm.h
+++ b/Usermode/Libraries/ld-acess.so_src/arch/x86_64.asm.h
@@ -10,12 +10,15 @@
 [global _start]
 [extern SoMain]
 _start:
-	pop rdi
+	mov rdi, [rsp   ]	; Base
+	mov rsi, [rsp+ 8]	; ArgC
+	mov rdx, [rsp+16]	; ArgV
+	mov rcx, [rsp+24]	; EnvP
 	call SoMain
 	
-	mov rdi, [rsp]
-	mov rsi, [rsp+8]
-	mov rdx, [rsp+16]
+	mov rdi, [rsp+8]
+	mov rsi, [rsp+16]
+	mov rdx, [rsp+24]
 	call rax
 	
 	mov rdi, rax