VM runtime now maintains a heap internally
Now need to create some instructions which manage the heap
This commit is contained in:
@@ -55,10 +55,14 @@ int main(int argc, char *argv[])
|
|||||||
byte *stack = calloc(stack_size, 1);
|
byte *stack = calloc(stack_size, 1);
|
||||||
registers_t registers = {0};
|
registers_t registers = {0};
|
||||||
darr_init(®isters, 8 * WORD_SIZE);
|
darr_init(®isters, 8 * WORD_SIZE);
|
||||||
|
heap_t heap = {0};
|
||||||
|
heap_create(&heap);
|
||||||
|
|
||||||
vm_t vm = {0};
|
vm_t vm = {0};
|
||||||
vm_load_stack(&vm, stack, stack_size);
|
vm_load_stack(&vm, stack, stack_size);
|
||||||
vm_load_program(&vm, instructions, number);
|
vm_load_program(&vm, instructions, number);
|
||||||
vm_load_registers(&vm, registers);
|
vm_load_registers(&vm, registers);
|
||||||
|
vm_load_heap(&vm, heap);
|
||||||
|
|
||||||
#if VERBOSE >= 1
|
#if VERBOSE >= 1
|
||||||
printf("\t[%sVM-SETUP%s]: Loaded stack and program into VM\n", TERM_GREEN,
|
printf("\t[%sVM-SETUP%s]: Loaded stack and program into VM\n", TERM_GREEN,
|
||||||
|
|||||||
11
vm/runtime.c
11
vm/runtime.c
@@ -326,11 +326,22 @@ void vm_load_registers(vm_t *vm, registers_t registers)
|
|||||||
vm->registers = registers;
|
vm->registers = registers;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void vm_load_heap(vm_t *vm, heap_t heap)
|
||||||
|
{
|
||||||
|
vm->heap = heap;
|
||||||
|
}
|
||||||
|
|
||||||
void vm_stop(vm_t *vm)
|
void vm_stop(vm_t *vm)
|
||||||
{
|
{
|
||||||
free(vm->registers.data);
|
free(vm->registers.data);
|
||||||
free(vm->program.instructions);
|
free(vm->program.instructions);
|
||||||
free(vm->stack.data);
|
free(vm->stack.data);
|
||||||
|
heap_stop(&vm->heap);
|
||||||
|
|
||||||
|
vm->registers = (registers_t){0};
|
||||||
|
vm->program = (struct Program){0};
|
||||||
|
vm->stack = (struct Stack){0};
|
||||||
|
vm->heap = (heap_t){0};
|
||||||
}
|
}
|
||||||
|
|
||||||
void vm_print_registers(vm_t *vm, FILE *fp)
|
void vm_print_registers(vm_t *vm, FILE *fp)
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <lib/heap.h>
|
||||||
#include <lib/inst.h>
|
#include <lib/inst.h>
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
@@ -45,6 +46,7 @@ typedef struct
|
|||||||
byte *data;
|
byte *data;
|
||||||
word ptr, max;
|
word ptr, max;
|
||||||
} stack;
|
} stack;
|
||||||
|
heap_t heap;
|
||||||
struct Program
|
struct Program
|
||||||
{
|
{
|
||||||
inst_t *instructions;
|
inst_t *instructions;
|
||||||
@@ -56,8 +58,9 @@ err_t vm_execute(vm_t *);
|
|||||||
err_t vm_execute_all(vm_t *);
|
err_t vm_execute_all(vm_t *);
|
||||||
|
|
||||||
void vm_load_stack(vm_t *, byte *, size_t);
|
void vm_load_stack(vm_t *, byte *, size_t);
|
||||||
void vm_load_program(vm_t *, inst_t *, size_t);
|
|
||||||
void vm_load_registers(vm_t *, registers_t);
|
void vm_load_registers(vm_t *, registers_t);
|
||||||
|
void vm_load_heap(vm_t *, heap_t);
|
||||||
|
void vm_load_program(vm_t *, inst_t *, size_t);
|
||||||
void vm_stop(vm_t *);
|
void vm_stop(vm_t *);
|
||||||
|
|
||||||
// Print routines
|
// Print routines
|
||||||
|
|||||||
Reference in New Issue
Block a user