oreodave/ovm
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clearer VERBOSE messages

Browse Source
This commit is contained in:
Aryadev Chavali
2023-11-01 15:22:47 +00:00
parent 6a270eda1e
commit 6d35283ef0
3 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
vm/main.c
View File

@@ -17,31 +17,6 @@
#include "./runtime.h"
#include <lib/inst.h>
int interpret_bytecode(const char *filepath)
{
FILE *fp = fopen(filepath, "rb");
size_t number = 0;
inst_t *instructions = insts_read_bytecode_file(fp, &number);
fclose(fp);
byte stack[256];
vm_t vm = {0};
vm_load_stack(&vm, stack, ARR_SIZE(stack));
vm_load_program(&vm, instructions, number);
err_t err = vm_execute_all(&vm);
int ret = 0;
if (err)
{
const char *error_str = err_as_cstr(err);
fprintf(stderr, "[ERROR]: %s\n", error_str);
vm_print_all(&vm, stderr);
ret = 255 - err;
}
free(instructions);
return ret;
}
void usage(const char *program_name, FILE *out)
{
fprintf(out,
@@ -61,5 +36,44 @@ int main(int argc, char *argv[])
}
const char *filename = argv[1];
return interpret_bytecode(filename);
#if VERBOSE >= 1
printf("[%sINTERPRETER%s]: Interpreting `%s`\n", TERM_YELLOW, TERM_RESET,
filename);
#endif
FILE *fp = fopen(filename, "rb");
size_t number = 0;
inst_t *instructions = insts_read_bytecode_file(fp, &number);
fclose(fp);
#if VERBOSE >= 1
printf("\t[%sBYTECODE-READER%s]: Read %lu instructions\n", TERM_GREEN,
TERM_RESET, number);
#endif
byte stack[256];
vm_t vm = {0};
vm_load_stack(&vm, stack, ARR_SIZE(stack));
vm_load_program(&vm, instructions, number);
#if VERBOSE >= 1
printf("\t[%sVM-SETUP%s]: Loaded stack and program into VM\n", TERM_GREEN,
TERM_RESET);
#endif
err_t err = vm_execute_all(&vm);
int ret = 0;
if (err)
{
const char *error_str = err_as_cstr(err);
fprintf(stderr, "[ERROR]: %s\n", error_str);
vm_print_all(&vm, stderr);
ret = 255 - err;
}
free(instructions);
#if VERBOSE >= 1
printf("[%sINTERPRETER%s]: Finished execution\n", TERM_GREEN, TERM_RESET);
#endif
return ret;
}

3
vm/runtime.c
View File

@@ -299,7 +299,8 @@ err_t vm_execute_all(vm_t *vm)
}
#if VERBOSE >= 1
fprintf(stdout, "[vm_execute_all]: Final VM state(Cycle %lu)\n", cycles);
fprintf(stdout, "[%svm_execute_all%s]: Final VM state(Cycle %lu)\n",
TERM_YELLOW, TERM_RESET, cycles);
vm_print_all(vm, stdout);
#endif
return err;