Reload code and TSS selector registers

This commit is contained in:
Philipp Oppermann
2019-01-25 13:59:09 +01:00
parent b5202e26a1
commit ff25a7d86c

View File

@@ -1,5 +1,5 @@
use lazy_static::lazy_static; use lazy_static::lazy_static;
use x86_64::structures::gdt::{Descriptor, GlobalDescriptorTable}; use x86_64::structures::gdt::{Descriptor, GlobalDescriptorTable, SegmentSelector};
use x86_64::structures::tss::TaskStateSegment; use x86_64::structures::tss::TaskStateSegment;
use x86_64::VirtAddr; use x86_64::VirtAddr;
@@ -21,14 +21,32 @@ lazy_static! {
} }
lazy_static! { lazy_static! {
static ref GDT: GlobalDescriptorTable = { static ref GDT: (GlobalDescriptorTable, Selectors) = {
let mut gdt = GlobalDescriptorTable::new(); let mut gdt = GlobalDescriptorTable::new();
gdt.add_entry(Descriptor::kernel_code_segment()); let code_selector = gdt.add_entry(Descriptor::kernel_code_segment());
gdt.add_entry(Descriptor::tss_segment(&TSS)); let tss_selector = gdt.add_entry(Descriptor::tss_segment(&TSS));
gdt (
gdt,
Selectors {
code_selector,
tss_selector,
},
)
}; };
} }
pub fn init() { struct Selectors {
GDT.load(); code_selector: SegmentSelector,
tss_selector: SegmentSelector,
}
pub fn init() {
use x86_64::instructions::segmentation::set_cs;
use x86_64::instructions::tables::load_tss;
GDT.0.load();
unsafe {
set_cs(GDT.1.code_selector);
load_tss(GDT.1.tss_selector);
}
} }