X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Farch%2Fx86_64.asm.h;h=350585a0136f4e13493a9d8f44a2b15d37488052;hb=6516331968f11dd9e5c495572f27cc69fa3d4c48;hp=a21bf180e452471fa7c9da15d80ed92aa8a124d0;hpb=5ce8b1a0af07fdba89c8d72c8d6c086e91076a3c;p=tpg%2Facess2.git

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 a21bf180..350585a0 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
@@ -2,30 +2,41 @@
 ; AcssMicro - System Calls
 ; ========================
 
-%include "../../../Kernel/include/syscalls.inc.asm"
-
 [bits 64]
 
 [section .text]
+[global _start]
+[extern SoMain]
+_start:
+	mov rdi, [rsp   ]	; Base
+	mov rsi, [rsp+ 8]	; ArgC
+	mov rdx, [rsp+16]	; ArgV
+	mov rcx, [rsp+24]	; EnvP
+	call SoMain
+	
+	mov rdi, [rsp+8]
+	mov rsi, [rsp+16]
+	mov rdx, [rsp+24]
+	call rax
+	
+	mov rdi, rax
+	call _exit
+
 ; DEST
 ; SRC
 _memcpy:
 	push rbp
 	mov rbp, rsp
-	push rdi
-	push rsi	; // DI and SI must be maintained, CX doesn't
 	
-	mov rcx, [rbp+4*8]
-	mov rsi, [rbp+3*8]
-	mov rdi, [rbp+2*8]
+	; RDI - First Param
+	; RSI - Second Param
+	mov rcx, rdx	; RDX - Third
 	rep movsb
 	
-	pop rsi
-	pop rdi
 	pop rbp
 	ret
 
-[global _errno]
+[global _errno:data 4]
 _errno:	dw	0	; Placed in .text, to allow use of relative addressing
 
 #define SYSCALL0(_name,_num)	SYSCALL0 _name, _num
@@ -37,7 +48,8 @@ _errno:	dw	0	; Placed in .text, to allow use of relative addressing
 #define SYSCALL6(_name,_num)	SYSCALL6 _name, _num
 
 ;%define SYSCALL_OP	jmp 0xCFFF0000
-%define SYSCALL_OP	int 0xAC
+;%define SYSCALL_OP	int 0xAC
+%define SYSCALL_OP	syscall
 
 ; System Call - No Arguments
 %macro SYSCALL0	2
@@ -69,7 +81,7 @@ _errno:	dw	0	; Placed in .text, to allow use of relative addressing
 ; System Call - 1 Argument
 %macro SYSCALL1	2
 _SYSCALL_HEAD %1, %2
-	mov rbx, [rbp+2*8]
+;	mov rdi, [rbp+3*8]
 	SYSCALL_OP
 _SYSCALL_TAIL
 %endmacro
@@ -77,8 +89,8 @@ _SYSCALL_TAIL
 ; System Call - 2 Arguments
 %macro SYSCALL2	2
 _SYSCALL_HEAD %1, %2
-	mov rbx, [rbp+2*8]
-	mov rcx, [rbp+3*8]
+;	mov rdi, [rbp+3*8]
+;	mov rsi, [rbp+4*8]
 	SYSCALL_OP
 _SYSCALL_TAIL
 %endmacro
@@ -86,9 +98,9 @@ _SYSCALL_TAIL
 ; System Call - 3 Arguments
 %macro SYSCALL3	2
 _SYSCALL_HEAD %1, %2
-	mov rbx, [rbp+2*8]
-	mov rcx, [rbp+3*8]
-	mov rdx, [rbp+4*8]
+;	mov rdi, [rbp+3*8]
+;	mov rsi, [rbp+4*8]
+;	mov rdx, [rbp+5*8]
 	SYSCALL_OP
 _SYSCALL_TAIL
 %endmacro
@@ -96,78 +108,86 @@ _SYSCALL_TAIL
 ; System Call - 4 Arguments
 %macro SYSCALL4	2
 _SYSCALL_HEAD %1, %2
-	push rdi
-	mov rbx, [rbp+2*8]
-	mov rcx, [rbp+3*8]
-	mov rdx, [rbp+4*8]
-	mov rdi, [rbp+5*8]
+;	mov rdi, [rbp+2*8]
+;	mov rsi, [rbp+3*8]
+;	mov rdx, [rbp+4*8]
+	mov r10, rcx	; r10 is used in place of RCX
 	SYSCALL_OP
-	pop rdi
 _SYSCALL_TAIL
 %endmacro
 
 ; System Call - 5 Arguments
 %macro SYSCALL5	2
 _SYSCALL_HEAD %1, %2
-	push rdi
-	push rsi
-	mov rbx, [rbp+2*8]
-	mov rcx, [rbp+3*8]
-	mov rdx, [rbp+4*8]
-	mov rdi, [rbp+5*8]
-	mov rsi, [rbp+6*8]
+;	mov rdi, [rbp+2*8]
+;	mov rsi, [rbp+3*8]
+;	mov rdx, [rbp+4*8]
+	mov r10, rcx
+;	mov r8, [rbp+6*8]
 	SYSCALL_OP
-	pop rsi
-	pop rdi
 _SYSCALL_TAIL
 %endmacro
 
 ; System Call - 6 Arguments
 %macro SYSCALL6	2
 _SYSCALL_HEAD %1, %2
-	push rdi
-	push rsi
-	mov rbx, [rbp+2*8]
-	mov rcx, [rbp+3*8]
-	mov rdx, [rbp+4*8]
-	mov rdi, [rbp+5*8]
-	mov rsi, [rbp+6*8]
-	mov rbp, [rbp+7*8]
+;	mov rdi, [rbp+2*8]
+;	mov rsi, [rbp+3*8]
+;	mov rdx, [rbp+4*8]
+	mov r10, rcx
+;	mov r8, [rbp+6*8]
+;	mov r9, [rbp+7*8]
 	SYSCALL_OP
-	pop rsi
-	pop rdi
 _SYSCALL_TAIL
 %endmacro
 
 ; // Override the clone syscall
 #define clone	_clone_raw
+#define _exit	_exit_raw
 #include "syscalls.s.h"
 #undef clone
+#undef _exit
 
 [global clone:func]
 clone:
 	push rbp
 	mov rbp, rsp
 	push rbx
+	push r12
 	
-	mov rbx, [rbp+3*8]	; Get new stack pointer
+	mov r12, rsi	; Save in a reg for after the clone
 	
 	; Check if the new stack is being used
-	test rbx, rbx
+	test rsi, rsi
 	jz .doCall
 	; Quick hack, just this stack frame
 	mov rax, [rbp+1*8]
-	mov [rbx-1*8], rax	; Return
-	mov [rbx-2*8], rbx	; EBP
-	and QWORD [rbx-3*8], BYTE 0	; EBX
-	sub rbx, 3*8
+	mov [rsi-1*8], rax	; Return
+	mov [rsi-2*8], rsi	; EBP
+	and QWORD [rsi-3*8], BYTE 0	; EBX
+	sub rsi, 3*8
 .doCall:
 	mov eax, SYS_CLONE
-	mov rcx, rbx	; Stack
-	mov rbx, [rbp+2*8]	; Flags
 	SYSCALL_OP
 	mov [rel _errno], ebx
+
+	; Change stack pointer
+	test eax, eax
+	jnz .ret
+	test r12, r12
+	jz .ret
+	mov rsp, rsi
+.ret:
+	pop r12
 	pop rbx
 	pop rbp
 	ret
 
+
+[global _exit:func]
+_exit:
+	xor eax, eax
+	SYSCALL_OP
+	jmp $
+
+; vim: ft=nasm