X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.asm;h=5a9ad0aa8acefdc72def6291f772054b461708bd;hb=17aac974ab83a3521f2b49b8de33ae05a00fbe07;hp=87dcd61b9078cea74427075bc41919b59afe471b;hpb=adbdc45e64c40f7d3a022caedeb22f5e95dcd12a;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/proc.asm b/Kernel/arch/x86/proc.asm
index 87dcd61b..5a9ad0aa 100644
--- a/Kernel/arch/x86/proc.asm
+++ b/Kernel/arch/x86/proc.asm
@@ -8,6 +8,26 @@ 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
+	xchg bx, bx	
+
+	sti
+	; TODO: SMP
+	mov al, 0x20
+	out 0x20, al
+	
+	mov eax, [esp+4]
+	add esp, 12	; Thread, Function, Args
+	call eax
+	
+	push eax	; Ret val
+	push 0  	; 0 = This Thread
+	call Threads_Exit
+
 %if USE_MP
 [extern giMP_TimerCount]
 [extern gpMP_LocalAPIC]
@@ -74,6 +94,10 @@ SchedulerBase:
 	push fs
 	push gs
 	
+	pushf
+	and BYTE [esp+1], 0xFE	; Clear Trap Flag
+	popf
+	
 	mov eax, dr0
 	push eax	; Debug Register 0, Current Thread
 	
@@ -121,7 +145,7 @@ scheduler_return:	; Used by some hackery in Proc_DumpThreadCPUState
 	pop ds
 	
 	popa
-	add esp, 4	; CPU ID
+	add esp, 4*2	; CPU ID + Dummy error code
 	; No Error code / int num
 	iret
 
@@ -131,7 +155,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
@@ -142,9 +166,10 @@ SpawnTask:
 	; In child, so now set up stack frame
 	mov ebx, [esp+4]	; Child Function
 	mov edx, [esp+8]	; Argument
-	; Child
+	; Child Function
 	push edx	; Argument
 	call ebx	; Function
+	; Kill thread once done
 	push eax	; Exit Code
 	push   0	; Kill this thread
 	call Threads_Exit	; Kill Thread
@@ -181,14 +206,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
@@ -197,13 +218,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
@@ -237,7 +255,7 @@ Proc_ReturnToUser:
 .justKillIt:
 	xor eax, eax
 	xor ebx, ebx
-	dec ebx
+	dec ebx	; EBX = -1
 	int 0xAC
 
 [global GetCPUNum]
@@ -249,6 +267,15 @@ GetCPUNum:	; TODO: Store in debug registers
 	mov eax, dr1
 	ret
 
+[extern GetEIP]
+[global GetEIP_Sched]
+[global GetEIP_Sched_ret]
+GetEIP_Sched_ret equ GetEIP_Sched.ret
+GetEIP_Sched:
+	call GetEIP
+GetEIP_Sched.ret:
+	ret
+
 ; Usermode code exported by the kernel
 [section .usertext]
 ; Export a place for the user to jump to to call a syscall