X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.asm;h=d905c249ad06bb3e4ec9b3b16b75cdfdeb2505b9;hb=9f407c493c33928e0f19b834699d9694036ca42e;hp=9d752bf10d908df8688627378347bafd215ed664;hpb=7a6a1cbc62289d64d604fb2cb204d21659c4905e;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86/proc.asm b/Kernel/arch/x86/proc.asm index 9d752bf1..d905c249 100644 --- a/Kernel/arch/x86/proc.asm +++ b/Kernel/arch/x86/proc.asm @@ -74,13 +74,12 @@ SpawnTask: ; ; Calls a user fault handler ; -[global Proc_AlterUserReturnAddr] +[global Proc_ReturnToUser] [extern Proc_GetCurThread] -Proc_AlterUserReturnAddr: +Proc_ReturnToUser: ; EBP is the handler to use call Proc_GetCurThread - xchg bx, bx ; EAX is the current thread mov ebx, eax @@ -109,7 +108,7 @@ Proc_AlterUserReturnAddr: push 0x23 ; SS push ecx ; ESP - push 0x22 ; EFLAGS + push 0x202 ; EFLAGS (IP and Rsvd) push 0x1B ; CS push ebp ; EIP