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
Kernel - Split per-process and per-thread data
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
proc.asm
diff --git
a/Kernel/arch/x86/proc.asm
b/Kernel/arch/x86/proc.asm
index
00ea9e1
..
3de4e0a
100644
(file)
--- a/
Kernel/arch/x86/proc.asm
+++ b/
Kernel/arch/x86/proc.asm
@@
-262,7
+262,7
@@
SpawnTask:
.parent:
ret
.parent:
ret
-; void Proc_ReturnToUser(void *Method, Uint Parameter)
+; void Proc_ReturnToUser(void *Method, Uint Parameter
, tVAddr KernelStack
)
; Calls a user fault handler
;
[global Proc_ReturnToUser]
; Calls a user fault handler
;
[global Proc_ReturnToUser]
@@
-274,12
+274,8
@@
Proc_ReturnToUser:
; [EBP+12]: parameter
; [EBP+16]: kernel stack top
; [EBP+12]: parameter
; [EBP+16]: kernel stack top
- ;call Proc_GetCurThread
-
- ; EAX is the current thread
- ;mov ebx, eax
- ;mov eax, [ebx+12*4] ; Get Kernel Stack
- mov eax, [ebp+16] ; Get Kernel Stack
+ ; Get kernel stack
+ mov eax, [ebp+16]
sub eax, KSTACK_USERSTATE_SIZE
;
sub eax, KSTACK_USERSTATE_SIZE
;
@@
-345,10
+341,6
@@
Proc_ReturnToUser:
[global GetCPUNum]
GetCPUNum: ; TODO: Store in debug registers
[global GetCPUNum]
GetCPUNum: ; TODO: Store in debug registers
-; xor eax, eax
-; str ax
-; sub ax, 0x30
-; shr ax, 3 ; ax /= 8
mov eax, dr1
ret
mov eax, dr1
ret
UCC
git Repository :: git.ucc.asn.au