Implemented debugger and disassembler

Imanol-Mikel Barba Sabariego
1 parent b5e96df6
Showing 18 changed files with 27341 additions and 26903 deletions
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/misc.xml
.idea/synacorvm.iml
CMakeLists.txt
cpu.c
cpu.h
data/challenge.asm
data/instructions_teleport
debug.c
debug.h
disasm.c
disasm.h
instructions.h
main.c
scripts/coins.py
scripts/process_disasm.sh
synacor
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
 \ No newline at end of file
+<component name="CopyrightManager">
+  <settings default="" />
+</component>
 \ No newline at end of file
@@ -16,4 +16,5 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
+  <component name="ProjectRootManager" version="2" assert-keyword="false" jdk-15="false" />
 </project>
 \ No newline at end of file
@@ -2,16 +2,21 @@
 <module type="CPP_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/cpu.h" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/CMakeLists.txt" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/main.c" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/disasm.h" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/stack.c" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/mem.h" 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$/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$/CMakeLists.txt" 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" />
+      <sourceFolder url="file://$MODULE_DIR$/cpu.h" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/debug.c" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
@@ -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 stack.c stack.h registers.c mem.c)
-add_executable(synacorvm ${SOURCE_FILES})
 \ No newline at end of file
+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)
+add_executable(synacorvm ${SOURCE_FILES})
@@ -5,8 +5,6 @@
 #include <stdlib.h>
 #include "cpu.h"
-uint64_t cycle_count = 0;
-
 void mov(uint16_t dst, uint16_t src)
 {
     if(src > MAX_INT)
@@ -117,7 +115,7 @@ void add(uint16_t dst, uint16_t a, uint16_t b)
     regs[dst % (MAX_INT+1)] = (a + b) % (MAX_INT+1);
 }
-void mult(uint16_t dst, uint16_t a, uint16_t b)
+void mul(uint16_t dst, uint16_t a, uint16_t b)
 {
     if(a > MAX_INT)
     {
@@ -237,13 +235,7 @@ void nop()
 uint16_t fetch()
 {
-    /*if(pc == 0x5bf-1)
-    {
-	//break
-    }*/
     uint16_t value = mem[pc++];
-    //printf("0x%2x (0x%2x)",pc,pc*sizeof(uint16_t));
-    //printf(" cycle: %d\n",cycle_count++);
     return value;
 }
@@ -304,11 +296,11 @@ void start_execution()
                 arg3 = fetch();
                 add(arg1,arg2,arg3);
                 break;
-            case MULT:
+            case MUL:
                 arg1 = fetch();
                 arg2 = fetch();
                 arg3 = fetch();
-                mult(arg1,arg2,arg3);
+                mul(arg1,arg2,arg3);
                 break;
             case MOD:
                 arg1 = fetch();
@@ -372,7 +364,7 @@ void start_execution()
     }
 }
-void core_dump()
+void print_regs()
 {
     fprintf(stderr,"r0: %2x\n",regs[0]);
     fprintf(stderr,"r1: %2x\n",regs[1]);
@@ -383,7 +375,14 @@ void core_dump()
     fprintf(stderr,"r6: %2x\n",regs[6]);
     fprintf(stderr,"r7: %2x\n",regs[7]);
     fprintf(stderr,"pc: %2x\n",pc);
+}
+
+void core_dump()
+{
+    print_regs();
     //dump memory to file
     //dump stack to file
     exit(1);
 }
+
+
@@ -9,34 +9,34 @@
 #include "mem.h"
 #include "stack.h"
 #include "registers.h"
+#include "instructions.h"
 #define MAX_INT 32767
-#define HALT    0x0000
-#define MOV     0x0001
-#define PUSH    0x0002
-#define POP     0x0003
-#define TEQ     0x0004
-#define TGT     0x0005
-#define JMP     0x0006
-#define JNZ     0x0007
-#define JZ      0x0008
-#define ADD     0x0009
-#define MULT    0x000A
-#define MOD     0x000B
-#define AND     0x000C
-#define OR      0x000D
-#define NOT     0x000E
-#define LOAD    0x000F
-#define STOR    0x0010
-#define CALL    0x0011
-#define RET     0x0012
-#define OUT     0x0013
-#define IN      0x0014
-#define NOP     0x0015
-
+void mov(uint16_t dst, uint16_t src);
+void push(uint16_t src);
+void pop(uint16_t dst);
+void teq(uint16_t dst, uint16_t a, uint16_t b);
+void tgt(uint16_t dst, uint16_t a, uint16_t b);
+void jmp(uint16_t dst);
+void jnz(uint16_t cond, uint16_t dst);
+void jz(uint16_t cond, uint16_t dst);
+void add(uint16_t dst, uint16_t a, uint16_t b);
+void mul(uint16_t dst, uint16_t a, uint16_t b);
+void mod(uint16_t dst, uint16_t a, uint16_t b);
+void and(uint16_t dst, uint16_t a, uint16_t b);
+void or(uint16_t dst, uint16_t a, uint16_t b);
+void not(uint16_t dst, uint16_t src);
+void load(uint16_t dst, uint16_t src);
+void stor(uint16_t dst, uint16_t src);
+void call(uint16_t dst);
+uint8_t ret();
+void out(uint16_t src);
+void in(uint16_t dst);
+void nop();
 void start_execution();
 void core_dump();
+void print_regs();
 #endif //SYNACORVM_CPU_H