X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.asm;h=9c1cabd90f7426bc39b62c9304e1e2adaa810648;hb=30e2436921e53b149d65403430048e39a44cad4b;hp=944b24dd4d5cd16cdd825515b5b8ca365df7a8fd;hpb=3764c294f21229bdf700f436fa4884f5e76e0d3a;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/proc.asm b/Kernel/arch/x86/proc.asm
index 944b24dd..9c1cabd9 100644
--- a/Kernel/arch/x86/proc.asm
+++ b/Kernel/arch/x86/proc.asm
@@ -8,6 +8,74 @@ KERNEL_BASE	equ 0xC0000000
 KSTACK_USERSTATE_SIZE	equ	(4+8+1+5)*4	; SRegs, GPRegs, CPU, IRET
 
 [section .text]
+
+[global NewTaskHeader]
+NewTaskHeader:
+	mov eax, [esp]
+	mov dr0, eax
+
+	mov eax, [esp+4]
+	add esp, 12	; Thread, Function, Arg Count
+	call eax
+	
+	push eax	; Ret val
+	push 0  	; 0 = This Thread
+	call Threads_Exit
+
+[extern MM_Clone]
+[global Proc_CloneInt]
+Proc_CloneInt:
+	pusha
+	; Save RSP
+	mov eax, [esp+0x20+4]
+	mov [eax], esp
+	call MM_Clone
+	; Save CR3
+	mov esi, [esp+0x20+8]
+	mov [esi], eax
+	; Undo the pusha
+	add esp, 0x20
+	mov eax, .newTask
+	ret
+.newTask:
+	popa
+	xor eax, eax
+	ret
+
+[global SwitchTasks]
+; + 4 = New RSP
+; + 8 = Old RSP save loc
+; +12 = New RIP
+; +16 = Old RIP save loc
+; +20 = CR3
+SwitchTasks:
+	pusha
+	
+	; Old IP
+	mov eax, [esp+0x20+16]
+	mov DWORD [eax], .restore
+	; Old SP
+	mov eax, [esp+0x20+8]
+	mov [eax], esp
+
+	mov ecx, [esp+0x20+12]	; New IP
+	mov eax, [esp+0x20+20]	; New CR3
+	mov esp, [esp+0x20+ 4]	; New SP
+	test eax, eax
+	jz .setState
+	mov cr3, eax
+	invlpg [esp]
+	invlpg [esp+0x1000]
+.setState:
+;	xchg bx, bx
+	jmp ecx
+
+.restore:
+	popa
+	xor eax, eax
+	ret
+
+
 %if USE_MP
 [extern giMP_TimerCount]
 [extern gpMP_LocalAPIC]
@@ -135,7 +203,7 @@ scheduler_return:	; Used by some hackery in Proc_DumpThreadCPUState
 SpawnTask:
 	; Call Proc_Clone with Flags=0
 	xor eax, eax
-	push eax
+;	push eax
 	push eax
 	call Proc_Clone
 	add esp, 8	; Remove arguments from stack
@@ -186,14 +254,10 @@ Proc_ReturnToUser:
 	; Validate user ESP
 	; - Page Table
 	mov edx, [eax+KSTACK_USERSTATE_SIZE-12]	; User ESP is at top of kstack - 3*4
-	%if USE_PAE
-	%error PAE Support
-	%else
 	mov ecx, edx
 	shr ecx, 22
 	test BYTE [0xFC3F0000+ecx*4], 1
 	jnz .justKillIt
-	%endif
 	; - Page
 	mov ecx, edx
 	shr ecx, 12
@@ -202,13 +266,10 @@ Proc_ReturnToUser:
 	; Adjust
 	sub edx, 8
 	; - Page Table
-	%if USE_PAE
-	%else
 	mov ecx, edx
 	shr ecx, 22
 	test BYTE [0xFC3F0000+ecx*4], 1
 	jnz .justKillIt
-	%endif
 	; - Page
 	mov ecx, edx
 	shr ecx, 12