diff --git a/bootloader/stage-64bit/src/main.rs b/bootloader/stage-64bit/src/main.rs index 618968d3..cc8dc229 100644 --- a/bootloader/stage-64bit/src/main.rs +++ b/bootloader/stage-64bit/src/main.rs @@ -33,13 +33,13 @@ use elf::{ Elf, tables::{ArchKind, SegmentKind}, }; -use lldebug::{debug_ready, hexdump::HexPrint, log, logln, make_debug}; +use lldebug::{debug_ready, log, logln, make_debug}; use mem::phys::{PhysMemoryEntry, PhysMemoryKind, PhysMemoryMap}; use serial::{Serial, baud::SerialBaud}; use util::{ align_to, bytes::HumanBytes, - consts::{MIB, PAGE_2M, PAGE_4K}, + consts::{MIB, PAGE_2M}, }; mod paging; @@ -74,7 +74,7 @@ fn main(stage_to_stage: &Stage32toStage64) { logln!("Kernel Size : {}", HumanBytes::from(kernel_exe_len)); let page_info = build_memory_map(stage_to_stage, kernel_exe_len); - let mut virt_info = paging::build_page_tables(page_info); + let virt_info = paging::build_page_tables(page_info); log!("Loading new page tables..."); unsafe { paging::load_page_tables() }; @@ -105,9 +105,6 @@ fn main(stage_to_stage: &Stage32toStage64) { .unwrap(); logln!(") -- OK"); - let kernel_exe_slice = virt_info.exe_slice(); - logln!("{}", (&kernel_exe_slice[..1024]).hexdump()); - unsafe { let mm = &mut *MEMORY_MAP.get(); let s2k = &mut *KERNEL_INFO.get(); diff --git a/bootloader/stage-64bit/src/paging.rs b/bootloader/stage-64bit/src/paging.rs index c9e91102..75c010b2 100644 --- a/bootloader/stage-64bit/src/paging.rs +++ b/bootloader/stage-64bit/src/paging.rs @@ -61,11 +61,11 @@ pub struct KernelVirtInfo { pub exe_start_virt: u64, pub exe_end_virt: u64, pub stack_start_virt: u64, - pub stack_end_virt: u64, + pub _stack_end_virt: u64, } impl KernelVirtInfo { - pub fn exe_slice(&mut self) -> &'static mut [u8] { + pub fn _exe_slice(&mut self) -> &'static mut [u8] { unsafe { core::slice::from_raw_parts_mut( self.exe_start_virt as *mut u8, @@ -74,11 +74,11 @@ impl KernelVirtInfo { } } - pub fn stack_slice(&mut self) -> &'static mut [u8] { + pub fn _stack_slice(&mut self) -> &'static mut [u8] { unsafe { core::slice::from_raw_parts_mut( self.stack_start_virt as *mut u8, - (self.stack_end_virt - self.stack_start_virt) as usize, + (self._stack_end_virt - self.stack_start_virt) as usize, ) } } @@ -176,7 +176,7 @@ pub fn build_page_tables(c: PageTableConfig) -> KernelVirtInfo { exe_start_virt: c.kernel_virt, exe_end_virt: c.kernel_virt + (exe_pages * PAGE_2M) as u64, stack_start_virt: c.kernel_virt + ((exe_pages + 1) * PAGE_2M) as u64, - stack_end_virt: c.kernel_virt + ((exe_pages + stack_pages + 1) * PAGE_2M) as u64, + _stack_end_virt: c.kernel_virt + ((exe_pages + stack_pages + 1) * PAGE_2M) as u64, } }