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

Added remaining opcodes to inspector

Browse Source 
Also used some coloring for terminal outputs
This commit is contained in:
Kayne Ruse
2026-04-12 23:01:28 +10:00
parent e24823924a
commit 8eefbc8a0c
5 changed files with 95 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
repl/bytecode_inspector.c
View File

@@ -104,13 +104,43 @@ int inspect_instruction(unsigned char* bytecode, unsigned int pc, unsigned int j
case TOY_OPCODE_READ:
return inspect_read(bytecode, pc, jumps_addr, data_addr);
// case TOY_OPCODE_DECLARE:
// case TOY_OPCODE_ASSIGN:
// case TOY_OPCODE_ASSIGN_COMPOUND:
// case TOY_OPCODE_ACCESS:
// case TOY_OPCODE_INVOKE:
// case TOY_OPCODE_DUPLICATE:
// case TOY_OPCODE_ELIMINATE:
case TOY_OPCODE_DECLARE: {
unsigned int indexValue = *((unsigned int*)(bytecode + pc + 4));
unsigned int jumpValue = *((unsigned int*)(bytecode + jumps_addr + indexValue));
char* cstr = ((char*)(bytecode + data_addr + jumpValue));
printf(MARKER "DECLARE %s: %s%s\n", MARKER_VALUE(pc, unsigned char),
cstr,
Toy_private_getValueTypeAsCString(bytecode[pc + 1]),
bytecode[pc + 3] ? " const" : ""
);
return 8;
}
case TOY_OPCODE_ASSIGN:
printf(MARKER "ASSIGN %s\n", MARKER_VALUE(pc, unsigned char), bytecode[pc + 1] ? "(chained)" : "");
return 4;
case TOY_OPCODE_ASSIGN_COMPOUND:
printf(MARKER "ASSIGN COMPOUND %s\n", MARKER_VALUE(pc, unsigned char), bytecode[pc + 1] ? "(chained)" : "");
return 4;
case TOY_OPCODE_ACCESS:
printf(MARKER "ACCESS\n", MARKER_VALUE(pc, unsigned char));
return 4;
case TOY_OPCODE_INVOKE:
printf(MARKER "INVOKE %s (%d args)\n", MARKER_VALUE(pc, unsigned char),
Toy_private_getValueTypeAsCString(bytecode[pc + 1]),
bytecode[pc + 2]);
return 4;
case TOY_OPCODE_DUPLICATE:
printf(MARKER "DUPLICATE %s\n", MARKER_VALUE(pc, unsigned char), bytecode[pc + 1] ? "and ACCESS" : "");
return 4;
case TOY_OPCODE_ELIMINATE:
printf(MARKER "ELIMINATE\n", MARKER_VALUE(pc, unsigned char));
return 4;
case TOY_OPCODE_ADD:
printf(MARKER "ADD %s\n", MARKER_VALUE(pc, unsigned char), bytecode[pc + 1] == TOY_OPCODE_ASSIGN ? "ASSIGN" : "");
@@ -172,18 +202,50 @@ int inspect_instruction(unsigned char* bytecode, unsigned int pc, unsigned int j
printf(MARKER "Keyword RETURN (%u)\n", MARKER_VALUE(pc, unsigned char), bytecode[pc + 1]);
return 4;
// case TOY_OPCODE_JUMP:
// case TOY_OPCODE_ESCAPE:
// case TOY_OPCODE_SCOPE_PUSH:
// case TOY_OPCODE_SCOPE_POP:
// case TOY_OPCODE_ASSERT:
case TOY_OPCODE_JUMP:
printf(MARKER TOY_CC_DEBUG "JUMP %s%s (%s%d) (GOTO %u)\n" TOY_CC_RESET, MARKER_VALUE(pc, unsigned char),
bytecode[pc + 1] == TOY_OP_PARAM_JUMP_ABSOLUTE ? "absolute" : "relative",
bytecode[pc + 2] == TOY_OP_PARAM_JUMP_ALWAYS ? "" :
bytecode[pc + 2] == TOY_OP_PARAM_JUMP_IF_TRUE ? " if true" : " if false",
bytecode[pc + 4] > 0 ? "+" : "", //show a + sign when positive
bytecode[pc + 4],
bytecode[pc + 4] + pc + 8
);
return 8;
case TOY_OPCODE_PRINT:
printf(MARKER "Keyword PRINT\n", MARKER_VALUE(pc, unsigned char));
case TOY_OPCODE_ESCAPE:
printf(MARKER TOY_CC_DEBUG "ESCAPE relative %s%d (GOTO %u) and pop %d\n" TOY_CC_RESET, MARKER_VALUE(pc, unsigned char),
bytecode[pc + 4] > 0 ? "+" : "", //show a + sign when positive
bytecode[pc + 4],
bytecode[pc + 4] + pc + 12,
bytecode[pc + 8]
);
return 12;
case TOY_OPCODE_SCOPE_PUSH:
printf(MARKER "SCOPE PUSH\n", MARKER_VALUE(pc, unsigned char));
return 4;
case TOY_OPCODE_SCOPE_POP:
printf(MARKER "SCOPE POP\n", MARKER_VALUE(pc, unsigned char));
return 4;
case TOY_OPCODE_ASSERT:
printf(MARKER TOY_CC_WARN "Keyword ASSERT (cond%s)\n" TOY_CC_RESET, MARKER_VALUE(pc, unsigned char), bytecode[pc + 1] > 1 ? ",msg" : "");
return 4;
case TOY_OPCODE_PRINT:
printf(MARKER TOY_CC_NOTICE "Keyword PRINT\n" TOY_CC_RESET, MARKER_VALUE(pc, unsigned char));
return 4;
case TOY_OPCODE_CONCAT:
printf(MARKER "CONCATENATE strings\n", MARKER_VALUE(pc, unsigned char));
return 4;
case TOY_OPCODE_INDEX:
printf(MARKER "INDEX (%d elements)\n", MARKER_VALUE(pc, unsigned char), bytecode[pc + 1]);
return 4;
// case TOY_OPCODE_CONCAT:
// case TOY_OPCODE_INDEX:
// case TOY_OPCODE_UNUSED:
// case TOY_OPCODE_PASS:
// case TOY_OPCODE_ERROR:
@@ -241,9 +303,12 @@ int inspect_read(unsigned char* bytecode, unsigned int pc, unsigned int jumps_ad
return 8;
}
case TOY_VALUE_FUNCTION:
printf(MARKER "READ FUNCTION (%d params)\n", MARKER_VALUE(pc, unsigned char), bytecode[pc + 2]);
return 8;
case TOY_VALUE_ARRAY:
case TOY_VALUE_TABLE:
case TOY_VALUE_FUNCTION:
case TOY_VALUE_OPAQUE:
case TOY_VALUE_ANY:
case TOY_VALUE_UNKNOWN:

11
repl/main.c
View File

@@ -365,6 +365,11 @@ int repl(const char* filepath, bool verbose) {
continue;
}
unsigned char* bytecode = Toy_compileToBytecode(ast);
if (verbose) {
inspect_bytecode(bytecode);
}
Toy_bindVM(&vm, bytecode, NULL);
//run
@@ -374,7 +379,6 @@ int repl(const char* filepath, bool verbose) {
if (verbose) {
debugStackPrint(vm.stack);
debugScopePrint(vm.scope, 0);
inspect_bytecode(bytecode);
}
//free the memory, and leave the VM ready for the next loop
@@ -460,6 +464,10 @@ int main(int argc, const char* argv[]) {
Toy_freeBucket(&bucket);
free(source);
if (cmd.verbose) {
inspect_bytecode(bytecode);
}
//run the compiled code
Toy_VM vm;
Toy_initVM(&vm);
@@ -471,7 +479,6 @@ int main(int argc, const char* argv[]) {
if (cmd.verbose) {
debugStackPrint(vm.stack);
debugScopePrint(vm.scope, 0);
inspect_bytecode(bytecode);
}
//cleanup