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

Remove old cfg(not(test)) attributes from paging implementation post

Browse Source 
The kernel_main function is now also the entry point in test mode.
This commit is contained in:
Philipp Oppermann
2019-04-26 12:14:03 +02:00
parent 2d61a463fc
commit 57a506e0fc
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
blog/content/second-edition/posts/09-paging-implementation/index.md
View File

@@ -327,7 +327,6 @@ The bootloader passes the `BootInfo` struct to our kernel in the form of a `&'st
use bootloader::BootInfo;
#[cfg(not(test))]
#[no_mangle]
pub extern "C" fn _start(boot_info: &'static BootInfo) -> ! { // new argument
[…]
@@ -351,7 +350,6 @@ use bootloader::{BootInfo, entry_point};
entry_point!(kernel_main);
#[cfg(not(test))]
fn kernel_main(boot_info: &'static BootInfo) -> ! {
[…]
}
@@ -437,7 +435,6 @@ We can now use this function to print the entries of the level 4 table:
```rust
// in src/main.rs
#[cfg(not(test))]
fn kernel_main(boot_info: &'static BootInfo) -> ! {
[…] // initialize GDT, IDT, PICS
@@ -578,7 +575,6 @@ Let's test our translation function by translating some addresses:
```rust
// in src/main.rs
#[cfg(not(test))]
fn kernel_main(boot_info: &'static BootInfo) -> ! {
[…] // initialize GDT, IDT, PICS
@@ -679,7 +675,6 @@ To use the `MapperAllSizes::translate_addr` method instead of our own `memory::t
```rust
// in src/main.rs
#[cfg(not(test))]
fn kernel_main(boot_info: &'static BootInfo) -> ! {
[…] // initialize GDT, IDT, PICS
@@ -791,7 +786,6 @@ To test our mapping function, we first map page `0x1000` and then try to write t
```rust
// in src/main.rs
#[cfg(not(test))]
fn kernel_main(boot_info: &'static BootInfo) -> ! {
[…] // initialize GDT, IDT, PICS
@@ -832,7 +826,6 @@ Creating that mapping only worked because there was already a level 1 table for
```rust
// in src/main.rs
#[cfg(not(test))]
fn kernel_main(boot_info: &'static BootInfo) -> ! {
[…]
let page = Page::containing_address(VirtAddr::new(0xdeadbeaf000));
@@ -924,7 +917,6 @@ We can now modify our `kernel_main` function to pass a `BootInfoFrameAllocator`
```rust
// in src/main.rs
#[cfg(not(test))]
fn kernel_main(boot_info: &'static BootInfo) -> ! {
[…]
let mut frame_allocator = memory::init_frame_allocator(&boot_info.memory_map);