Fix alignment and tests

Author: Jiajie Chen

Cargo.toml

@@ -5,7 +5,7 @@ documentation = "https://docs.rs/buddy_system_allocator"
 homepage = "https://github.com/rcore-os/buddy_system_allocator"
 repository = "https://github.com/rcore-os/buddy_system_allocator"
 keywords = ["allocator", "no_std", "heap"]
-version = "0.3.4"
+version = "0.3.5"
 authors = ["Jiajie Chen <[email protected]>"]
 edition = "2018"
 license = "MIT"

src/lib.rs

@@ -77,8 +77,8 @@ impl Heap {
     /// Add a range of memory [start, end) to the heap
     pub unsafe fn add_to_heap(&mut self, mut start: usize, mut end: usize) {
         // avoid unaligned access on some platforms
-        start = (start + size_of::<usize>() - 1) & (!size_of::<usize>());
-        end = end & (!size_of::<usize>());
+        start = (start + size_of::<usize>() - 1) & (!size_of::<usize>() + 1);
+        end = end & (!size_of::<usize>() + 1);
         assert!(start <= end);
 
         let mut total = 0;
@@ -273,7 +273,7 @@ use alloc::boxed::Box;
 /// Create a locked heap:
 /// ```
 /// use buddy_system_allocator::*;
-/// let heap = LockedHeapWithRescue::new(&|heap: &mut Heap| {});
+/// let heap = LockedHeapWithRescue::new(|heap: &mut Heap| {});
 /// ```
 ///
 /// Before oom, the allocator will try to call rescue function and try for one more time.

src/test.rs

@@ -77,7 +77,7 @@ fn test_heap_oom() {
 #[test]
 fn test_heap_oom_rescue() {
     static mut SPACE: [usize; 100] = [0; 100];
-    let heap = LockedHeapWithRescue::new(&|heap: &mut Heap| unsafe {
+    let heap = LockedHeapWithRescue::new(|heap: &mut Heap| unsafe {
         heap.add_to_heap(SPACE.as_ptr() as usize, SPACE.as_ptr().add(100) as usize);
     });