michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-17 23:07:50 +00:00
Code Issues Projects Releases Wiki Activity

Move global_asm inline in threads module

Browse Source
This commit is contained in:
Philipp Oppermann
2020-01-23 09:20:17 +01:00
parent cd138a3a1b
commit e1242a867f
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/multitasking/context_switch.s
View File

@@ -1,13 +0,0 @@
.intel_syntax noprefix
asm_context_switch:
pushfq
mov rax, rsp
mov rsp, rdi
mov rdi, rax
call add_paused_thread
popfq
ret

20
src/threads.rs
View File

@@ -2,8 +2,6 @@ use alloc::collections::VecDeque;
use x86_64::structures::paging::{FrameAllocator, Mapper, Size4KiB}; use x86_64::structures::paging::{FrameAllocator, Mapper, Size4KiB};
use x86_64::VirtAddr; use x86_64::VirtAddr;
global_asm!(include_str!("multitasking/context_switch.s"));
pub unsafe fn context_switch(stack_pointer: VirtAddr) { pub unsafe fn context_switch(stack_pointer: VirtAddr) {
asm!( asm!(
"call asm_context_switch" "call asm_context_switch"
@@ -15,6 +13,24 @@ pub unsafe fn context_switch(stack_pointer: VirtAddr) {
); );
} }
global_asm!(
"
.intel_syntax noprefix
asm_context_switch:
pushfq
mov rax, rsp
mov rsp, rdi
mov rdi, rax
call add_paused_thread
popfq
ret
"
);
pub fn scheduler() { pub fn scheduler() {
let next = PAUSED_THREADS.try_lock().and_then(|mut paused_threads| { let next = PAUSED_THREADS.try_lock().and_then(|mut paused_threads| {
paused_threads paused_threads