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/armv7 - Moved to asssembly 32-bit divide
[tpg/acess2.git]
/
Kernel
/
arch
/
x86_64
/
proc.asm
diff --git
a/Kernel/arch/x86_64/proc.asm
b/Kernel/arch/x86_64/proc.asm
index
4771e1b
..
e6db3ce
100644
(file)
--- a/
Kernel/arch/x86_64/proc.asm
+++ b/
Kernel/arch/x86_64/proc.asm
@@
-48,6
+48,7
@@
NewTaskHeader:
jmp .hlt
[extern MM_Clone]
jmp .hlt
[extern MM_Clone]
+[extern MM_DumpTables]
[global Proc_CloneInt]
Proc_CloneInt:
PUSH_GPR
[global Proc_CloneInt]
Proc_CloneInt:
PUSH_GPR
@@
-55,13
+56,16
@@
Proc_CloneInt:
mov [rdi], rsp
call MM_Clone
; Save CR3
mov [rdi], rsp
call MM_Clone
; Save CR3
- mov rsi, [rsp+0x30]
+ mov rsi, [rsp+0x30]
; Saved version of RSI
mov [rsi], rax
; Undo the PUSH_GPR
add rsp, 0x80
mov rax, .newTask
ret
.newTask:
mov [rsi], rax
; Undo the PUSH_GPR
add rsp, 0x80
mov rax, .newTask
ret
.newTask:
+; mov rdi, 0
+; mov rsi, 0x800000000000
+; call MM_DumpTables
POP_GPR
xor eax, eax
ret
POP_GPR
xor eax, eax
ret
@@
-98,21
+102,29
@@
SaveState:
SwitchTasks:
PUSH_GPR
SwitchTasks:
PUSH_GPR
+ ; Save state RIP and RSP
lea rax, [rel .restore]
lea rax, [rel .restore]
- mov
QWORD
[rcx], rax
+ mov [rcx], rax
mov [rsi], rsp
mov [rsi], rsp
+ ; Change CR3 if requested
test r8, r8
jz .setState
mov cr3, r8
test r8, r8
jz .setState
mov cr3, r8
+
+ ; Make sure the stack is valid before jumping
invlpg [rdi]
invlpg [rdi+0x1000]
invlpg [rdi]
invlpg [rdi+0x1000]
+
+ ; Go to new state
.setState:
mov rsp, rdi
jmp rdx
.setState:
mov rsp, rdi
jmp rdx
+ ; Restore point for saved state
.restore:
POP_GPR
.restore:
POP_GPR
- xor eax, eax
+ xor eax, eax
; Return zero
ret
ret
+; vim: ft=nasm
UCC
git Repository :: git.ucc.asn.au