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

Update to x86_64 0.2.8: The Idt type was renamed to InterruptDescriptorTable

Browse Source
This commit is contained in:
Philipp Oppermann
2018-07-14 14:32:33 +02:00
parent 3faa0cfcad
commit 0f07341dea
8 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
blog/content/second-edition/posts/07-double-faults/index.md
View File

@@ -63,8 +63,8 @@ A double fault is a normal exception with an error code, so we can specify a han
// in src/main.rs
lazy_static! {
static ref IDT: Idt = {
let mut idt = Idt::new();
static ref IDT: InterruptDescriptorTable = {
let mut idt = InterruptDescriptorTable::new();
idt.breakpoint.set_handler_fn(breakpoint_handler);
idt.double_fault.set_handler_fn(double_fault_handler); // new
idt
@@ -222,7 +222,7 @@ The _Privilege Stack Table_ is used by the CPU when the privilege level changes.
### Creating a TSS
Let's create a new TSS that contains a separate double fault stack in its interrupt stack table. For that we need a TSS struct. Fortunately, the `x86_64` crate already contains a [`TaskStateSegment` struct] that we can use.
[`TaskStateSegment` struct]: https://docs.rs/x86_64/0.2.3/x86_64/structures/tss/struct.TaskStateSegment.html
[`TaskStateSegment` struct]: https://docs.rs/x86_64/0.2.8/x86_64/structures/tss/struct.TaskStateSegment.html
We create the TSS in a new `gdt` module (the name will make sense later):
@@ -374,8 +374,8 @@ pub fn init() {
We reload the code segment register using [`set_cs`] and to load the TSS using [`load_tss`]. The functions are marked as `unsafe`, so we need an `unsafe` block to invoke them. The reason is that it might be possible to break memory safety by loading invalid selectors.
[`set_cs`]: https://docs.rs/x86_64/0.2.3/x86_64/instructions/segmentation/fn.set_cs.html
[`load_tss`]: https://docs.rs/x86_64/0.2.3/x86_64/instructions/tables/fn.load_tss.html
[`set_cs`]: https://docs.rs/x86_64/0.2.8/x86_64/instructions/segmentation/fn.set_cs.html
[`load_tss`]: https://docs.rs/x86_64/0.2.8/x86_64/instructions/tables/fn.load_tss.html
Now that we loaded a valid TSS and interrupt stack table, we can set the stack index for our double fault handler in the IDT:
@@ -383,8 +383,8 @@ Now that we loaded a valid TSS and interrupt stack table, we can set the stack i
// in src/main.rs
lazy_static! {
static ref IDT: Idt = {
let mut idt = Idt::new();
static ref IDT: InterruptDescriptorTable = {
let mut idt = InterruptDescriptorTable::new();
idt.breakpoint.set_handler_fn(breakpoint_handler);
unsafe {
idt.double_fault.set_handler_fn(double_fault_handler)