X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Farmv7%2Fproc.S;h=4d7c89f714933623fcdbc6b81e85e97970de6394;hb=4bd32b966938a9f52c22d63cac0b22d6932e585d;hp=832adbd10b290dda5e8b9535cd1c2095f7459d02;hpb=6a72262c7ce45a57ae2b3d002aaa30f5b5fd23d5;p=tpg%2Facess2.git

diff --git a/Kernel/arch/armv7/proc.S b/Kernel/arch/armv7/proc.S
index 832adbd1..4d7c89f7 100644
--- a/Kernel/arch/armv7/proc.S
+++ b/Kernel/arch/armv7/proc.S
@@ -18,16 +18,8 @@ KernelThreadHeader:
 	@ TODO: Do something with the thread pointer
 	
 	ldr r4, [sp],#4	@ Function
-	ldr r5, [sp],#4
-	@ Get arguments
-	sub r5, #1
-	ldrhs r0, [sp],#4
-@	suble r5, #1
-@	ldrhs r1, [sp],#4
-@	suble r5, #1
-@	ldrhs r2, [sp],#4
-@	suble r5, #1
-@	ldrhs r3, [sp],#4
+	@ Get argument
+	ldr r0, [sp],#4
 
 	blx r4
 	
@@ -42,7 +34,7 @@ KernelThreadHeader:
 @ R3: Pointer to save old IP
 @ SP+0: New address space
 SwitchTask:
-	PUSH_GPRS
+	push {r4-r12,lr}
 
 	@ Save IP	
 	ldr r4, =.return
@@ -51,9 +43,11 @@ SwitchTask:
 	str sp, [r1]
 
 	@ Only update TTBR0 if the task has an explicit address space
-	ldr r1, [sp,#0x40]
+	ldr r1, [sp,#4*10]
 	tst r1, r1
 	mcrne p15, 0, r1, c2, c0, 0	@ Set TTBR0 to r0
+	mov r1, #0
+	mcrne p15, 0, r1, c8, c7, 0	@ Invalidate all (HACK! But it fixes things)
 
 	@ Restore SP
 	mov sp, r0
@@ -61,6 +55,48 @@ SwitchTask:
 	bx r2
 
 .return:
-	POP_GPRS
-	bx lr
+	pop {r4-r12,pc}
+
+.extern MM_Clone
+.extern MM_DumpTables
+.globl Proc_CloneInt
+Proc_CloneInt:
+	@ R0: SP Destination
+	@ R1: Mem Destination
+	push {r4-r12,lr}
+	mov r4, r1	@ Save mem destination
+	str sp, [r0]	@ Save SP to SP dest
+
+	bl MM_Clone
+	str r0, [r4]	@ Save clone return to Mem Dest
+
+	ldr r0, =Proc_CloneInt_new
+	pop {r4-r12,pc}
+Proc_CloneInt_new:
+	mov r0, #0
+	pop {r4-r12,pc}
+
+@ R0: New user SP
+@ Return: Old user SP
+.globl Proc_int_SwapUserSP
+Proc_int_SwapUserSP:
+	cps #31	@ Go to system mode
+	mov r1, sp
+	tst r0, r0	@ Only update if non-zero
+	movne sp, r0
+	mov r0, r1
+	cps #19
+	mov pc, lr
+
+.section .usertext, "ax"
+.globl Proc_int_DropToUser
+@ R0: User IP
+@ R1: User SP
+Proc_int_DropToUser:
+	cps #16
+	mov sp, r1
+	mov pc, r0
 
+.section .rodata
+csProc_CloneInt_NewTaskMessage:
+	.asciz "New task"