aboutsummaryrefslogtreecommitdiff
path: root/runtime/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-12-16 19:37:49 +0000
committerMichael Williamson <mike@zwobble.org>2023-12-16 19:37:49 +0000
commit8c6b1e846edd51d14bfbee978afcffe660baa190 (patch)
tree6bd58efff1948e68cec88fae978d01357247650f /runtime/src
parentf4a0159dc00fd1caa7a251d7f6bcd23948cf5f7d (diff)
Push to GC root stack after allocation
Diffstat (limited to 'runtime/src')
-rw-r--r--runtime/src/gc.c46
1 files changed, 28 insertions, 18 deletions
diff --git a/runtime/src/gc.c b/runtime/src/gc.c
index 3826f061..6e210aa3 100644
--- a/runtime/src/gc.c
+++ b/runtime/src/gc.c
@@ -47,22 +47,6 @@ void mark(struct ShedGcObjectHeader* object) {
}
}
-// == Allocation ==
-
-struct ShedGcObjectHeader* first = NULL;
-
-void* shed__runtime__gc_alloc(size_t size, size_t children_offset, size_t children_count) {
- struct ShedGcObjectHeader* object = malloc(size);
- object->next = first;
- object->mark = 0;
- object->children_offset = children_offset;
- object->children_count = children_count;
-
- first = object;
-
- return object;
-}
-
// == Roots ==
// === Root stack ===
@@ -81,13 +65,17 @@ void shed__runtime__gc_set_root_stack_index(ShedGcRootIndex new_gc_root_stack_in
gc_root_stack_index = new_gc_root_stack_index;
}
+static void shed__runtime__gc_push_root_gc_object(struct ShedGcObjectHeader* gc_root) {
+ gc_root_stack[gc_root_stack_index] = gc_root;
+ gc_root_stack_index++;
+}
+
void shed__runtime__gc_push_root(ShedObject gc_root) {
if (!is_gc_object(gc_root)) {
return;
}
- gc_root_stack[gc_root_stack_index] = (struct ShedGcObjectHeader*) gc_root;
- gc_root_stack_index++;
+ shed__runtime__gc_push_root_gc_object((struct ShedGcObjectHeader*) gc_root);
}
// === Perm roots ===
@@ -106,6 +94,28 @@ void shed__runtime__gc_add_perm_root(ShedObject gc_root) {
gc_perm_root_index++;
}
+// == Allocation ==
+
+struct ShedGcObjectHeader* first = NULL;
+
+void* shed__runtime__gc_alloc(size_t size, size_t children_offset, size_t children_count) {
+ struct ShedGcObjectHeader* object = malloc(size);
+ object->next = first;
+ object->mark = 0;
+ object->children_offset = children_offset;
+ object->children_count = children_count;
+
+ first = object;
+
+ // TODO: is it possible to leave adding the root to the caller, and avoid
+ // having to add so many roots? (Since some values will immediately become a
+ // descendant of a root.)
+
+ shed__runtime__gc_push_root_gc_object(object);
+
+ return object;
+}
+
// == Collection ==
void mark_reachable() {