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
Cleaning up some misc files
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
proc.asm
diff --git
a/Kernel/arch/x86/proc.asm
b/Kernel/arch/x86/proc.asm
index
cefd796
..
732d35f
100644
(file)
--- a/
Kernel/arch/x86/proc.asm
+++ b/
Kernel/arch/x86/proc.asm
@@
-74,6
+74,9
@@
SchedulerBase:
push fs
push gs
push fs
push gs
+ mov eax, dr0
+ push eax ; Debug Register 0, Current Thread
+
mov ax, 0x10
mov ds, ax
mov es, ax
mov ax, 0x10
mov ds, ax
mov es, ax
@@
-107,6
+110,9
@@
SchedulerBase:
mov DWORD [eax+0x0B0], 0
%endif
.ret:
mov DWORD [eax+0x0B0], 0
%endif
.ret:
+ pop eax ; Debug Register 0, Current Thread
+ mov dr0, eax
+
pop gs
pop fs
pop es
pop gs
pop fs
pop es
@@
-144,19
+150,22
@@
SpawnTask:
.parent:
ret
.parent:
ret
-;
+;
void Proc_ReturnToUser(void *Method, Uint Parameter)
; Calls a user fault handler
;
[global Proc_ReturnToUser]
[extern Proc_GetCurThread]
Proc_ReturnToUser:
; Calls a user fault handler
;
[global Proc_ReturnToUser]
[extern Proc_GetCurThread]
Proc_ReturnToUser:
- ; EBP is the handler to use
+ push ebp
+ mov ebp, esp
+ ; [EBP+4]: handler to use
+ ; [EBP+8]: parameter
call Proc_GetCurThread
; EAX is the current thread
mov ebx, eax
call Proc_GetCurThread
; EAX is the current thread
mov ebx, eax
- mov eax, [ebx+
40]
; Get Kernel Stack
+ mov eax, [ebx+
12*4]
; Get Kernel Stack
sub eax, KSTACK_USERSTATE_SIZE
;
sub eax, KSTACK_USERSTATE_SIZE
;
@@
-198,10
+207,10
@@
Proc_ReturnToUser:
jnz .justKillIt
; Get and alter User SP
jnz .justKillIt
; Get and alter User SP
- mov e
cx
, edx
- mov edx, [eb
x+60] ; Get Signal Number from TCB
- mov [e
cx+4], edx ; Parameter (Signal/Error Number)
- mov [e
cx
], DWORD User_Syscall_RetAndExit ; Return Address
+ mov e
di
, edx
+ mov edx, [eb
p+8] ; Get parameter
+ mov [e
di+4], edx ; save to user stack
+ mov [e
di
], DWORD User_Syscall_RetAndExit ; Return Address
; Restore Segment Registers
mov ax, 0x23
; Restore Segment Registers
mov ax, 0x23
@@
-211,10
+220,11
@@
Proc_ReturnToUser:
mov gs, ax
push 0x23 ; SS
mov gs, ax
push 0x23 ; SS
- push e
cx
; ESP
+ push e
di
; ESP
push 0x202 ; EFLAGS (IP and Rsvd)
push 0x1B ; CS
push 0x202 ; EFLAGS (IP and Rsvd)
push 0x1B ; CS
- push ebp ; EIP
+ mov eax, [ebp+4] ; Method to call
+ push eax ; EIP
iret
iret
@@
-227,7
+237,7
@@
Proc_ReturnToUser:
int 0xAC
[global GetCPUNum]
int 0xAC
[global GetCPUNum]
-GetCPUNum:
+GetCPUNum:
; TODO: Store in debug registers
xor eax, eax
str ax
sub ax, 0x30
xor eax, eax
str ax
sub ax, 0x30
@@
-236,6
+246,13
@@
GetCPUNum:
; Usermode code exported by the kernel
[section .usertext]
; Usermode code exported by the kernel
[section .usertext]
+; Export a place for the user to jump to to call a syscall
+; - Allows the kernel to change the method easily
+User_Syscall:
+ xchg bx, bx ; MAGIC BREAKPOINT
+ int 0xAC
+
+; A place to return to and exit
User_Syscall_RetAndExit:
push eax
call User_Syscall_Exit
User_Syscall_RetAndExit:
push eax
call User_Syscall_Exit
UCC
git Repository :: git.ucc.asn.au