Fix GPF from wrong TSS selector
This commit is contained in:
parent
f9fd19b6d0
commit
749a0d6bec
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
/build
|
||||
.idea
|
||||
/log
|
||||
a.out
|
||||
@ -78,7 +78,6 @@ lazy_static! {
|
||||
// DO NOT REORDER
|
||||
let sel_tss = gdt.append(
|
||||
Descriptor::tss_segment(&TSS).set_flags(DescriptorFlags::from_bits_retain(0b1010))
|
||||
.set_access(0b10001011), // This would set the TSS to Busy, but it causes a GPF.
|
||||
);
|
||||
Selectors {
|
||||
sel_kernel_code: sel_k_cs,
|
||||
|
||||
@ -2,15 +2,10 @@ use x86_64::{VirtAddr, registers::rflags::RFlags, structures::idt::InterruptStac
|
||||
|
||||
use crate::{
|
||||
arch::{
|
||||
asm::ltr,
|
||||
x86_64::{
|
||||
gdt::{SELECTORS, dump_gdt},
|
||||
interrupts::IDT,
|
||||
asm::ltr, x86_64::{
|
||||
gdt::SELECTORS, interrupts::IDT,
|
||||
},
|
||||
},
|
||||
log::{LOGGER, LogLevel},
|
||||
log_info,
|
||||
memory::alloc::format,
|
||||
}, log::{LOGGER, LogLevel}, log_info, memory::alloc::format,
|
||||
};
|
||||
|
||||
pub fn init() -> Result<(), ()> {
|
||||
@ -27,8 +22,8 @@ pub fn init() -> Result<(), ()> {
|
||||
SELECTORS.sel_kernel_stack,
|
||||
)
|
||||
.expect("Segment order in GDT is bad");
|
||||
dump_gdt();
|
||||
ltr(SELECTORS.sel_tss.index());
|
||||
//ltr(SELECTORS.sel_tss.index()) // THIS WILL CAUSE A GPF, YOU STUPID WHORE
|
||||
ltr(SELECTORS.sel_tss.0);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user