roland/xo-umbrella2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-interpreter: refactor for explicit gc::GC* dep

Browse source
This commit is contained in:
Roland Conybeare 2025-11-24 09:55:43 -05:00
commit 52113737ac
24 changed files with 123 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xo-alloc/include/xo/alloc/ArenaAlloc.hpp
View file

@ -175,6 +175,8 @@ namespace xo {
virtual void checkpoint() final override;
virtual std::byte * alloc(std::size_t z) final override;
virtual bool check_owned(Object * src) const final override;
ArenaAlloc & operator=(const ArenaAlloc &) = delete;
ArenaAlloc & operator=(ArenaAlloc &&) = delete;

2
xo-alloc/include/xo/alloc/Forwarding1.hpp
View file

@ -32,7 +32,7 @@ namespace xo {
/** required by Object i/face, but never called on Forwarding1 **/
virtual Object * _shallow_copy(gc::IAlloc * mm) const final override;
/** required by Object i/face, but never called on Forwarding1 **/
virtual std::size_t _forward_children() final override;
virtual std::size_t _forward_children(gc::GC * mm) final override;
private:
/** the object that used to be located at this address (i.e. @c this)

9
xo-alloc/include/xo/alloc/GC.hpp
View file

@ -308,6 +308,15 @@ namespace xo {
**/
virtual void assign_member(Object * parent, Object ** lhs, Object* rhs) final override;
/** during GC check for source objects owned by GC.
* See Object::_shallow_move.
**/
virtual bool check_owned(Object * src) const final override;
/** queries during GC to determine if object at address @p src should move:
* - full GC -> always
* - incr GC -> if not tenured
**/
virtual bool check_move(Object * src) const final override;
virtual std::byte * alloc(std::size_t z) final override;
virtual std::byte * alloc_gc_copy(std::size_t z, const void * src) final override;

27
xo-alloc/include/xo/alloc/IAlloc.hpp
View file

@ -16,7 +16,12 @@ namespace xo {
namespace gc {
/** @class IAllocator
* @brief memory allocation interface with limited garbaga collector support
* @brief memory allocation interface with limited garbage collector support
*
* Garbage collector support methods:
* - checkpoint()
* - assign_member()
* - alloc_gc_copy()
**/
class IAlloc {
public:
@ -56,14 +61,28 @@ namespace xo {
/** @return true iff debug logging enabled **/
virtual bool debug_flag() const = 0;
/** reset allocator to empty state. **/
virtual void clear() = 0;
/** remember allocator state. All currently-allocated addresses xo
* will satisfy is_before_checkpoint(x). Subsequent allocations x
* will fail is_before_checkpoint(x), until checkpoint superseded
* by @ref clear or another call to @ref checkpoint
**/
virtual void checkpoint() = 0;
/** allocate @p z bytes of memory. returns pointer to first address **/
virtual std::byte * alloc(std::size_t z) = 0;
/** reset allocator to empty state. **/
virtual void clear() = 0;
// ----- GC-specific methods -----
/** true iff this allocator owns object at address @p src.
* Use to assist Object::_shallow_move
**/
virtual bool check_owned(Object * src) const;
/** true iff object at address @p src must move as part of
* in-progress collection phase
**/
virtual bool check_move(Object * src) const;
/** perform assignment
* @code
* *lhs = rhs
@ -72,8 +91,6 @@ namespace xo {
* Default implementation just does the assignment.
**/
virtual void assign_member(Object * parent, Object ** lhs, Object * rhs);
/** allocate @p z bytes of memory. returns pointer to first address **/
virtual std::byte * alloc(std::size_t z) = 0;
/** allocate @p z bytes for copy of object at @p src.
* Only used in @ref GC. Default implementation asserts and returns nullptr
**/

16
xo-alloc/include/xo/alloc/Object.hpp
View file

@ -122,15 +122,15 @@ namespace xo {
static Object * _forward(Object * src, gc::GC * gc);
template <typename T>
static void _forward_inplace(T ** src_addr) {
Object * fwd = _forward(*src_addr, _gc());
static void _forward_inplace(T ** src_addr, gc::GC * gc) {
Object * fwd = _forward(*src_addr, gc);
*src_addr = reinterpret_cast<T *>(fwd);
}
template <typename T>
static void _forward_inplace(gp<T> & src) {
_forward_inplace<T>(src.ptr_address());
static void _forward_inplace(gp<T> & src, gc::GC * gc) {
_forward_inplace<T>(src.ptr_address(), gc);
}
/** primary workhorse for garbage collection.
@ -156,10 +156,10 @@ namespace xo {
**/
static Object * _deep_move(Object * src, gc::GC * gc, gc::ObjectStatistics * stats);
/** copy @p src to to-space, and replace original with forwarding pointer to new location.
/** copy @p src to to-space. Overwrite original with forwarding pointer to new location.
* return the new location
**/
static Object * _shallow_move(Object * src, gc::GC * gc);
static Object * _shallow_move(Object * src, gc::IAlloc * gc);
// Reflection support
@ -207,7 +207,7 @@ namespace xo {
*
* Require: @ref mm is an instance of @ref gc::GC
**/
virtual Object * _shallow_copy(gc::IAlloc * mm) const = 0;
virtual Object * _shallow_copy(gc::IAlloc * gc) const = 0;
/** update child pointers that refer to forwarding pointers,
* replacing them with the correct destination.
@ -243,7 +243,7 @@ namespace xo {
* allocated by @ref _shallow_move
*
**/
virtual std::size_t _forward_children() = 0;
virtual std::size_t _forward_children(gc::GC * gc) = 0;
};
template <typename T>

8
xo-alloc/src/alloc/ArenaAlloc.cpp
View file

@ -356,6 +356,14 @@ namespace xo {
return free_ptr_ - checkpoint_;
}
bool
ArenaAlloc::check_owned(Object * src) const
{
byte * addr = reinterpret_cast<byte *>(src);
return (lo_ <= addr) && (addr < hi_);
}
bool
ArenaAlloc::debug_flag() const
{

2
xo-alloc/src/alloc/Forwarding1.cpp
View file

@ -60,7 +60,7 @@ namespace xo {
// LCOV_EXCL_START
std::size_t
Forwarding1::_forward_children() {
Forwarding1::_forward_children(gc::GC *) {
assert(false);
return 0;
}

13
xo-alloc/src/alloc/GC.cpp
View file

@ -559,6 +559,19 @@ namespace xo {
}
}
bool
GC::check_owned(Object * src) const
{
return this->fromspace_contains(src);
}
bool
GC::check_move(Object * src) const
{
return (this->runstate().full_move()
|| (this->tospace_generation_of(src) != gc::generation_result::tenured));
}
void
GC::swap_nursery()
{

12
xo-alloc/src/alloc/IAlloc.cpp
View file

@ -47,6 +47,18 @@ namespace xo {
*lhs = rhs;
}
bool
IAlloc::check_owned(Object * /*obj*/) const
{
return false;
}
bool
IAlloc::check_move(Object * /*obj*/) const
{
return false;
}
// LCOV_EXCL_START
std::byte *
IAlloc::alloc_gc_copy(std::size_t /*z*/, const void * /*src*/)

30
xo-alloc/src/alloc/Object.cpp
View file

@ -14,9 +14,9 @@ operator new (std::size_t z, const xo::Cpof & cpof)
{
using xo::gc::GC;
GC * gc = reinterpret_cast<GC *>(cpof.mm_);
//GC * gc = reinterpret_cast<GC *>(cpof.mm_);
return gc->alloc_gc_copy(z, cpof.src_);
return cpof.mm_->alloc_gc_copy(z, cpof.src_);
}
namespace xo {
@ -32,18 +32,15 @@ namespace xo {
if (src->_is_forwarded())
return src->_offset_destination(src);
bool full_move = gc->runstate().full_move();
if (gc->check_move(src)) {
Object::_shallow_move(src, gc);
if (!full_move && (gc->tospace_generation_of(src) == gc::generation_result::tenured)) {
/* *src is now a forwarding pointer to a copy in to-space */
return src->_offset_destination(src);
} else {
/* don't move tenured objects during incremental collection */
return src;
}
Object::_shallow_move(src, gc);
/* *src is now a forwarding pointer to copy in to-space */
return src->_offset_destination(src);
}
Object *
@ -59,9 +56,7 @@ namespace xo {
if (retval)
return retval;
bool full_move = gc->runstate().full_move();
if (!full_move && gc->tospace_generation_of(from_src) == gc::generation_result::tenured) {
if (!gc->check_move(from_src)) {
/** incremental collection does not move already-tenured objects **/
return from_src;
}
@ -70,7 +65,8 @@ namespace xo {
* To-space:
*
* to_lo = start of to-space
* w,W = white objects. An object x is white if x + all immediate children of x are in to-space
* w,W = white objects. An object x is white if x
* + all immediate children of x are in to-space
* (also implies this GC cycle put it there)
* g,G = grey objects. An object x is gray if it's in to-space,
* but possibly has >0 black children
@ -141,7 +137,7 @@ namespace xo {
// update per-class stats here
std::size_t xz = x->_forward_children();
std::size_t xz = x->_forward_children(gc);
// must pad xz to multiple of word size,
// to match behavior of LinearAlloc::alloc()
@ -163,12 +159,12 @@ namespace xo {
} /*deep_move*/
Object *
Object::_shallow_move(Object * src, gc::GC * gc)
Object::_shallow_move(Object * src, gc::IAlloc * gc)
{
/* filter for source objects that are owned by GC.
* Care required though -- during GC from/to spaces have been swapped already
*/
if (gc->fromspace_contains(src))
if (gc->check_owned(src))
{
Object * dest = src->_shallow_copy(gc);

2
xo-interpreter/include/xo/interpreter/GlobalEnv.hpp
View file

@ -35,7 +35,7 @@ namespace xo {
virtual void display(std::ostream & os) const final override;
virtual std::size_t _shallow_size() const final override;
virtual Object * _shallow_copy(gc::IAlloc * mm) const final override;
virtual std::size_t _forward_children() final override;
virtual std::size_t _forward_children(gc::GC * /*gc*/) final override;
private:
GlobalEnv(const GlobalEnv & x);

2
xo-interpreter/include/xo/interpreter/LocalEnv.hpp
View file

@ -103,7 +103,7 @@ namespace xo {
virtual void display(std::ostream & os) const final override;
virtual std::size_t _shallow_size() const final override;
virtual Object * _shallow_copy(gc::IAlloc * mm) const final override;
virtual std::size_t _forward_children() final override;
virtual std::size_t _forward_children(gc::GC * /*gc*/) final override;
private:
/** parent stack frame **/

4
xo-interpreter/src/interpreter/GlobalEnv.cpp
View file

@ -90,10 +90,10 @@ namespace xo {
}
std::size_t
GlobalEnv::_forward_children()
GlobalEnv::_forward_children(gc::GC * gc)
{
for (auto & ix : *slot_map_) {
Object::_forward_inplace(ix.second);
Object::_forward_inplace(ix.second, gc);
}
return _shallow_size();
}

6
xo-interpreter/src/interpreter/LocalEnv.cpp
View file

@ -121,14 +121,14 @@ namespace xo {
}
std::size_t
LocalEnv::_forward_children()
LocalEnv::_forward_children(gc::GC * gc)
{
static_assert(decltype(symtab_)::is_gc_ptr == false);
Object::_forward_inplace(parent_);
Object::_forward_inplace(parent_, gc);
// Object::_forward_inplace(symtab_); // not a gp yet
for (std::size_t i = 0, n = slot_v_.size(); i < n; ++i) {
Object::_forward_inplace((*this)[i]);
Object::_forward_inplace((*this)[i], gc);
}
return _shallow_size();

4
xo-object/include/xo/object/Boolean.hpp
View file

@ -24,8 +24,8 @@ namespace xo {
virtual TaggedPtr self_tp() const final override;
virtual void display(std::ostream & os) const final override;
virtual std::size_t _shallow_size() const final override;
virtual Object * _shallow_copy(gc::IAlloc * mm) const final override;
virtual std::size_t _forward_children() final override;
virtual Object * _shallow_copy(gc::IAlloc * gc) const final override;
virtual std::size_t _forward_children(gc::GC * gc) final override;
private:
explicit Boolean(bool x) : value_{x} {}

4
xo-object/include/xo/object/Float.hpp
View file

@ -29,8 +29,8 @@ namespace xo {
virtual TaggedPtr self_tp() const final override;
virtual void display(std::ostream & os) const final override;
virtual std::size_t _shallow_size() const final override;
virtual Object * _shallow_copy(gc::IAlloc * mm) const final override;
virtual std::size_t _forward_children() final override;
virtual Object * _shallow_copy(gc::IAlloc * gc) const final override;
virtual std::size_t _forward_children(gc::GC * gc) final override;
private:
float_type value_ = 0.0;

4
xo-object/include/xo/object/Integer.hpp
View file

@ -29,8 +29,8 @@ namespace xo {
virtual TaggedPtr self_tp() const final override;
virtual void display(std::ostream & os) const final override;
virtual std::size_t _shallow_size() const final override;
virtual Object * _shallow_copy(gc::IAlloc * mm) const final override;
virtual std::size_t _forward_children() final override;
virtual Object * _shallow_copy(gc::IAlloc * gc) const final override;
virtual std::size_t _forward_children(gc::GC * gc) final override;
private:
int_type value_ = 0;

4
xo-object/include/xo/object/List.hpp
View file

@ -58,8 +58,8 @@ namespace xo {
virtual TaggedPtr self_tp() const final override;
virtual void display(std::ostream & os) const final override;
virtual std::size_t _shallow_size() const final override;
virtual Object * _shallow_copy(gc::IAlloc * mm) const final override;
virtual std::size_t _forward_children() final override;
virtual Object * _shallow_copy(gc::IAlloc * gc) const final override;
virtual std::size_t _forward_children(gc::GC * gc) final override;
private:
List(gp<Object> head, gp<List> rest);

4
xo-object/include/xo/object/String.hpp
View file

@ -36,8 +36,8 @@ namespace xo {
virtual TaggedPtr self_tp() const final override;
virtual void display(std::ostream & os) const final override;
virtual std::size_t _shallow_size() const final override;
virtual Object * _shallow_copy(gc::IAlloc * mm) const final override;
virtual std::size_t _forward_children() final override;
virtual Object * _shallow_copy(gc::IAlloc * gc) const final override;
virtual std::size_t _forward_children(gc::GC * gc) final override;
private:
String(owner owner, std::size_t z, char * s);

2
xo-object/src/object/Boolean.cpp
View file

@ -75,7 +75,7 @@ namespace xo {
// LCOV_EXCL_START
std::size_t
Boolean::_forward_children()
Boolean::_forward_children(gc::GC *)
{
assert(false);
return 0;

2
xo-object/src/object/Float.cpp
View file

@ -48,7 +48,7 @@ namespace xo {
}
std::size_t
Float::_forward_children() {
Float::_forward_children(gc::GC * /*gc*/) {
return Float::_shallow_size();
}
}

2
xo-object/src/object/Integer.cpp
View file

@ -49,7 +49,7 @@ namespace xo {
}
std::size_t
Integer::_forward_children() {
Integer::_forward_children(gc::GC * /*gc*/) {
return Integer::_shallow_size();
}

23
xo-object/src/object/List.cpp
View file

@ -71,12 +71,14 @@ namespace xo {
}
TaggedPtr
List::self_tp() const {
List::self_tp() const
{
return Reflect::make_tp(const_cast<List*>(this));
}
void
List::display(std::ostream & os) const {
List::display(std::ostream & os) const
{
gp<List> l = const_cast<List*>(this);
os << "(";
@ -92,25 +94,26 @@ namespace xo {
}
std::size_t
List::_shallow_size() const {
List::_shallow_size() const
{
return sizeof(List);
}
Object *
List::_shallow_copy(gc::IAlloc * mm) const {
scope log(XO_DEBUG(mm->debug_flag()));
List::_shallow_copy(gc::IAlloc * gc) const
{
assert(!(this->is_nil()));
Cpof cpof(mm, this);
Cpof cpof(gc, this);
return new (cpof) List(*this);
}
std::size_t
List::_forward_children() {
Object::_forward_inplace(head_);
Object::_forward_inplace(rest_);
List::_forward_children(gc::GC * gc)
{
Object::_forward_inplace(head_, gc);
Object::_forward_inplace(rest_, gc);
return List::_shallow_size();
}
}

2
xo-object/src/object/String.cpp
View file

@ -152,7 +152,7 @@ namespace xo {
}
std::size_t
String::_forward_children()
String::_forward_children(gc::GC *)
{
return this->_shallow_size();
}