sawyer/picocalc-os-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove debugs

Browse Source
This commit is contained in:
sawyer bristol
2025-09-26 20:26:42 -06:00
parent 180d9e82d2
commit fb2c3583de
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/src/elf.rs
View File

@@ -44,10 +44,8 @@ pub async unsafe fn load_binary(name: &ShortFileName) -> Option<(EntryFn, Bump)>
let (total_size, min_vaddr, _max_vaddr) = let (total_size, min_vaddr, _max_vaddr) =
total_loadable_size(&mut file, &elf_header, &mut ph_buf); total_loadable_size(&mut file, &elf_header, &mut ph_buf);
defmt::info!("total_size: {}", total_size);
let bump = Bump::with_capacity(total_size); let bump = Bump::with_capacity(total_size);
let base = bump.alloc_slice_fill_default::<u8>(total_size); let base = bump.alloc_slice_fill_default::<u8>(total_size);
defmt::info!("base ptr: {}", base.as_ptr());
// load each segment into bump, relative to base_ptr // load each segment into bump, relative to base_ptr
for i in 0..elf_header.e_phnum { for i in 0..elf_header.e_phnum {
@@ -57,7 +55,6 @@ pub async unsafe fn load_binary(name: &ShortFileName) -> Option<(EntryFn, Bump)>
let ph = cast_phdr(&ph_buf); let ph = cast_phdr(&ph_buf);
let seg_offset = (ph.p_vaddr - min_vaddr) as usize; let seg_offset = (ph.p_vaddr - min_vaddr) as usize;
defmt::info!("segment offset {}", seg_offset);
let mut segment = &mut base[seg_offset..seg_offset + ph.p_memsz as usize]; let mut segment = &mut base[seg_offset..seg_offset + ph.p_memsz as usize];
if ph.p_type == PT_LOAD { if ph.p_type == PT_LOAD {
@@ -83,12 +80,10 @@ pub async unsafe fn load_binary(name: &ShortFileName) -> Option<(EntryFn, Bump)>
patch_abi(&elf_header, base.as_mut_ptr(), min_vaddr, &mut file).unwrap(); patch_abi(&elf_header, base.as_mut_ptr(), min_vaddr, &mut file).unwrap();
defmt::info!("elf entry point before offset: {}", elf_header.e_entry);
// entry pointer is base_ptr + (entry - min_vaddr) // entry pointer is base_ptr + (entry - min_vaddr)
let entry_ptr: EntryFn = unsafe { let entry_ptr: EntryFn = unsafe {
core::mem::transmute(base.as_ptr().add((elf_header.e_entry - min_vaddr) as usize)) core::mem::transmute(base.as_ptr().add((elf_header.e_entry - min_vaddr) as usize))
}; };
defmt::info!("entry ptr: {}", entry_ptr);
Some((entry_ptr, bump)) Some((entry_ptr, bump))
}) })
@@ -156,7 +151,6 @@ fn apply_relocations(
} }
} }
_ => { _ => {
defmt::warn!("Unsupported relocation type: {}", reloc_type);
return Err(()); return Err(());
} }
} }
@@ -206,8 +200,6 @@ fn patch_abi(
let table_base = let table_base =
unsafe { base.add((sym.st_value as usize) - min_vaddr as usize) } unsafe { base.add((sym.st_value as usize) - min_vaddr as usize) }
as *mut usize; as *mut usize;
defmt::info!("CALL_ABI_TABLE st_value: {:x}", sym.st_value);
defmt::info!("table base {}", table_base);
for (idx, call) in CallAbiTable::iter().enumerate() { for (idx, call) in CallAbiTable::iter().enumerate() {
let ptr = match call { let ptr = match call {
@@ -219,13 +211,6 @@ fn patch_abi(
CallAbiTable::GenRand => abi::gen_rand as usize, CallAbiTable::GenRand => abi::gen_rand as usize,
}; };
unsafe { unsafe {
defmt::info!(
"table {:?}#{} @ {} -> 0x{:X}",
call,
idx,
table_base.wrapping_add(idx),
ptr
);
table_base.add(idx as usize).write(ptr); table_base.add(idx as usize).write(ptr);
} }
} }

1
kernel/src/main.rs
View File

@@ -133,7 +133,6 @@ async fn userland_task() {
let recv = BINARY_CH.receiver(); let recv = BINARY_CH.receiver();
loop { loop {
let (entry, _bump) = recv.receive().await; let (entry, _bump) = recv.receive().await;
defmt::info!("Got Entry");
// disable kernel ui // disable kernel ui
{ {