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

Update some of the following posts to use blog_os::init

Browse Source
This commit is contained in:
Philipp Oppermann
2019-04-25 17:56:00 +02:00
parent fd8fb3e581
commit 8735bbefd4
3 changed files with 23 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
blog/content/second-edition/posts/06-double-faults/index.md
View File

@@ -35,7 +35,7 @@ Let's provoke a double fault by triggering an exception for that we didn't defin
pub extern "C" fn _start() -> ! {
println!("Hello World{}", "!");
blog_os::interrupts::init_idt();
blog_os::init();
// trigger a page fault
unsafe {
@@ -162,7 +162,7 @@ Let's try it ourselves! We can easily provoke a kernel stack overflow by calling
pub extern "C" fn _start() -> ! {
println!("Hello World{}", "!");
blog_os::interrupts::init_idt();
blog_os::init();
fn stack_overflow() {
stack_overflow(); // for each recursion, the return address is pushed
@@ -298,7 +298,7 @@ We use `lazy_static` again, because Rust's const evaluator is not powerful enoug
#### Loading the GDT
To load our GDT we create a new `gdt::init` function, that we call from our `_start` function:
To load our GDT we create a new `gdt::init` function, that we call from our `init` function:
```rust
// in src/gdt.rs
@@ -307,22 +307,15 @@ pub fn init() {
GDT.load();
}
// in src/main.rs
// in src/lib.rs
#[cfg(not(test))]
#[no_mangle]
pub extern "C" fn _start() -> ! {
println!("Hello World{}", "!");
blog_os::gdt::init();
blog_os::interrupts::init_idt();
[…]
pub fn init() {
gdt::init();
interrupts::init_idt();
}
```
Now our GDT is loaded, but we still see the boot loop on stack overflow.
Now our GDT is loaded (since the `_start` function calls `init`), but we still see the boot loop on stack overflow.
### The final Steps