shibedrill/gila
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Readability fixes

Browse Source
This commit is contained in:
August 2025-09-30 20:12:02 -04:00
parent 0a3d0147a8
commit 315c8e33b7
Signed by: shibedrill
GPG Key ID: 5FE0CB25945EFAA2
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/kernel/memory.rs
View File

@ -59,6 +59,8 @@ pub fn deallocate_hardware() -> Result<(), AllocError> {
| (entry.entry_type == EntryType::FRAMEBUFFER)
{
if let Err(error) = {
// Special handling for regions that are too small
// TODO: fix
let adjusted_base = if (entry.length as usize) < PAGE_SIZE {
entry.base as usize - (PAGE_SIZE - entry.length as usize)
} else {
@ -69,11 +71,23 @@ pub fn deallocate_hardware() -> Result<(), AllocError> {
} else {
entry.length as usize
};
let range = PageRange::from_start_len(adjusted_base, adjusted_length as usize);
log_trace!("Deallocating 0x{:x} @ 0x{:x} hardware reserved memory", adjusted_length, adjusted_base);
let range = PageRange::from_start_len(adjusted_base, adjusted_length);
log_trace!(
"Deallocating 0x{:x} @ 0x{:x} hardware reserved memory",
adjusted_length,
adjusted_base
);
match range {
Ok(range_inner) => {unsafe { HW_FREELIST.lock().deallocate(range_inner) }},
Err(err) => {Ok(log_error!("Failed to convert range 0x{:x} @ 0x{:x}: {}", adjusted_length, adjusted_base, err))},
Ok(range_inner) => unsafe { HW_FREELIST.lock().deallocate(range_inner) },
Err(err) => {
log_error!(
"Failed to convert range 0x{:x} @ 0x{:x}: {}",
adjusted_length,
adjusted_base,
err
);
Ok(())
}
}
} {
any_error = Some(error);
@ -81,7 +95,10 @@ pub fn deallocate_hardware() -> Result<(), AllocError> {
bytes_deallocated += entry.length;
}
}
log_trace!("Deallocated 0x{:x} bytes of hardware reserved memory", bytes_deallocated);
log_trace!(
"Deallocated 0x{:x} bytes of hardware reserved memory",
bytes_deallocated
);
if let Some(error) = any_error {
Err(error)
} else {