From 3c45720fa3dc204d0bf8156391fd438ee40fb141 Mon Sep 17 00:00:00 2001 From: Erin <erin@erindesu.cz> Date: Tue, 22 Aug 2023 15:57:57 +0200 Subject: [PATCH] Better example --- kernel/src/holeybytes.rs | 16 ++++++++-------- repbuild/holeybytes/failure.hb | Bin 0 -> 17 bytes repbuild/holeybytes/inf_loop.hb | Bin 23 -> 0 bytes repbuild/limine.cfg | 2 +- repbuild/src/main.rs | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 repbuild/holeybytes/failure.hb delete mode 100644 repbuild/holeybytes/inf_loop.hb diff --git a/kernel/src/holeybytes.rs b/kernel/src/holeybytes.rs index 225ce3d..eb80658 100644 --- a/kernel/src/holeybytes.rs +++ b/kernel/src/holeybytes.rs @@ -1,13 +1,13 @@ -use core::{future::Future, task::Poll}; - -use hbvm::{ - mem::{softpaging::icache::ICache, Address}, - Vm, VmRunError, VmRunOk, -}; - use { alloc::boxed::Box, - hbvm::mem::softpaging::{HandlePageFault, SoftPagedMem}, + core::{future::Future, task::Poll}, + hbvm::{ + mem::{ + softpaging::{icache::ICache, HandlePageFault, SoftPagedMem}, + Address, + }, + Vm, VmRunError, VmRunOk, + }, }; const TIMER_QUOTIENT: usize = 100; diff --git a/repbuild/holeybytes/failure.hb b/repbuild/holeybytes/failure.hb new file mode 100644 index 0000000000000000000000000000000000000000..0cf46f6a39c8944b5fccfbb4d90d405d0f53d8fb GIT binary patch literal 17 Ocmd;<Tg|}4fCK;x%K+B^ literal 0 HcmV?d00001 diff --git a/repbuild/holeybytes/inf_loop.hb b/repbuild/holeybytes/inf_loop.hb deleted file mode 100644 index 0a4fe615153afee88ff9cd9eca80ebf75c40c218..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23 KcmY#nzzP5Z4gewm diff --git a/repbuild/limine.cfg b/repbuild/limine.cfg index bb56ffa..7f740f4 100644 --- a/repbuild/limine.cfg +++ b/repbuild/limine.cfg @@ -18,7 +18,7 @@ TERM_BACKDROP=008080 # Setting a default resolution for the framebuffer RESOLUTION=1024x768x24 - MODULE_PATH=boot:///inf_loop.hb + MODULE_PATH=boot:///failure.hb MODULE_CMDLINE="diskid=123456789" MODULE_PATH=boot:///ecall.hb diff --git a/repbuild/src/main.rs b/repbuild/src/main.rs index 55bcbeb..d3ed8c9 100644 --- a/repbuild/src/main.rs +++ b/repbuild/src/main.rs @@ -110,8 +110,8 @@ fn get_fs() -> Result<FileSystem<impl ReadWriteSeek>, io::Error> { &mut fs.root_dir().create_file("background.bmp")?, )?; io::copy( - &mut File::open("repbuild/holeybytes/inf_loop.hb")?, - &mut fs.root_dir().create_file("inf_loop.hb")?, + &mut File::open("repbuild/holeybytes/failure.hb")?, + &mut fs.root_dir().create_file("failure.hb")?, )?; io::copy(