Skip to content

Commit df6bc5e

Browse files
authoredAug 14, 2023
Merge pull request #21 from hermitcore/log-hex
feat: Log memory ranges and lengths in hex
2 parents 6d287c2 + 546a12e commit df6bc5e

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed
 

‎src/elf.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ impl<'a> KernelObject<'a> {
100100
{
101101
let range = elf.as_ptr_range();
102102
let len = elf.len();
103-
info!("Parsing kernel from ELF at {range:?} ({len} B)");
103+
info!("Parsing kernel from ELF at {range:?} (len = {len:#x} B / {len} B)");
104104
}
105105

106106
let header = plain::from_bytes::<Header>(elf).unwrap();
@@ -251,7 +251,7 @@ impl<'a> KernelObject<'a> {
251251
let range =
252252
tls_info.start as *const ()..(tls_info.start + tls_info.memsz) as *const ();
253253
let len = tls_info.memsz;
254-
info!("TLS is at {range:?} ({len} B)",);
254+
info!("TLS is at {range:?} (len = {len:#x} B / {len} B)",);
255255
tls_info
256256
})
257257
}
@@ -266,7 +266,11 @@ impl<'a> KernelObject<'a> {
266266

267267
/// Loads the kernel into the provided memory.
268268
pub fn load_kernel(&self, memory: &mut [MaybeUninit<u8>], start_addr: u64) -> LoadedKernel {
269-
info!("Loading kernel to {memory:p}");
269+
info!(
270+
"Loading kernel to {:?} (len = {len:#x} B / {len} B)",
271+
memory.as_ptr_range(),
272+
len = memory.len()
273+
);
270274

271275
if !self.is_relocatable() {
272276
assert_eq!(self.start_addr().unwrap(), start_addr);

0 commit comments

Comments
 (0)