X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Farch%2Farmv7.S.h;h=7e604f1d85bd192374d8332ad56673b38e184e9b;hb=6a28fd66345b484f9dfa5dba869888becdaf7112;hp=a1c973bd6ec589a3c09714d8382104297b12d2de;hpb=c9f3dc274e9e95b07966bc50c02b73887822556a;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/arch/armv7.S.h b/Usermode/Libraries/ld-acess.so_src/arch/armv7.S.h
index a1c973bd..7e604f1d 100644
--- a/Usermode/Libraries/ld-acess.so_src/arch/armv7.S.h
+++ b/Usermode/Libraries/ld-acess.so_src/arch/armv7.S.h
@@ -2,8 +2,6 @@
 // Acess2 ARMv7 - System Calls
 //
 
-#include "../../../../Kernel/include/syscalls.h"
-
 .globl _start
 .extern SoMain
 _start:
@@ -18,7 +16,7 @@ _start:
 	
 	b _exit
 
-@ Stupid GCC
+// Stupid GCC
 .globl __ucmpdi2
 __ucmpdi2:
 	cmp r0, r2
@@ -34,36 +32,36 @@ __ucmpdi2:
 	mov r0, #1
 	mov pc, lr
 
-@ Well, can't blame it
-@ - Clear the instruction cache
+//@ Well, can't blame it
+// - Clear the instruction cache
 .globl __clear_cache
 __clear_cache:
 	svc #0x1001
 	mov pc, lr
 
-@ DEST
-@ SRC
-@_memcpy:
-@	push rbp
-@	mov rbp, rsp
-@	
-@	; RDI - First Param
-@	; RSI - Second Param
-@	mov rcx, rdx	; RDX - Third
-@	rep movsb
-@	
-@	pop rbp
-@	ret
-@
+
+@ >r0: PC
+@ >r1: Pointer to item count
+@ <r0: Address
+@ STUBBED
+__gnu_Unwind_Find_exidx:
+	mov r0, #0
+	str r0, [r1]
+	mov pc, lr
+
+.section .data
 .globl _errno
 _errno:	.long	0	@ Placed in .text, to allow use of relative addressing
+.section .text
 
 .macro syscall0 _name, _num	
 .globl \_name
 \_name:
 	push {lr}
 	svc #\_num
-	str r2, _errno
+	@mrc p15, 0, r3, c13, c0, 2
+	ldr r3, =_errno
+	str r2, [r3]
 	pop {pc}
 .endm
 
@@ -71,9 +69,10 @@ _errno:	.long	0	@ Placed in .text, to allow use of relative addressing
 .globl \_name
 \_name:
 	push {r4, lr}
-	ldr r4, [sp,#4]
+	ldr r4, [sp,#8]
 	svc #\_num
-	str r2, _errno
+	ldr r3, =_errno
+	str r2, [r3]
 	pop {r4, pc}
 .endm
 
@@ -81,10 +80,11 @@ _errno:	.long	0	@ Placed in .text, to allow use of relative addressing
 .globl \_name
 \_name:
 	push {r4,r5,lr}
-	ldr r4, [sp,#8]
-	ldr r5, [sp,#12]
+	ldr r4, [sp,#12]
+	ldr r5, [sp,#16]
 	svc #\_num
-	str r2, _errno
+	ldr r3, =_errno
+	str r2, [r3]
 	pop {r4,r5,pc}
 .endm
 
@@ -100,16 +100,31 @@ _errno:	.long	0	@ Placed in .text, to allow use of relative addressing
 // Override the clone syscall
 #define _exit	_exit_raw
 #define _clone	_clone_raw
+#define _SysSeek	_SysSeek_borken
 #include "syscalls.s.h"
 #undef _exit
 #undef _clone
+#undef _SysSeek 
+
+// NOTE: _SysSeek needs special handling for alignment
+.globl _SysSeek
+_SysSeek:
+	push {lr}
+	mov r1,r2
+	mov r2,r3
+	ldr r3, [sp,#4]
+	svc #SYS_SEEK
+	ldr r3, =_errno
+	str r2, [r3]
+	pop {pc}
 
 .globl _clone
 _clone:
 	push {r4}
 	mov r4, r1
 	svc #SYS_CLONE
-	str r2, _errno
+	ldr r3, =_errno
+	str r2, [r3]
 	tst r4, r4
 	beq _clone_ret
 	@ If in child, set SP
@@ -119,6 +134,7 @@ _clone_ret:
 	pop {r4}
 	mov pc, lr
 
+
 .globl _exit
 _exit:
 	svc #0