Trees/ableos_time
1
0
Fork 0
forked from AbleOS/ableos
Code Pull requests Activity

fixed segments, timer doesn't double-fault anymore

Browse source
This commit is contained in:
Erin 2022-12-08 20:35:42 +01:00 committed by ondra05
parent cc714be94e
commit 11b492d6ce
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/src/arch/x86_64/gdt.rs
View file

@ -10,7 +10,7 @@ use x86_64::{
pub const DOUBLE_FAULT_IX: u16 = 0; pub const DOUBLE_FAULT_IX: u16 = 0;
pub unsafe fn init() { pub unsafe fn init() {
use x86_64::instructions::segmentation::{Segment, CS, DS}; use x86_64::instructions::segmentation::{Segment, CS, DS, ES, SS};
use x86_64::instructions::tables::load_tss; use x86_64::instructions::tables::load_tss;
log::info!("Initialising GDT"); log::info!("Initialising GDT");
@ -18,6 +18,8 @@ pub unsafe fn init() {
unsafe { unsafe {
CS::set_reg(GDT.1.kcode); CS::set_reg(GDT.1.kcode);
DS::set_reg(GDT.1.kdata); DS::set_reg(GDT.1.kdata);
ES::set_reg(GDT.1.kdata);
SS::set_reg(GDT.1.kdata);
load_tss(GDT.1.tss); load_tss(GDT.1.tss);
} }
} }

1
kernel/src/arch/x86_64/interrupts.rs
View file

@ -55,7 +55,6 @@ extern "x86-interrupt" fn page_fault(
} }
extern "x86-interrupt" fn timer(_: InterruptStackFrame) { extern "x86-interrupt" fn timer(_: InterruptStackFrame) {
panic!("make timer not double fault");
unsafe { LAPIC.lock().end_of_interrupt() }; unsafe { LAPIC.lock().end_of_interrupt() };
} }