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

Use the block allocator by default now

Browse source
This commit is contained in:
Gwilym Kuiper 2021-08-16 22:31:10 +01:00
parent 4b9e4ce42a
commit d372ca74bf
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
agb/src/agb_alloc/block_allocator.rs
View file

@ -29,6 +29,18 @@ pub(crate) struct BlockAllocator {
state: Mutex<BlockAllocatorState>, state: Mutex<BlockAllocatorState>,
} }
impl BlockAllocator {
pub(super) const unsafe fn new() -> Self {
Self {
inner_allocator: BumpAllocator::new(),
state: Mutex::new(BlockAllocatorState {
first_block: None,
last_block: None,
}),
}
}
}
unsafe impl GlobalAlloc for BlockAllocator { unsafe impl GlobalAlloc for BlockAllocator {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 { unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
let block_layout = Layout::new::<Block>(); let block_layout = Layout::new::<Block>();

4
agb/src/agb_alloc/mod.rs
View file

@ -3,12 +3,12 @@ use core::alloc::Layout;
mod block_allocator; mod block_allocator;
mod bump_allocator; mod bump_allocator;
use bump_allocator::BumpAllocator; use block_allocator::BlockAllocator;
const EWRAM_END: usize = 0x0204_0000; const EWRAM_END: usize = 0x0204_0000;
#[global_allocator] #[global_allocator]
static GLOBAL_ALLOC: BumpAllocator = BumpAllocator::new(); static GLOBAL_ALLOC: BlockAllocator = unsafe { BlockAllocator::new() };
#[alloc_error_handler] #[alloc_error_handler]
fn alloc_error(layout: Layout) -> ! { fn alloc_error(layout: Layout) -> ! {