VM implemented, debugger and disasm WIP

Imanol-Mikel Barba Sabariego
1 parent 086defff
Showing 13 changed files with 27119 additions and 52 deletions
.idea/misc.xml
.idea/vcs.xml
cpu.c
data/arch-spec
data/challenge.asm
data/challenge.bin
data/synacor-challenge.tgz
disasm.c
main.c
scripts/coins.py
stack.c
stack.h
synacor
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+  <component name="CidrRootsConfiguration">
+    <sourceRoots />
+    <libraryRoots />
+    <excludeRoots />
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
 \ No newline at end of file
@@ -5,19 +5,21 @@
 #include <stdlib.h>
 #include "cpu.h"
-void mov(short dst, short src)
+uint64_t cycle_count = 0;
+
+void mov(uint16_t dst, uint16_t src)
 {
     if(src > MAX_INT)
     {
-        regs[dst] = regs[src % (MAX_INT+1)];
+        regs[dst % (MAX_INT+1)] = regs[src % (MAX_INT+1)];
     }
     else
     {
-        regs[dst] = src;
+        regs[dst % (MAX_INT+1)] = src;
     }
 }
-void push(short src)
+void push(uint16_t src)
 {
     if(src > MAX_INT)
     {
@@ -29,9 +31,9 @@ void push(short src)
     }
 }
-void pop(short dst)
+void pop(uint16_t dst)
 {
-    short value = stack_pop();
+    uint16_t value = stack_pop();
     if(STACK_FAULT)
     {
         fprintf(stderr,"CRITICAL: STACK VIOLATION\n");
@@ -40,7 +42,7 @@ void pop(short dst)
     regs[dst % (MAX_INT+1)] = value;
 }
-void teq(short dst, short a, short b)
+void teq(uint16_t dst, uint16_t a, uint16_t b)
 {
     if(a > MAX_INT)
     {
@@ -53,7 +55,7 @@ void teq(short dst, short a, short b)
     regs[dst % (MAX_INT+1)] = (a == b);
 }
-void tgt(short dst, short a, short b)
+void tgt(uint16_t dst, uint16_t a, uint16_t b)
 {
     if(a > MAX_INT)
     {
@@ -66,7 +68,7 @@ void tgt(short dst, short a, short b)
     regs[dst % (MAX_INT+1)] = (a > b);
 }
-void jmp(short dst)
+void jmp(uint16_t dst)
 {
     if(dst > MAX_INT)
     {
@@ -78,11 +80,11 @@ void jmp(short dst)
     }
 }
-void jnz(short cond, short dst)
+void jnz(uint16_t cond, uint16_t dst)
 {
     if(cond > MAX_INT)
     {
-        cond = regs[dst % (MAX_INT+1)];
+        cond = regs[cond % (MAX_INT+1)];
     }
     if(cond)
     {
@@ -90,11 +92,11 @@ void jnz(short cond, short dst)
     }
 }
-void jz(short cond, short dst)
+void jz(uint16_t cond, uint16_t dst)
 {
     if(cond > MAX_INT)
     {
-        cond = regs[dst % (MAX_INT+1)];
+        cond = regs[cond % (MAX_INT+1)];
     }
     if(!cond)
     {
@@ -102,7 +104,7 @@ void jz(short cond, short dst)
     }
 }
-void add(short dst, short a, short b)
+void add(uint16_t dst, uint16_t a, uint16_t b)
 {
     if(a > MAX_INT)
     {
@@ -115,7 +117,7 @@ void add(short dst, short a, short b)
     regs[dst % (MAX_INT+1)] = (a + b) % (MAX_INT+1);
 }
-void mult(short dst, short a, short b)
+void mult(uint16_t dst, uint16_t a, uint16_t b)
 {
     if(a > MAX_INT)
     {
@@ -128,7 +130,7 @@ void mult(short dst, short a, short b)
     regs[dst % (MAX_INT+1)] = (a * b) % (MAX_INT+1);
 }
-void mod(short dst, short a, short b)
+void mod(uint16_t dst, uint16_t a, uint16_t b)
 {
     if(a > MAX_INT)
     {
@@ -141,7 +143,7 @@ void mod(short dst, short a, short b)
     regs[dst % (MAX_INT+1)] = (a % b);
 }
-void and(short dst, short a, short b)
+void and(uint16_t dst, uint16_t a, uint16_t b)
 {
     if(a > MAX_INT)
     {
@@ -154,7 +156,7 @@ void and(short dst, short a, short b)
     regs[dst % (MAX_INT+1)] = (a & b);
 }
-void or(short dst, short a, short b)
+void or(uint16_t dst, uint16_t a, uint16_t b)
 {
     if(a > MAX_INT)
     {
@@ -167,7 +169,7 @@ void or(short dst, short a, short b)
     regs[dst % (MAX_INT+1)] = (a | b);
 }
-void not(short dst, short src)
+void not(uint16_t dst, uint16_t src)
 {
     if(src > MAX_INT)
     {
@@ -176,16 +178,16 @@ void not(short dst, short src)
     regs[dst % (MAX_INT+1)] = ~src & 0x7FFF;
 }
-void load(short src, short dst)
+void load(uint16_t dst, uint16_t src)
 {
     if(src > MAX_INT)
     {
         src = regs[src % (MAX_INT+1)];
     }
-    regs[dst % (MAX_INT+1)] = src;
+    regs[dst % (MAX_INT+1)] = mem[src];
 }
-void stor(short dst, short src)
+void stor(uint16_t dst, uint16_t src)
 {
     if(src > MAX_INT)
     {
@@ -201,7 +203,7 @@ void stor(short dst, short src)
     }
 }
-void call(short dst)
+void call(uint16_t dst)
 {
     stack_push(pc);
     jmp(dst);
@@ -213,15 +215,19 @@ uint8_t ret()
     return STACK_FAULT;
 }
-void out(unsigned char a)
+void out(uint16_t src)
 {
-    putchar(a);
+    if(src > MAX_INT)
+    {
+        src = regs[src % (MAX_INT+1)];
+    }
+    putchar(src);
 }
-void in(short dst)
+void in(uint16_t dst)
 {
     int c = getchar();
-    regs[dst] = (short)c;
+    regs[dst % (MAX_INT + 1)] = (uint16_t)c;
 }
 void nop()
@@ -229,24 +235,26 @@ void nop()
     return;
 }
-short fetch()
+uint16_t fetch()
 {
-    short value = mem[pc++];
-    if(value < 0)
+    /*if(pc == 0x5bf-1)
     {
-        value *= -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;
 }
 void start_execution()
 {
-    short arg1;
-    short arg2;
-    short arg3;
+    uint16_t arg1;
+    uint16_t arg2;
+    uint16_t arg3;
     for(;;)
     {
-        short opcode = fetch();
+        uint16_t opcode = fetch();
         switch(opcode)
         {
             case HALT:
@@ -346,7 +354,8 @@ void start_execution()
                 }
                 break;
             case OUT:
-                out((unsigned char)fetch());
+                arg1 = fetch();
+                out(arg1);
                 break;
             case IN:
                 arg1 = fetch();
@@ -377,4 +386,4 @@ void core_dump()
     //dump memory to file
     //dump stack to file
     exit(1);
-}
 \ No newline at end of file
+}
+== Synacor Challenge ==
+In this challenge, your job is to use this architecture spec to create a
+virtual machine capable of running the included binary.  Along the way,
+you will find codes; submit these to the challenge website to track
+your progress.  Good luck!
+
+
+== architecture ==
+- three storage regions
+  - memory with 15-bit address space storing 16-bit values
+  - eight registers
+  - an unbounded stack which holds individual 16-bit values
+- all numbers are unsigned integers 0..32767 (15-bit)
+- all math is modulo 32768; 32758 + 15 => 5
+
+== binary format ==
+- each number is stored as a 16-bit little-endian pair (low byte, high byte)
+- numbers 0..32767 mean a literal value
+- numbers 32768..32775 instead mean registers 0..7
+- numbers 32776..65535 are invalid
+- programs are loaded into memory starting at address 0
+- address 0 is the first 16-bit value, address 1 is the second 16-bit value, etc
+
+== execution ==
+- After an operation is executed, the next instruction to read is immediately after the last argument of the current operation.  If a jump was performed, the next operation is instead the exact destination of the jump.
+- Encountering a register as an operation argument should be taken as reading from the register or setting into the register as appropriate.
+
+== hints ==
+- Start with operations 0, 19, and 21.
+- Here's a code for the challenge website: WdXrmkgDVVgK
+- The program "9,32768,32769,4,19,32768" occupies six memory addresses and should:
+  - Store into register 0 the sum of 4 and the value contained in register 1.
+  - Output to the terminal the character with the ascii code contained in register 0.
+
+== opcode listing ==
+halt: 0
+  stop execution and terminate the program
+set: 1 a b
+  set register <a> to the value of <b>
+push: 2 a
+  push <a> onto the stack
+pop: 3 a
+  remove the top element from the stack and write it into <a>; empty stack = error
+eq: 4 a b c
+  set <a> to 1 if <b> is equal to <c>; set it to 0 otherwise
+gt: 5 a b c
+  set <a> to 1 if <b> is greater than <c>; set it to 0 otherwise
+jmp: 6 a
+  jump to <a>
+jt: 7 a b
+  if <a> is nonzero, jump to <b>
+jf: 8 a b
+  if <a> is zero, jump to <b>
+add: 9 a b c
+  assign into <a> the sum of <b> and <c> (modulo 32768)
+mult: 10 a b c
+  store into <a> the product of <b> and <c> (modulo 32768)
+mod: 11 a b c
+  store into <a> the remainder of <b> divided by <c>
+and: 12 a b c
+  stores into <a> the bitwise and of <b> and <c>
+or: 13 a b c
+  stores into <a> the bitwise or of <b> and <c>
+not: 14 a b
+  stores 15-bit bitwise inverse of <b> in <a>
+rmem: 15 a b
+  read memory at address <b> and write it to <a>
+wmem: 16 a b
+  write the value from <b> into memory at address <a>
+call: 17 a
+  write the address of the next instruction to the stack and jump to <a>
+ret: 18
+  remove the top element from the stack and jump to it; empty stack = halt
+out: 19 a
+  write the character represented by ascii code <a> to the terminal
+in: 20 a
+  read a character from the terminal and write its ascii code to <a>; it can be assumed that once input starts, it will continue until a newline is encountered; this means that you can safely read whole lines from the keyboard and trust that they will be fully read
+noop: 21
+  no operation