alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 16:51:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Switch to non-null

Browse source
This commit is contained in:
Gwilym Kuiper 2021-08-16 22:24:32 +01:00
parent a7a1cb3ecd
commit f2ce19c356
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
agb/src/agb_alloc/bump_allocator.rs
View file

@ -1,4 +1,5 @@
use core::alloc::{GlobalAlloc, Layout}; use core::alloc::{GlobalAlloc, Layout};
use core::ptr::NonNull;
use crate::interrupt::Mutex; use crate::interrupt::Mutex;
@ -16,13 +17,13 @@ fn get_data_end() -> usize {
} }
pub(crate) struct BumpAllocator { pub(crate) struct BumpAllocator {
current_ptr: Mutex<*mut u8>, current_ptr: Mutex<Option<NonNull<u8>>>,
} }
impl BumpAllocator { impl BumpAllocator {
pub const fn new() -> Self { pub const fn new() -> Self {
Self { Self {
current_ptr: Mutex::new(core::ptr::null_mut()), current_ptr: Mutex::new(None),
} }
} }
} }
@ -31,10 +32,10 @@ impl BumpAllocator {
fn alloc_safe(&self, layout: Layout) -> *mut u8 { fn alloc_safe(&self, layout: Layout) -> *mut u8 {
let mut current_ptr = self.current_ptr.lock(); let mut current_ptr = self.current_ptr.lock();
let ptr = if current_ptr.is_null() { let ptr = if let Some(c) = *current_ptr {
get_data_end() c.as_ptr() as usize
} else { } else {
*current_ptr as usize get_data_end()
}; };
let alignment_bitmask = layout.align() - 1; let alignment_bitmask = layout.align() - 1;
@ -43,12 +44,14 @@ impl BumpAllocator {
let amount_to_add = layout.align() - fixup; let amount_to_add = layout.align() - fixup;
let resulting_ptr = ptr + amount_to_add; let resulting_ptr = ptr + amount_to_add;
*current_ptr = (resulting_ptr + layout.size()) as *mut _; let new_current_ptr = resulting_ptr + layout.size();
if *current_ptr as usize >= EWRAM_END { if new_current_ptr as usize >= EWRAM_END {
return core::ptr::null_mut(); return core::ptr::null_mut();
} }
*current_ptr = NonNull::new(new_current_ptr as *mut _);
resulting_ptr as *mut _ resulting_ptr as *mut _
} }
} }