From 9330dabed3ac8d2fc8fa3c1b61f4f6c094123f69 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 14 Mar 2022 01:18:07 +0800 Subject: [PATCH] fix debug print locations for loader --- loader/src/main.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/loader/src/main.rs b/loader/src/main.rs index d92daed8f..d7361d552 100644 --- a/loader/src/main.rs +++ b/loader/src/main.rs @@ -1265,14 +1265,14 @@ fn boot_sequence(args: KernelArguments, _signature: u32) -> ! { } println!("Font maps located as follows:"); - println!(" Hanzi @ {:08x}", fonts::hanzi::DATA_HANZI.as_ptr() as u32); - println!(" Emoji @ {:08x}", fonts::emoji::DATA_EMOJI.as_ptr() as u32); + println!(" Hanzi @ {:08x}", fonts::zh::ZH_GLYPHS.as_ptr() as u32); + println!(" Emoji @ {:08x}", fonts::emoji::EMOJI_GLYPHS.as_ptr() as u32); println!( " Regular @ {:08x}", - fonts::regular::DATA_REGULAR.as_ptr() as u32 + fonts::regular::REGULAR_GLYPHS.as_ptr() as u32 ); - println!(" Small @ {:08x}", fonts::small::DATA_SMALL.as_ptr() as u32); - println!(" Bold @ {:08x}", fonts::bold::DATA_BOLD.as_ptr() as u32); + println!(" Small @ {:08x}", fonts::small::SMALL_GLYPHS.as_ptr() as u32); + println!(" Bold @ {:08x}", fonts::bold::BOLD_GLYPHS.as_ptr() as u32); if !clean { // The MMU should be set up now, and memory pages assigned to their @@ -1339,6 +1339,7 @@ fn boot_sequence(args: KernelArguments, _signature: u32) -> ! { //let satp = (*backup_args)[3]; println!("Adjusting SATP to the sures process. Was: 0x{:08x} now: 0x{:08x}", (*backup_args)[3], satp); + #[cfg(not(feature = "renode-bypass"))] if true { use utralib::generated::*; let mut gpio_csr = CSR::new(utra::gpio::HW_GPIO_BASE as *mut u32);