TempleOSCDV4.03.ISO

Kernel/Sched.CPP

@@ -167,29 +167,12 @@ _TASK_END_NOW::
 _YIELD::
 	PUSHFD
 	TEST	U8 [SYS_SEMAS+SYS_SEMA_SINGLE_USER*SEMA_STRUCT_SIZE],1
-	JNZ	@@05	//If single user, don't change task.
-
-	CLI
-	PUSH	RSI
-	XOR	RSI,RSI
-	MOV	RSI,FS:CTask.addr[RSI]
-	CMP	U64 CTask.next_task[RSI],RSI
-	JNE	@@15	//Jmp if not just one task on core.
-
-	PUSH	RAX
-	MOV	RAX,U64 [&cnts.jiffies]
-	CMP	U64 CTask.wake_jiffy[RSI],RAX
-	JG	@@10	//If needs to sleep, jmp and swap-out.
-
-	POP	RAX
-	POP	RSI
-@@05:	POPFD
+	JZ	@@05
+	POPFD		//If single user, don't change task.
 	RET
 
-@@10:	POP	RAX
-@@15:	POP	RSI
+@@05:	CLI
 	CALL	TASK_CONTEXT_SAVE
-
 	MOV	EBX,U32 _RET
 	MOV	U64 CTask.rip[RSI],RBX
 	POP	U64 CTask.rflags[RSI]
@@ -203,7 +186,7 @@ RESTORE_RSI_TASK:
 
 RESTORE_RSI_TASK2:
 @@20:	BT	U64 CTask.task_flags[RSI],TASKf_KILL_TASK
-	JC	I32 END_RSI_TASK
+	JC	END_RSI_TASK
 	TEST	U64 CTask.task_flags[RSI],
 		1<<TASKf_AWAITING_MSG|1<<TASKf_SUSPENDED
 	JNZ	@@25