diff --git a/cpp/vm.cpp b/cpp/vm.cpp index 2f5999f..088068c 100644 --- a/cpp/vm.cpp +++ b/cpp/vm.cpp @@ -55,8 +55,8 @@ uint8_t *VM::reg_name(uint8_t regvalue) { void VM::status(void) { #ifdef DBG uint8_t i; - DBG_INFO(("VM Status:\n")); - DBG_INFO(("~~~~~~~~~~\n")); + DBG_SUCC(("VM Status:\n")); + DBG_SUCC(("~~~~~~~~~~\n")); for (i = R0; i <= SP; i++) { switch (i) { case R0: @@ -94,7 +94,7 @@ void VM::status(void) { break; } } - DBG_INFO(("~~~~~~~~~~\n")); + DBG_SUCC(("~~~~~~~~~~\n")); #endif return; } @@ -102,13 +102,13 @@ void VM::status(void) { CONSTRUCTORS */ VM::VM() { - DBG_INFO(("Creating VM without code.\n")); + DBG_SUCC(("Creating VM without code.\n")); as.allocate(); init_regs(); } VM::VM(uint8_t *code, uint32_t codesize) { - DBG_INFO(("Creating VM with code.\n")); + DBG_SUCC(("Creating VM with code.\n")); if (as.allocate()) { as.insCode(code, codesize); } @@ -184,7 +184,7 @@ bool VM::exec_putm(void) { uint8_t src; dst = *((uint16_t *)&as.code[regs[IP] + 1]); src = as.code[regs[IP] + 3]; - DBG_INFO(("PUTM 0x%x 0x%x\n", dst, src)); + DBG_INFO(("PUTM 0x%x, %s\n", dst, reg_name(src))); *((uint16_t *)&as.data[dst]) = regs[src]; return true; } @@ -198,7 +198,7 @@ bool VM::exec_addi(void) { dst = as.code[regs[IP] + 1]; src = *((uint16_t *)&as.code[regs[IP] + 2]); - DBG_INFO(("ADDI 0x%x 0x%x\n", dst, src)); + DBG_INFO(("ADDI %s, 0x%x\n", reg_name(dst), src)); regs[dst] += src; return true; } diff --git a/python/assembler.py b/python/assembler.py index f8f8e03..f09ff47 100644 --- a/python/assembler.py +++ b/python/assembler.py @@ -41,8 +41,7 @@ def to_uint8(data): return struct.pack("".format(sys.argv[0])) + if len(sys.argv) < 3: + print("Usage: {} file_to_assemble output".format(sys.argv[0])) return with open(sys.argv[1], 'r') as f: @@ -122,8 +228,9 @@ def main(): elif flag == section_flags["code:"]: assemble_code(line) if not flag: - sys.stderr.write("Nothing was assembled! Did you use the section delimiters?\n") - with open("./out.gipu", 'wb') as f: + sys.stderr.write( + "Nothing was assembled! Did you use the section delimiters?\n") + with open(sys.argv[2], 'wb') as f: f.write(assembled) if __name__ == '__main__':