Mirror/wren
1
0
Fork 1
mirror of https://github.com/wren-lang/wren.git synced 2026-01-11 22:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move object freeing over to wren_value.

Browse Source 
That's where allocation is, so it makes sense.
This commit is contained in:
Bob Nystrom
2014-01-01 13:31:19 -08:00
parent 48db3a9620
commit b750ece08b
3 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/wren_value.c
View File

@ -302,6 +302,46 @@ Upvalue* wrenNewUpvalue(WrenVM* vm, Value* value)
return upvalue;
}
void wrenFreeObj(WrenVM* vm, Obj* obj)
{
#if WREN_TRACE_MEMORY
printf("free ");
wrenPrintValue(OBJ_VAL(obj));
printf(" @ %p\n", obj);
#endif
switch (obj->type)
{
case OBJ_FN:
{
ObjFn* fn = (ObjFn*)obj;
wrenReallocate(vm, fn->constants, 0, 0);
wrenReallocate(vm, fn->bytecode, 0, 0);
wrenReallocate(vm, fn->debug->name, 0, 0);
wrenReallocate(vm, fn->debug->sourceLines, 0, 0);
wrenReallocate(vm, fn->debug, 0, 0);
break;
}
case OBJ_LIST:
wrenReallocate(vm, ((ObjList*)obj)->elements, 0, 0);
break;
case OBJ_STRING:
wrenReallocate(vm, ((ObjString*)obj)->value, 0, 0);
break;
case OBJ_CLASS:
case OBJ_CLOSURE:
case OBJ_INSTANCE:
case OBJ_UPVALUE:
break;
}
wrenReallocate(vm, obj, 0, 0);
}
static ObjClass* getObjectClass(WrenVM* vm, Obj* obj)
{
switch (obj->type)

3
src/wren_value.h
View File

@ -527,6 +527,9 @@ Value wrenNewString(WrenVM* vm, const char* text, size_t length);
// Creates a new open upvalue pointing to [value] on the stack.
Upvalue* wrenNewUpvalue(WrenVM* vm, Value* value);
// Releases all memory owned by [obj], including [obj] itself.
void wrenFreeObj(WrenVM* vm, Obj* obj);
// Returns the class of [value].
ObjClass* wrenGetClass(WrenVM* vm, Value value);

41
src/wren_vm.c
View File

@ -293,45 +293,6 @@ void wrenSetCompiler(WrenVM* vm, Compiler* compiler)
vm->compiler = compiler;
}
static void freeObj(WrenVM* vm, Obj* obj)
{
#if WREN_TRACE_MEMORY
printf("free ");
wrenPrintValue(OBJ_VAL(obj));
printf(" @ %p\n", obj);
#endif
switch (obj->type)
{
case OBJ_FN:
{
ObjFn* fn = (ObjFn*)obj;
wrenReallocate(vm, fn->constants, 0, 0);
wrenReallocate(vm, fn->bytecode, 0, 0);
wrenReallocate(vm, fn->debug->name, 0, 0);
wrenReallocate(vm, fn->debug->sourceLines, 0, 0);
wrenReallocate(vm, fn->debug, 0, 0);
break;
}
case OBJ_LIST:
wrenReallocate(vm, ((ObjList*)obj)->elements, 0, 0);
break;
case OBJ_STRING:
wrenReallocate(vm, ((ObjString*)obj)->value, 0, 0);
break;
case OBJ_CLASS:
case OBJ_CLOSURE:
case OBJ_INSTANCE:
case OBJ_UPVALUE:
break;
}
wrenReallocate(vm, obj, 0, 0);
}
static void collectGarbage(WrenVM* vm)
{
// Mark all reachable objects.
@ -377,7 +338,7 @@ static void collectGarbage(WrenVM* vm)
// This object wasn't reached, so remove it from the list and free it.
Obj* unreached = *obj;
*obj = unreached->next;
freeObj(vm, unreached);
wrenFreeObj(vm, unreached);
}
else
{