moved module/hw fields around

[dcpu16] / vm-dcpu16.c

diff --git a/vm-dcpu16.c b/vm-dcpu16.c
index 86f773aac4cfa691921da0488ddddaceaa9243e9..b4798838328aeae8e7d9698c9af64c25b79014a3 100644 (file)
--- a/vm-dcpu16.c
+++ b/vm-dcpu16.c
@@ -148,6 +148,53 @@ int file_load_(struct dcpu16 *vm, char *filename, DCPU16_WORD addr) {
     return 0;
 }
 
+/*  dump_ram_
+ *  print raw ram contents from start to stop
+ */
+static
+void dump_ram_(struct dcpu16 *vm, DCPU16_WORD start, DCPU16_WORD end) {
+    unsigned int i, j;
+    const unsigned int n = 8; /* words per line */
+
+    if (!vm) return;
+
+    for (i = start, j = 0; i <= end; i++, j++) {
+        if (j % n == 0)
+            printf("0x%04x:\t", i);
+        printf(" %04x%s", vm->ram[i], (j % n) == (n - 1) ? "\n" : "");
+    }
+    if ((j % n) != (n - 1))
+        printf("\n");
+}
+
+
+/*
+    print the current state of the machine
+    shows current cycle count, registers, and next instruction
+*/
+static
+void state_print_(struct dcpu16 *vm) {
+    unsigned int i;
+
+    if (!vm) return;
+
+    printf("  ");
+    for (i = 0; i < 8; i++)
+        printf("  %s:0x%04x", dcpu16_reg_names[i], vm->reg[i]);
+    printf("\n");
+
+    printf("(0x%08llx) %2s:0x%04x %2s:0x%04x %2s:0x%04x %2s:0x%04x [%2s]:",
+           vm->cycle_,
+           dcpu16_reg_names[DCPU16_REG_EX], vm->reg[DCPU16_REG_EX],
+           dcpu16_reg_names[DCPU16_REG_SP], vm->reg[DCPU16_REG_SP],
+           dcpu16_reg_names[DCPU16_REG_PC], vm->reg[DCPU16_REG_PC],
+           dcpu16_reg_names[DCPU16_REG_IA], vm->reg[DCPU16_REG_IA],
+           "PC");
+
+    dcpu16_disassemble_print(vm, vm->reg[DCPU16_REG_PC]);
+    printf("\n");
+}
+
 
 #ifdef HAVE_LIBVNCSERVER
 static struct dynamic_array rfbScreens_;
@@ -324,7 +371,7 @@ COMMAND_IMPL(dump) {
         return 0;
     }
 
-    dcpu16_dump_ram(vm, addr[0], addr[1]);
+    dump_ram_(vm, addr[0], addr[1]);
 
     return 0;
 }
@@ -396,7 +443,7 @@ COMMAND_IMPL(step) {
         dcpu16_step(vm);
 
         if (count > 1 && opt_.verbose)
-            dcpu16_state_print(vm);
+            state_print_(vm);
     }
 
     return 0;
@@ -480,7 +527,7 @@ COMMAND_IMPL(run) {
 
         dcpu16_step(vm);
         if (opt_.verbose > 1)
-            dcpu16_state_print(vm);
+            state_print_(vm);
         else if (opt_.verbose) {
             dcpu16_disassemble_print(vm, vm->reg[DCPU16_REG_PC]);
             printf("\n");
@@ -782,13 +829,13 @@ int main(int argc, char **argv) {
          tok_v = tok_v_prev = NULL,
          tok_c = tok_c_prev= 0,
          snprintf(prompt, sizeof prompt, prompt_fmt, vm->reg[DCPU16_REG_PC]),
-         dcpu16_state_print(vm);
+         state_print_(vm);
 
          (line = readline(prompt));
 
          printf("\n"),
          snprintf(prompt, sizeof prompt, prompt_fmt, vm->reg[DCPU16_REG_PC]),
-         dcpu16_state_print(vm)) {
+         state_print_(vm)) {
         const char whitespace[] = " \t";
         char *line_start;
         struct command_ *c;