krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 14:54:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Tests are passing, added preserveScope to VM API

Browse Source
This commit is contained in:
Kayne Ruse
2025-01-31 13:51:53 +11:00
parent bfed4e23f3
commit 481d17f040
10 changed files with 360 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/toy_module.c
View File

@@ -20,7 +20,7 @@ Toy_Module Toy_parseModule(unsigned char* ptr) {
//header
readUnsignedInt(&ptr);
// module.codeCount = readUnsignedInt(&ptr); NOTE: note used
module.jumpsCount = readUnsignedInt(&ptr);
module.paramCount = readUnsignedInt(&ptr);
module.dataCount = readUnsignedInt(&ptr);

4
source/toy_module_bundle.c
View File

@@ -10,10 +10,10 @@
//utils
static void expand(Toy_ModuleBundle* bundle, unsigned int amount) {
if (bundle->count + amount > bundle->capacity) {
bundle->capacity = 0;
bundle->capacity = 8; //DON'T bitshift zero
while (bundle->count + amount > bundle->capacity) { //expand as much as needed
bundle->capacity >>= 2;
bundle->capacity <<= 2;
}
bundle->ptr = realloc(bundle->ptr, bundle->capacity);

2
source/toy_module_bundle.h
View File

@@ -12,7 +12,7 @@ typedef struct Toy_ModuleBundle {
//create a bundle
TOY_API void Toy_initModuleBundle(Toy_ModuleBundle* bundle);
TOY_API void Toy_appendModuleBundle(Toy_ModuleBundle* bundle, Toy_Ast* ast);
TOY_API void Toy_appendModuleBundle(Toy_ModuleBundle* bundle, Toy_Ast* ast); //TODO: raw bytes
TOY_API void Toy_freeModuleBundle(Toy_ModuleBundle* bundle);
//load module bundle with external data (makes an internal copy)

22
source/toy_vm.c
View File

@@ -939,7 +939,7 @@ static void process(Toy_VM* vm) {
}
//exposed functions
void Toy_resetVM(Toy_VM* vm) {
void Toy_resetVM(Toy_VM* vm, bool preserveScope) {
vm->code = NULL;
vm->jumpsCount = 0;
@@ -957,7 +957,11 @@ void Toy_resetVM(Toy_VM* vm) {
Toy_resetStack(&vm->stack);
//NOTE: scope and buckets are not altered during resets
if (preserveScope == false) {
vm->scope = Toy_popScope(vm->scope);
}
//NOTE: buckets are not altered during resets
}
void Toy_initVM(Toy_VM* vm) {
@@ -967,7 +971,7 @@ void Toy_initVM(Toy_VM* vm) {
vm->stringBucket = Toy_allocateBucket(TOY_BUCKET_IDEAL);
vm->scopeBucket = Toy_allocateBucket(TOY_BUCKET_IDEAL);
Toy_resetVM(vm);
Toy_resetVM(vm, true);
}
void Toy_inheritVM(Toy_VM* vm, Toy_VM* parent) {
@@ -979,10 +983,10 @@ void Toy_inheritVM(Toy_VM* vm, Toy_VM* parent) {
//TODO: parent bucket pointers are updated after function calls
Toy_resetVM(vm);
Toy_resetVM(vm, true);
}
void Toy_bindVM(Toy_VM* vm, Toy_Module* module) {
void Toy_bindVM(Toy_VM* vm, Toy_Module* module, bool preserveScope) {
vm->code = module->code;
vm->jumpsCount = module->jumpsCount;
@@ -996,7 +1000,9 @@ void Toy_bindVM(Toy_VM* vm, Toy_Module* module) {
vm->dataAddr = module->dataAddr;
vm->subsAddr = module->subsAddr;
vm->scope = Toy_pushScope(&vm->scopeBucket, module->scopePtr); //new scope for the upcoming run
if (preserveScope == false) {
vm->scope = Toy_pushScope(&vm->scopeBucket, module->scopePtr);
}
}
void Toy_runVM(Toy_VM* vm) {
@@ -1017,9 +1023,7 @@ void Toy_runVM(Toy_VM* vm) {
}
void Toy_freeVM(Toy_VM* vm) {
Toy_resetVM(vm);
Toy_popScope(vm->scope);
Toy_resetVM(vm, false);
//clear the persistent memory
Toy_freeStack(vm->stack);

4
source/toy_vm.h
View File

@@ -42,12 +42,12 @@ typedef struct Toy_VM {
Toy_Bucket* scopeBucket; //stores the scope instances TODO: is this separation needed?
} Toy_VM;
TOY_API void Toy_resetVM(Toy_VM* vm); //persists memory
TOY_API void Toy_resetVM(Toy_VM* vm, bool preserveScope);
TOY_API void Toy_initVM(Toy_VM* vm); //creates memory
TOY_API void Toy_inheritVM(Toy_VM* vm, Toy_VM* parent); //inherits memory
TOY_API void Toy_bindVM(Toy_VM* vm, Toy_Module* module);
TOY_API void Toy_bindVM(Toy_VM* vm, Toy_Module* module, bool preserveScope);
TOY_API void Toy_runVM(Toy_VM* vm);
TOY_API void Toy_freeVM(Toy_VM* vm);