occheung/libfringe
1
0
Fork 0
forked from M-Labs/libfringe
Code Issues Pull Requests Projects Releases Wiki Activity

Handle liballoc changes

Browse Source
This commit is contained in:
edef 2017-09-10 11:41:04 +02:00
parent 87452b58e0
commit b79dcf3d79
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib.rs
View File

@ -5,7 +5,7 @@
// http://opensource.org/licenses/MIT>, at your option. This file may not be // http://opensource.org/licenses/MIT>, at your option. This file may not be
// copied, modified, or distributed except according to those terms. // copied, modified, or distributed except according to those terms.
#![feature(asm, naked_functions, cfg_target_vendor, untagged_unions)] #![feature(asm, naked_functions, cfg_target_vendor, untagged_unions)]
#![cfg_attr(feature = "alloc", feature(alloc, heap_api))] #![cfg_attr(feature = "alloc", feature(alloc, heap_api, allocator_api))]
#![cfg_attr(test, feature(test))] #![cfg_attr(test, feature(test))]
#![no_std] #![no_std]

5
src/stack/owned_stack.rs
View File

@ -4,7 +4,8 @@
extern crate alloc; extern crate alloc;
use core::slice; use core::slice;
use self::alloc::heap; use self::alloc::heap::Heap;
use self::alloc::allocator::{Alloc, Layout};
use self::alloc::boxed::Box; use self::alloc::boxed::Box;
use stack::Stack; use stack::Stack;
@ -18,7 +19,7 @@ impl OwnedStack {
pub fn new(size: usize) -> OwnedStack { pub fn new(size: usize) -> OwnedStack {
unsafe { unsafe {
let aligned_size = size & !(::STACK_ALIGNMENT - 1); let aligned_size = size & !(::STACK_ALIGNMENT - 1);
let ptr = heap::allocate(aligned_size, ::STACK_ALIGNMENT); let ptr = Heap.alloc(Layout::from_size_align_unchecked(aligned_size, ::STACK_ALIGNMENT)).unwrap();
OwnedStack(Box::from_raw(slice::from_raw_parts_mut(ptr, aligned_size))) OwnedStack(Box::from_raw(slice::from_raw_parts_mut(ptr, aligned_size)))
} }
} }

17
tests/stack.rs
View File

@ -4,20 +4,25 @@
// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or // http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
// http://opensource.org/licenses/MIT>, at your option. This file may not be // http://opensource.org/licenses/MIT>, at your option. This file may not be
// copied, modified, or distributed except according to those terms. // copied, modified, or distributed except according to those terms.
#![feature(alloc, heap_api)] #![feature(alloc, heap_api, allocator_api)]
extern crate alloc; extern crate alloc;
extern crate fringe; extern crate fringe;
use alloc::heap; use alloc::heap::Heap;
use alloc::allocator::{Alloc, Layout};
use alloc::boxed::Box; use alloc::boxed::Box;
use std::slice; use std::slice;
use fringe::{STACK_ALIGNMENT, Stack, SliceStack, OwnedStack, OsStack}; use fringe::{STACK_ALIGNMENT, Stack, SliceStack, OwnedStack, OsStack};
unsafe fn heap_allocate(size: usize, align: usize) -> *mut u8 {
Heap.alloc(Layout::from_size_align_unchecked(size, align)).expect("couldn't allocate")
}
#[test] #[test]
fn slice_aligned() { fn slice_aligned() {
unsafe { unsafe {
let ptr = heap::allocate(16384, STACK_ALIGNMENT); let ptr = heap_allocate(16384, STACK_ALIGNMENT);
let mut slice = Box::from_raw(slice::from_raw_parts_mut(ptr, 16384)); let mut slice = Box::from_raw(slice::from_raw_parts_mut(ptr, 16384));
let stack = SliceStack::new(&mut slice[4096..8192]); let stack = SliceStack::new(&mut slice[4096..8192]);
assert_eq!(stack.base() as usize & (STACK_ALIGNMENT - 1), 0); assert_eq!(stack.base() as usize & (STACK_ALIGNMENT - 1), 0);
@ -28,7 +33,7 @@ fn slice_aligned() {
#[test] #[test]
fn slice_unaligned() { fn slice_unaligned() {
unsafe { unsafe {
let ptr = heap::allocate(16384, STACK_ALIGNMENT); let ptr = heap_allocate(16384, STACK_ALIGNMENT);
let mut slice = Box::from_raw(slice::from_raw_parts_mut(ptr, 16384)); let mut slice = Box::from_raw(slice::from_raw_parts_mut(ptr, 16384));
let stack = SliceStack::new(&mut slice[4097..8193]); let stack = SliceStack::new(&mut slice[4097..8193]);
assert_eq!(stack.base() as usize & (STACK_ALIGNMENT - 1), 0); assert_eq!(stack.base() as usize & (STACK_ALIGNMENT - 1), 0);
@ -39,7 +44,7 @@ fn slice_unaligned() {
#[test] #[test]
fn slice_too_small() { fn slice_too_small() {
unsafe { unsafe {
let ptr = heap::allocate(STACK_ALIGNMENT, STACK_ALIGNMENT); let ptr = heap_allocate(STACK_ALIGNMENT, STACK_ALIGNMENT);
let mut slice = Box::from_raw(slice::from_raw_parts_mut(ptr, STACK_ALIGNMENT)); let mut slice = Box::from_raw(slice::from_raw_parts_mut(ptr, STACK_ALIGNMENT));
let stack = SliceStack::new(&mut slice[0..1]); let stack = SliceStack::new(&mut slice[0..1]);
assert_eq!(stack.base() as usize & (STACK_ALIGNMENT - 1), 0); assert_eq!(stack.base() as usize & (STACK_ALIGNMENT - 1), 0);
@ -51,7 +56,7 @@ fn slice_too_small() {
#[should_panic(expected = "SliceStack too small")] #[should_panic(expected = "SliceStack too small")]
fn slice_too_small_unaligned() { fn slice_too_small_unaligned() {
unsafe { unsafe {
let ptr = heap::allocate(STACK_ALIGNMENT, STACK_ALIGNMENT); let ptr = heap_allocate(STACK_ALIGNMENT, STACK_ALIGNMENT);
let mut slice = Box::from_raw(slice::from_raw_parts_mut(ptr, STACK_ALIGNMENT)); let mut slice = Box::from_raw(slice::from_raw_parts_mut(ptr, STACK_ALIGNMENT));
SliceStack::new(&mut slice[1..2]); SliceStack::new(&mut slice[1..2]);
} }