urbit/ares
1
1
Fork 0
mirror of https://github.com/urbit/ares.git synced 2024-11-23 00:25:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

[ares][stack] make in_frame take a generic pointer

Browse Source
This commit is contained in:
Edward Amsden 2023-02-17 19:26:28 -06:00
parent 9140984333
commit bd44624e63
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rust/ares/src/hamt.rs
View File

@ -269,8 +269,7 @@ impl<T: Copy> Hamt<T> {
impl<T: Copy + Preserve> Preserve for Hamt<T> { impl<T: Copy + Preserve> Preserve for Hamt<T> {
unsafe fn preserve(&mut self, stack: &mut NockStack) { unsafe fn preserve(&mut self, stack: &mut NockStack) {
// XX make in_frame not care about pointer type if stack.in_frame((*self).0.buffer) {
if stack.in_frame((*self).0.buffer as *const u64) {
let dest_buffer = stack.struct_alloc_in_previous_frame((*self).0.size()); let dest_buffer = stack.struct_alloc_in_previous_frame((*self).0.size());
copy_nonoverlapping((*self).0.buffer, dest_buffer, (*self).0.size()); copy_nonoverlapping((*self).0.buffer, dest_buffer, (*self).0.size());
(*self).0.buffer = dest_buffer; (*self).0.buffer = dest_buffer;
@ -294,7 +293,7 @@ impl<T: Copy + Preserve> Preserve for Hamt<T> {
continue 'preserve_stem; continue 'preserve_stem;
} }
Some((Left(next_stem), idx)) => { Some((Left(next_stem), idx)) => {
if stack.in_frame(next_stem.buffer as *const u64) { if stack.in_frame(next_stem.buffer) {
let dest_buffer = let dest_buffer =
stack.struct_alloc_in_previous_frame(next_stem.size()); stack.struct_alloc_in_previous_frame(next_stem.size());
copy_nonoverlapping( copy_nonoverlapping(
@ -319,7 +318,7 @@ impl<T: Copy + Preserve> Preserve for Hamt<T> {
} }
} }
Some((Right(leaf), idx)) => { Some((Right(leaf), idx)) => {
if stack.in_frame(leaf.buffer as *const u64) { if stack.in_frame(leaf.buffer) {
let dest_buffer = stack.struct_alloc_in_previous_frame(leaf.len); let dest_buffer = stack.struct_alloc_in_previous_frame(leaf.len);
copy_nonoverlapping(leaf.buffer, dest_buffer, leaf.len); copy_nonoverlapping(leaf.buffer, dest_buffer, leaf.len);
let new_leaf = Leaf { let new_leaf = Leaf {

7
rust/ares/src/mem.rs
View File

@ -109,13 +109,14 @@ impl NockStack {
} }
#[inline] #[inline]
pub fn in_frame(&self, ptr: *const u64) -> bool { pub fn in_frame<T>(&self, ptr: *const T) -> bool {
let ptr_u64 = ptr as *const u64;
match &self.polarity { match &self.polarity {
Polarity::East => { Polarity::East => {
ptr >= self.frame_pointer && ptr < self.stack_pointer ptr_u64 >= self.frame_pointer && ptr_u64 < self.stack_pointer
}, },
Polarity::West => { Polarity::West => {
ptr >= self.stack_pointer && ptr < self.frame_pointer ptr_u64 >= self.stack_pointer && ptr_u64 < self.frame_pointer
}, },
} }
} }