X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Farmv7%2Fproc.S;h=4d7c89f714933623fcdbc6b81e85e97970de6394;hb=1baac59e0cea8985a60093e7415a1796bad138ae;hp=d1bb091f9490f54ef317a17f8d5953d89dfcf5c3;hpb=b1e74a3e843f44c09c9c88b42db0efba99facb13;p=tpg%2Facess2.git

diff --git a/Kernel/arch/armv7/proc.S b/Kernel/arch/armv7/proc.S
index d1bb091f..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
 	
@@ -54,6 +46,8 @@ SwitchTask:
 	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,7 +55,7 @@ SwitchTask:
 	bx r2
 
 .return:
-	push {r4-r12,pc}
+	pop {r4-r12,pc}
 
 .extern MM_Clone
 .extern MM_DumpTables
@@ -79,20 +73,29 @@ Proc_CloneInt:
 	ldr r0, =Proc_CloneInt_new
 	pop {r4-r12,pc}
 Proc_CloneInt_new:
-	cps #18
-		
 	mov r0, #0
-	mov r1, #0
-	sub r1, #1
-	bl MM_DumpTables
+	pop {r4-r12,pc}
 
-@	ldr r0, =csProc_CloneInt_NewTaskMessage
-@	bl Log
-	
+@ 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 r0, #0
-	pop {r4-r12,pc}
+	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: