git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More work on x86_64 port, near compiling now
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
proc.asm
diff --git
a/Kernel/arch/x86/proc.asm
b/Kernel/arch/x86/proc.asm
index
9d752bf
..
d905c24
100644
(file)
--- a/
Kernel/arch/x86/proc.asm
+++ b/
Kernel/arch/x86/proc.asm
@@
-74,13
+74,12
@@
SpawnTask:
;
; Calls a user fault handler
;
;
; Calls a user fault handler
;
-[global Proc_
AlterUserReturnAdd
r]
+[global Proc_
ReturnToUse
r]
[extern Proc_GetCurThread]
[extern Proc_GetCurThread]
-Proc_
AlterUserReturnAdd
r:
+Proc_
ReturnToUse
r:
; EBP is the handler to use
call Proc_GetCurThread
; EBP is the handler to use
call Proc_GetCurThread
- xchg bx, bx
; EAX is the current thread
mov ebx, eax
; EAX is the current thread
mov ebx, eax
@@
-109,7
+108,7
@@
Proc_AlterUserReturnAddr:
push 0x23 ; SS
push ecx ; ESP
push 0x23 ; SS
push ecx ; ESP
- push 0x2
2 ; EFLAGS
+ push 0x2
02 ; EFLAGS (IP and Rsvd)
push 0x1B ; CS
push ebp ; EIP
push 0x1B ; CS
push ebp ; EIP
UCC
git Repository :: git.ucc.asn.au