rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align the heap to the size of heap cells

Browse Source
This commit is contained in:
bakaq
2025-05-05 00:15:14 -03:00
committed by Mark Thom
parent d01557f3c1
commit 87ca083cfa
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/machine/heap.rs
View File

@@ -21,7 +21,9 @@ impl Drop for Heap {
fn drop(&mut self) { fn drop(&mut self) {
if !self.inner.ptr.is_null() { if !self.inner.ptr.is_null() {
unsafe { unsafe {
let layout = alloc::Layout::array::<u8>(self.inner.byte_cap).unwrap(); let layout =
alloc::Layout::from_size_align(self.inner.byte_cap, size_of::<HeapCellValue>())
.unwrap();
alloc::dealloc(self.inner.ptr, layout); alloc::dealloc(self.inner.ptr, layout);
} }
} }
@@ -53,7 +55,8 @@ impl InnerHeap {
2 * self.byte_cap 2 * self.byte_cap
}; };
let new_layout = alloc::Layout::array::<u8>(new_cap).unwrap(); let new_layout =
alloc::Layout::from_size_align(new_cap, size_of::<HeapCellValue>()).unwrap();
assert!( assert!(
new_layout.size() <= isize::MAX as usize, new_layout.size() <= isize::MAX as usize,
@@ -63,7 +66,8 @@ impl InnerHeap {
let new_ptr = if self.byte_cap == 0 { let new_ptr = if self.byte_cap == 0 {
alloc::alloc(new_layout) alloc::alloc(new_layout)
} else { } else {
let old_layout = alloc::Layout::array::<u8>(self.byte_cap).unwrap(); let old_layout =
alloc::Layout::from_size_align(self.byte_cap, size_of::<HeapCellValue>()).unwrap();
alloc::realloc(self.ptr, old_layout, new_layout.size()) alloc::realloc(self.ptr, old_layout, new_layout.size())
}; };
@@ -585,7 +589,11 @@ impl Heap {
pub(crate) fn with_cell_capacity(cap: usize) -> Result<Self, usize> { pub(crate) fn with_cell_capacity(cap: usize) -> Result<Self, usize> {
let ptr = unsafe { let ptr = unsafe {
let layout = alloc::Layout::array::<HeapCellValue>(cap).unwrap(); let layout = alloc::Layout::from_size_align(
cap * size_of::<HeapCellValue>(),
size_of::<HeapCellValue>(),
)
.unwrap();
alloc::alloc(layout) alloc::alloc(layout)
}; };
@@ -672,7 +680,9 @@ impl Heap {
pub(crate) fn clear(&mut self) { pub(crate) fn clear(&mut self) {
unsafe { unsafe {
let layout = alloc::Layout::array::<u8>(self.inner.byte_cap).unwrap(); let layout =
alloc::Layout::from_size_align(self.inner.byte_cap, size_of::<HeapCellValue>())
.unwrap();
alloc::dealloc(self.inner.ptr, layout); alloc::dealloc(self.inner.ptr, layout);
} }