Update to use the new API for custom allocators. #348
Conversation
|
Why are you creating |
|
@4e554c4c |
|
Then add it to the .gitignore. There isn't currently a |
|
Ok, fixed that. |
|
It seems I can't use Git apparently, |
|
Thank you! I think this is good. |
There was a problem hiding this comment.
Thanks for the PR!
I think we could remove the hole_list_allocator crate completely and directly use the LockedHeap struct.
| pub extern fn __rust_allocate(size: usize, align: usize) -> *mut u8 { | ||
| HEAP.lock().allocate_first_fit(size, align).expect("out of memory") | ||
| //Set up the heap | ||
| pub unsafe fn init(offset: usize, size: usize) { |
There was a problem hiding this comment.
This init function isn't called right now, so the heap stays uninitialized.
|
I think using the LockedHeap struct is a definite possiblity, however for now I have just changed it so the heap init function does get called in |
|
Ok, I decided to merge this for now. Maybe we switch to LockedHeap eventually, but for now it's good to have this project buildable again. Thanks a lot @too-r! |
| @@ -53,7 +53,7 @@ pub extern "C" fn rust_main(multiboot_information_address: usize) { | |||
|
|
|||
| // initialize our IDT | |||
| interrupts::init(&mut memory_controller); | |||
|
|
|||
There was a problem hiding this comment.
trailing whitespace which was not previously here
Had to change the linked_list_allocator dependecy to link directly to git, because the version on crates.io is still using the old
UniqueAPI.