From 40ff16e42dd256664ed1bd018ddcecb138e48ed1 Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jackpot51@gmail.com> Date: Tue, 18 Apr 2017 21:26:18 -0600 Subject: [PATCH] Add __rust_allocate_zeroed to work with newest nightly --- alloc_kernel/src/lib.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/alloc_kernel/src/lib.rs b/alloc_kernel/src/lib.rs index df908438..a7dc6078 100644 --- a/alloc_kernel/src/lib.rs +++ b/alloc_kernel/src/lib.rs @@ -4,6 +4,7 @@ #![allocator] #![no_std] +use core::ptr; use spin::Mutex; use linked_list_allocator::Heap; @@ -25,6 +26,15 @@ pub extern fn __rust_allocate(size: usize, align: usize) -> *mut u8 { } } +#[no_mangle] +pub extern fn __rust_allocate_zeroed(size: usize, align: usize) -> *mut u8 { + let ptr = __rust_allocate(size, align); + unsafe { + ptr::write_bytes(ptr, 0, size); + } + ptr +} + #[no_mangle] pub extern fn __rust_deallocate(ptr: *mut u8, size: usize, align: usize) { if let Some(ref mut heap) = *HEAP.lock() { -- GitLab