summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2020-05-01 18:46:23 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2020-05-01 22:16:38 +0200
commitfd2384b7fab14732efde99da8affd830e2334e16 (patch)
treea17111e3363c457ec727b52023212c113d8304f6 /src
parent5b449f4e1e43bc59109da5a37edf5ec911d3df8e (diff)
downloadneco-fd2384b7fab14732efde99da8affd830e2334e16.tar
neco-fd2384b7fab14732efde99da8affd830e2334e16.zip
Nightly stuff
Diffstat (limited to 'src')
-rw-r--r--src/main.rs17
-rw-r--r--src/system_alloc.rs21
2 files changed, 33 insertions, 5 deletions
diff --git a/src/main.rs b/src/main.rs
index 26882ff..fe151fe 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,12 @@
#![no_main]
#![no_std]
+#![feature(alloc_error_handler)]
-use safe_libc as libc;
+mod system_alloc;
+
+extern crate alloc;
use libc::cstr;
+use safe_libc as libc;
use core::fmt::Write;
@@ -19,17 +23,20 @@ pub extern "C" fn main(_nargs: libc::c_int, _args: *const *const libc::c_char) -
let x = libc::string::CString::from("foo");
let l = x.len();
let y = x.into_raw();
- let z = unsafe {
- libc::boxed::CBox::slice_from_raw_parts(y, l)
- };
+ let z = unsafe { alloc::boxed::Box::from_raw(core::ptr::slice_from_raw_parts_mut(y, l)) };
let _ = writeln!(stdout, "Foo: {} {} {}", z[0], z[1], z[2]);
}
{
- let b = libc::boxed::CBox::new(42);
+ let b = alloc::boxed::Box::new(42);
let _ = writeln!(stdout, "Bar: {}", b);
}
+ {
+ let x = alloc::boxed::Box::new(());
+ let _ = writeln!(stdout, "Box: {:?}", x);
+ }
+
0
}
diff --git a/src/system_alloc.rs b/src/system_alloc.rs
new file mode 100644
index 0000000..ad1afcb
--- /dev/null
+++ b/src/system_alloc.rs
@@ -0,0 +1,21 @@
+use safe_libc as libc;
+
+struct System;
+
+unsafe impl alloc::alloc::GlobalAlloc for System {
+ unsafe fn alloc(&self, layout: alloc::alloc::Layout) -> *mut u8 {
+ libc::memalign(layout.align(), layout.size()).cast()
+ }
+
+ unsafe fn dealloc(&self, ptr: *mut u8, _layout: alloc::alloc::Layout) {
+ libc::free(ptr.cast());
+ }
+}
+
+#[global_allocator]
+static SYSTEM_ALLOC: System = System;
+
+#[alloc_error_handler]
+fn alloc_error(_: core::alloc::Layout) -> ! {
+ panic!("allocation failure");
+}