michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Use new enable_interrupts_and_hlt function of x86_64

Browse Source
This commit is contained in:
Philipp Oppermann
2020-03-08 14:50:58 +01:00
parent c3ea4190ca
commit b3ba0ba4e9
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/task/executor.rs
View File

@@ -89,14 +89,7 @@ impl Executor {
// check if relevant interrupts occured since the last check // check if relevant interrupts occured since the last check
if interrupts::interrupt_wakeups().is_empty() { if interrupts::interrupt_wakeups().is_empty() {
// no interrupts occured -> hlt to wait for next interrupt // no interrupts occured -> hlt to wait for next interrupt
// x86_64::instructions::interrupts::enable_interrupts_and_hlt();
// It's important to execute `hlt` directly after `sti` because
// otherwise we could miss interrupts between the two
// instructions. Since `sti` only enables interrupts after the
// subsequent instruction, we can be sure that we don't miss an
// interrupt. (One exception are non-maskable interrupts, which
// can occur even when interrupts are disabled.)
unsafe { asm!("sti; hlt") };
} else { } else {
// there were some new wakeups -> continue execution // there were some new wakeups -> continue execution
x86_64::instructions::interrupts::enable(); x86_64::instructions::interrupts::enable();