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

Minor improvements

Browse Source
This commit is contained in:
Philipp Oppermann
2021-02-07 19:31:14 +01:00
parent f9f9b969bb
commit 268a5ccb7d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
blog/content/edition-3/posts/02-booting/index.md
View File

@@ -243,7 +243,7 @@ To use the `entry_point` macro, we rewrite our entry point function in the follo
```rust ```rust
// in src/main.rs // in src/main.rs
use bootloader::{BootInfo, entry_point}; use bootloader::{entry_point, BootInfo};
entry_point!(kernel_main); entry_point!(kernel_main);
@@ -264,7 +264,7 @@ The [Readme of the `bootloader` crate][`bootloader` Readme] describes how to cre
#### A `bootimage` crate #### A `bootimage` crate
Since following these steps manually is cumbersome, we create a script to automate it. For that we create a new `bootimage` crate in a subdirectory, in which we will implement the build steps: Since following these steps manually is cumbersome, we create a script to automate it. For that we create a new `bootimage` (short for _"bootable disk image"_) crate in a subdirectory, in which we will implement the build steps:
``` ```
cargo new --bin bootimage cargo new --bin bootimage
@@ -288,7 +288,7 @@ After creating the workspace, we begin the implementation of the `bootimage` cra
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
fn main() -> anyhow::Result<PathBuf> { fn main() -> anyhow::Result<()> {
// this is where cargo places our kernel executable // this is where cargo places our kernel executable
// (we hardcode this path for now, but will improve this later) // (we hardcode this path for now, but will improve this later)
let kernel_binary = Path::new("target/x86_64_blog_os/debug/blog_os"); let kernel_binary = Path::new("target/x86_64_blog_os/debug/blog_os");
@@ -334,8 +334,12 @@ We can already run our `bootimage` binary now by executing `cargo run --package
``` ```
> cargo run --package bootimage > cargo run --package bootimage
[...]
Finished dev [unoptimized + debuginfo] target(s) in 0.00s
Running `target/debug/bootimage`
thread 'main' panicked at 'not yet implemented', bootimage/src/main.rs:17:5
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
TODO
``` ```
Let's start resolving this by filling in the actual implementation. For that we implement the build steps outlined in the [`bootloader` Readme]. Let's start resolving this by filling in the actual implementation. For that we implement the build steps outlined in the [`bootloader` Readme].