Debugger fully functional and non-quirky :)

Imanol-Mikel Barba Sabariego
1 parent db7e2683
Showing 7 changed files with 79 additions and 7 deletions
.idea/synacorvm.iml
CMakeLists.txt
cpu.c
cpu.h
debug.c
input.c
input.h
@@ -6,12 +6,14 @@
       <sourceFolder url="file://$MODULE_DIR$/stack.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/cpu.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/disasm.c" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/instructions.h" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/mem.h" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/main.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/mem.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/registers.h" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/instructions.h" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/input.h" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/CMakeLists.txt" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/input.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/registers.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/debug.h" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/stack.h" isTestSource="false" />
@@ -3,5 +3,5 @@ project(synacorvm)
  
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
  
-set(SOURCE_FILES main.c cpu.c cpu.h registers.h mem.h disasm.h disasm.c stack.c stack.h registers.c mem.c instructions.h debug.c debug.h)
+set(SOURCE_FILES main.c cpu.c cpu.h registers.h mem.h disasm.h disasm.c stack.c stack.h registers.c mem.c instructions.h debug.c debug.h input.c input.h)
 add_executable(synacorvm ${SOURCE_FILES})
@@ -224,7 +224,11 @@ void out(uint16_t src)
  
 void in(uint16_t dst)
 {
-    int c = getchar();
+    if(!input_buffer_size())
+    {
+        read_input();
+    }
+    char c = get_input();
     regs[dst % (MAX_INT + 1)] = (uint16_t)c;
 }
  
@@ -10,6 +10,7 @@
 #include "stack.h"
 #include "registers.h"
 #include "instructions.h"
+#include "input.h"
  
 #define MAX_INT 32767
  
@@ -71,7 +71,6 @@ void save_state(char *filename)
  
 void query()
 {
-    //TODO discard stdin
     uint8_t end = 0;
     uint16_t bpoint;
     uint16_t mempos;
@@ -97,8 +96,8 @@ void query()
         switch (command)
         {
             case 'b':
-                sscanf(input,"b %hu\n",&bpoint);
-                fprintf(stderr,"Set breakpoint %hu to %hu",nbpoints,bpoint);
+                sscanf(input,"b %hx\n",&bpoint);
+                fprintf(stderr,"Set breakpoint %hu to %hx",nbpoints,bpoint);
                 breakpoints[nbpoints] = bpoint;
                 nbpoints = (uint16_t)(nbpoints + 1 % 0xFF);
                 break;
@@ -301,12 +300,16 @@ void debug_program()
         if(in_breakpoint(pc))
         {
             breakpoint = 1;
-            fprintf(stderr,"Breakpoint hit @ pc=%02X",pc);
+            fprintf(stderr,"Breakpoint hit @ pc=%X",pc);
         }
         if(breakpoint)
         {
             fprintf(stderr, "%02X: ", pc);
             print_instruction(mem[pc], mem[pc+1], mem[pc+2], mem[pc+3]);
+            if(stdin_length())
+            {
+                read_input();
+            }
             query();
             if(terminate)
             {
+//
+// Created by imanol on 12/27/16.
+//
+
+#include "input.h"
+
+unsigned int input_buffer_length = 0;
+unsigned int input_buffer_pos = 0;
+char input_buffer[MAX_INT];
+
+unsigned int stdin_length()
+{
+    unsigned int length = 0;
+    ioctl(0, I_NREAD, &length);
+    return length;
+}
+
+void read_input()
+{
+    strncpy(input_buffer,input_buffer+input_buffer_pos,input_buffer_size());
+    input_buffer_pos = input_buffer_size();
+    unsigned int old_buffer_length = input_buffer_length;
+    input_buffer_length = stdin_length();
+    if(!input_buffer_length)
+    {
+        input_buffer_length = 64; //arbitrary
+    }
+    fgets(input_buffer+input_buffer_pos,input_buffer_length,stdin);
+    //TODO: Improve this... Get a way to know how many bytes read
+    input_buffer_length = (unsigned int)strlen(input_buffer);
+    //input_buffer_length += old_buffer_length;
+}
+
+char get_input()
+{
+    char c = input_buffer[input_buffer_pos++];
+    return c;
+}
+
+unsigned int input_buffer_size()
+{
+    return input_buffer_length - (input_buffer_pos);
+}
 \ No newline at end of file
+//
+// Created by imanol on 12/27/16.
+//
+
+#ifndef SYNACORVM_INPUT_H
+#define SYNACORVM_INPUT_H
+
+#include <stdint.h>
+#include <unistd.h>
+#include "cpu.h"
+#include <string.h>
+#include <stropts.h>
+
+unsigned int stdin_length();
+void read_input();
+char get_input();
+unsigned int input_buffer_size();
+
+#endif //SYNACORVM_INPUT_H