pr9.2
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
use crate::{ObjectHeader, ObjectKind};
|
||||
use crate::object::{ObjectHeader, ObjectKind};
|
||||
use crate::call_frame::CallFrame;
|
||||
use prometeu_bytecode::{HeapRef, Value};
|
||||
|
||||
@@ -29,7 +29,7 @@ pub enum CoroutineState {
|
||||
Running,
|
||||
Sleeping,
|
||||
Finished,
|
||||
Faulted,
|
||||
// Faulted,
|
||||
}
|
||||
|
||||
/// Stored payload for coroutine objects.
|
||||
@@ -158,55 +158,55 @@ impl Heap {
|
||||
.map(|o| &mut o.header)
|
||||
}
|
||||
|
||||
/// Internal: enumerate inner `HeapRef` children of an object without allocating.
|
||||
/// Note: This helper is no longer used by GC mark; kept for potential diagnostics.
|
||||
fn children_of(&self, r: HeapRef) -> Box<dyn Iterator<Item = HeapRef> + '_> {
|
||||
let idx = r.0 as usize;
|
||||
if let Some(Some(o)) = self.objects.get(idx) {
|
||||
match o.header.kind {
|
||||
ObjectKind::Array => {
|
||||
let it = o
|
||||
.array_elems
|
||||
.as_deref()
|
||||
.into_iter()
|
||||
.flat_map(|slice| slice.iter())
|
||||
.filter_map(|val| if let Value::HeapRef(h) = val { Some(*h) } else { None });
|
||||
return Box::new(it);
|
||||
}
|
||||
ObjectKind::Closure => {
|
||||
// Read env_len from payload; traverse exactly that many entries.
|
||||
debug_assert_eq!(o.header.kind, ObjectKind::Closure);
|
||||
debug_assert_eq!(o.payload.len(), 8, "closure payload metadata must be 8 bytes");
|
||||
let mut nbytes = [0u8; 4];
|
||||
nbytes.copy_from_slice(&o.payload[4..8]);
|
||||
let env_len = u32::from_le_bytes(nbytes) as usize;
|
||||
let it = o
|
||||
.closure_env
|
||||
.as_deref()
|
||||
.map(|slice| {
|
||||
debug_assert_eq!(slice.len(), env_len, "closure env length must match encoded env_len");
|
||||
&slice[..env_len]
|
||||
})
|
||||
.into_iter()
|
||||
.flat_map(|slice| slice.iter())
|
||||
.filter_map(|val| if let Value::HeapRef(h) = val { Some(*h) } else { None });
|
||||
return Box::new(it);
|
||||
}
|
||||
ObjectKind::Coroutine => {
|
||||
if let Some(co) = o.coroutine.as_ref() {
|
||||
let it = co
|
||||
.stack
|
||||
.iter()
|
||||
.filter_map(|v| if let Value::HeapRef(h) = v { Some(*h) } else { None });
|
||||
return Box::new(it);
|
||||
}
|
||||
return Box::new(std::iter::empty());
|
||||
}
|
||||
_ => return Box::new(std::iter::empty()),
|
||||
}
|
||||
}
|
||||
Box::new(std::iter::empty())
|
||||
}
|
||||
/// Internal: list inner `HeapRef` children of an object without allocating.
|
||||
/// Note: GC mark no longer uses this helper; kept for potential diagnostics.
|
||||
// fn children_of(&self, r: HeapRef) -> Box<dyn Iterator<Item = HeapRef> + '_> {
|
||||
// let idx = r.0 as usize;
|
||||
// if let Some(Some(o)) = self.objects.get(idx) {
|
||||
// match o.header.kind {
|
||||
// ObjectKind::Array => {
|
||||
// let it = o
|
||||
// .array_elems
|
||||
// .as_deref()
|
||||
// .into_iter()
|
||||
// .flat_map(|slice| slice.iter())
|
||||
// .filter_map(|val| if let Value::HeapRef(h) = val { Some(*h) } else { None });
|
||||
// return Box::new(it);
|
||||
// }
|
||||
// ObjectKind::Closure => {
|
||||
// // Read env_len from payload; traverse exactly that many entries.
|
||||
// debug_assert_eq!(o.header.kind, ObjectKind::Closure);
|
||||
// debug_assert_eq!(o.payload.len(), 8, "closure payload metadata must be 8 bytes");
|
||||
// let mut nbytes = [0u8; 4];
|
||||
// nbytes.copy_from_slice(&o.payload[4..8]);
|
||||
// let env_len = u32::from_le_bytes(nbytes) as usize;
|
||||
// let it = o
|
||||
// .closure_env
|
||||
// .as_deref()
|
||||
// .map(|slice| {
|
||||
// debug_assert_eq!(slice.len(), env_len, "closure env length must match encoded env_len");
|
||||
// &slice[..env_len]
|
||||
// })
|
||||
// .into_iter()
|
||||
// .flat_map(|slice| slice.iter())
|
||||
// .filter_map(|val| if let Value::HeapRef(h) = val { Some(*h) } else { None });
|
||||
// return Box::new(it);
|
||||
// }
|
||||
// ObjectKind::Coroutine => {
|
||||
// if let Some(co) = o.coroutine.as_ref() {
|
||||
// let it = co
|
||||
// .stack
|
||||
// .iter()
|
||||
// .filter_map(|v| if let Value::HeapRef(h) = v { Some(*h) } else { None });
|
||||
// return Box::new(it);
|
||||
// }
|
||||
// return Box::new(std::iter::empty());
|
||||
// }
|
||||
// _ => return Box::new(std::iter::empty()),
|
||||
// }
|
||||
// }
|
||||
// Box::new(std::iter::empty())
|
||||
// }
|
||||
|
||||
/// Read the `fn_id` stored in a closure object. Returns None if kind mismatch or invalid ref.
|
||||
pub fn closure_fn_id(&self, r: HeapRef) -> Option<u32> {
|
||||
@@ -245,7 +245,10 @@ impl Heap {
|
||||
if !self.is_valid(r) { continue; }
|
||||
|
||||
// If already marked, skip.
|
||||
let already_marked = self.header(r).map(|h| h.is_marked()).unwrap_or(false);
|
||||
let already_marked = self
|
||||
.header(r)
|
||||
.map(|h: &ObjectHeader| h.is_marked())
|
||||
.unwrap_or(false);
|
||||
if already_marked { continue; }
|
||||
|
||||
// Set mark bit.
|
||||
@@ -260,7 +263,10 @@ impl Heap {
|
||||
for val in elems.iter() {
|
||||
if let Value::HeapRef(child) = val {
|
||||
if self.is_valid(*child) {
|
||||
let marked = self.header(*child).map(|h| h.is_marked()).unwrap_or(false);
|
||||
let marked = self
|
||||
.header(*child)
|
||||
.map(|h: &ObjectHeader| h.is_marked())
|
||||
.unwrap_or(false);
|
||||
if !marked { stack.push(*child); }
|
||||
}
|
||||
}
|
||||
@@ -277,7 +283,10 @@ impl Heap {
|
||||
for val in env[..env_len].iter() {
|
||||
if let Value::HeapRef(child) = val {
|
||||
if self.is_valid(*child) {
|
||||
let marked = self.header(*child).map(|h| h.is_marked()).unwrap_or(false);
|
||||
let marked = self
|
||||
.header(*child)
|
||||
.map(|h: &ObjectHeader| h.is_marked())
|
||||
.unwrap_or(false);
|
||||
if !marked { stack.push(*child); }
|
||||
}
|
||||
}
|
||||
@@ -289,7 +298,10 @@ impl Heap {
|
||||
for val in co.stack.iter() {
|
||||
if let Value::HeapRef(child) = val {
|
||||
if self.is_valid(*child) {
|
||||
let marked = self.header(*child).map(|h| h.is_marked()).unwrap_or(false);
|
||||
let marked = self
|
||||
.header(*child)
|
||||
.map(|h: &ObjectHeader| h.is_marked())
|
||||
.unwrap_or(false);
|
||||
if !marked { stack.push(*child); }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user