Implemented. Testing and debugging...

Imanol-Mikel Barba Sabariego
1 parent 0f27ef74
Showing 11 changed files with 433 additions and 27 deletions
.idea/synacorvm.iml
CMakeLists.txt
cpu.c
cpu.h
main.c
binary_decoder.c → mem.c
mem.h
binary_decoder.h → registers.c
registers.h
stack.c
stack.h
@@ -4,13 +4,13 @@
     <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$/binary_decoder.c" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/main.c" 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$/main.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/cpu.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$/binary_decoder.h" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/registers.c" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/stack.h" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="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 binary_decoder.c binary_decoder.h registers.h mem.h stack.c stack.h)
+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
@@ -2,15 +2,333 @@
 // Created by imanol on 12/25/16.
 //
+#include <stdlib.h>
 #include "cpu.h"
+void mov(short dst, short src)
+{
+    if(src > MAX_INT)
+    {
+        regs[dst] = regs[src % (MAX_INT+1)];
+    }
+    else
+    {
+        regs[dst] = src;
+    }
+}
+
+void push(short src)
+{
+    if(src > MAX_INT)
+    {
+        stack_push(regs[src % (MAX_INT+1)]);
+    }
+    else
+    {
+        stack_push(src);
+    }
+}
+
+void pop(short dst)
+{
+    short value = stack_pop();
+    if(STACK_FAULT)
+    {
+        fprintf(stderr,"CRITICAL: STACK VIOLATION\n");
+        core_dump();
+    }
+    regs[dst] = value;
+}
+
+void teq(short dst, short a, short b)
+{
+    if(a > MAX_INT)
+    {
+        a = regs[a % (MAX_INT+1)];
+    }
+    if(b > MAX_INT)
+    {
+        b = regs[b % (MAX_INT+1)];
+    }
+    regs[dst % (MAX_INT+1)] = (a == b);
+}
+
+void tgt(short dst, short a, short b)
+{
+    if(a > MAX_INT)
+    {
+        a = regs[a % (MAX_INT+1)];
+    }
+    if(b > MAX_INT)
+    {
+        b = regs[b % (MAX_INT+1)];
+    }
+    regs[dst % (MAX_INT+1)] = (a > b);
+}
+
+void jmp(short dst)
+{
+    if(dst > MAX_INT)
+    {
+        pc = regs[dst % (MAX_INT+1)];
+    }
+    else
+    {
+        pc = dst;
+    }
+}
+
+void jnz(short cond, short dst)
+{
+    if(cond)
+    {
+        jmp(dst);
+    }
+}
+
+void jz(short cond, short dst)
+{
+    if(!cond)
+    {
+        jmp(dst);
+    }
+}
+
+void add(short dst, short a, short b)
+{
+    if(a > MAX_INT)
+    {
+        a = regs[a % (MAX_INT+1)];
+    }
+    if(b > MAX_INT)
+    {
+        b = regs[b % (MAX_INT+1)];
+    }
+    regs[dst % (MAX_INT+1)] = (a + b) % (MAX_INT+1);
+}
+
+void mult(short dst, short a, short b)
+{
+    if(a > MAX_INT)
+    {
+        a = regs[a % (MAX_INT+1)];
+    }
+    if(b > MAX_INT)
+    {
+        b = regs[b % (MAX_INT+1)];
+    }
+    regs[dst % (MAX_INT+1)] = (a * b) % (MAX_INT+1);
+}
+
+void mod(short dst, short a, short b)
+{
+    if(a > MAX_INT)
+    {
+        a = regs[a % (MAX_INT+1)];
+    }
+    if(b > MAX_INT)
+    {
+        b = regs[b % (MAX_INT+1)];
+    }
+    regs[dst % (MAX_INT+1)] = (a % b);
+}
+
+void and(short dst, short a, short b)
+{
+    if(a > MAX_INT)
+    {
+        a = regs[a % (MAX_INT+1)];
+    }
+    if(b > MAX_INT)
+    {
+        b = regs[b % (MAX_INT+1)];
+    }
+    regs[dst % (MAX_INT+1)] = (a & b);
+}
+
+void or(short dst, short a, short b)
+{
+    if(a > MAX_INT)
+    {
+        a = regs[a % (MAX_INT+1)];
+    }
+    if(b > MAX_INT)
+    {
+        b = regs[b % (MAX_INT+1)];
+    }
+    regs[dst % (MAX_INT+1)] = (a | b);
+}
+
+void not(short dst, short src)
+{
+    if(src > MAX_INT)
+    {
+        src = regs[src % (MAX_INT+1)];
+    }
+    regs[dst % (MAX_INT+1)] = ~src & 0x7FFF;
+}
+
+void load(short src, short dst)
+{
+    if(src > MAX_INT)
+    {
+        src = regs[src % (MAX_INT+1)];
+    }
+    regs[dst % (MAX_INT+1)] = src;
+}
+
+void stor(short dst, short src)
+{
+    if(src > MAX_INT)
+    {
+        src = regs[src % (MAX_INT+1)];
+    }
+    if(dst > MAX_INT)
+    {
+        mem[regs[dst % (MAX_INT+1)]] = src;
+    }
+    else
+    {
+        mem[dst] = src;
+    }
+}
+
+void call(short dst)
+{
+    stack_push(pc);
+    jmp(dst);
+}
+
+uint8_t ret()
+{
+    pc = stack_pop();
+    return STACK_FAULT;
+}
+
+void out(unsigned char a)
+{
+    putchar(a);
+}
+
+void in(short dst)
+{
+    int c = getchar();
+    regs[dst] = (short)c;
+}
+
 void nop()
 {
     return;
 }
-void out(unsigned char a)
+void start_execution()
 {
-    printf("%c",a);
+    for(;;)
+    {
+        short opcode = mem[pc++];
+        switch(opcode)
+        {
+            case HALT:
+                return;
+            case MOV:
+                mov(mem[pc],mem[pc+1]);
+                pc += 2;
+                break;
+            case PUSH:
+                push(mem[pc++]);
+                break;
+            case POP:
+                pop(mem[pc++]);
+                break;
+            case TEQ:
+                teq(mem[pc],mem[pc+1],mem[pc+2]);
+                pc += 3;
+                break;
+            case TGT:
+                tgt(mem[pc],mem[pc+1],mem[pc+2]);
+                pc += 3;
+                break;
+            case JMP:
+                jmp(mem[pc++]);
+                break;
+            case JNZ:
+                jnz(mem[pc],mem[pc+1]);
+                pc += 2;
+                break;
+            case JZ:
+                jz(mem[pc],mem[pc+1]);
+                pc += 2;
+                break;
+            case ADD:
+                add(mem[pc],mem[pc+1],mem[pc+2]);
+                pc += 3;
+                break;
+            case MULT:
+                mult(mem[pc],mem[pc+1],mem[pc+2]);
+                pc += 3;
+                break;
+            case MOD:
+                mod(mem[pc],mem[pc+1],mem[pc+2]);
+                pc += 3;
+                break;
+            case AND:
+                and(mem[pc],mem[pc+1],mem[pc+2]);
+                pc += 3;
+                break;
+            case OR:
+                or(mem[pc],mem[pc+1],mem[pc+2]);
+                pc += 3;
+                break;
+            case NOT:
+                not(mem[pc],mem[pc+1]);
+                pc += 2;
+                break;
+            case LOAD:
+                load(mem[pc],mem[pc+1]);
+                pc += 2;
+                break;
+            case STOR:
+                stor(mem[pc],mem[pc+1]);
+                pc += 2;
+                break;
+            case CALL:
+                call(mem[pc++]);
+                break;
+            case RET:
+                if(ret())
+                {
+                    return;
+                }
+                break;
+            case OUT:
+                out((unsigned char)mem[pc++]);
+                break;
+            case IN:
+                in(mem[pc++]);
+                break;
+            case NOP:
+                nop();
+                break;
+            default:
+                fprintf(stderr,"CRITICAL: UNKNOWN OPCODE %2x FOUND IN %2x\n",opcode,pc);
+                core_dump();
+                break;
+        }
+    }
 }
+void core_dump()
+{
+    fprintf(stderr,"r0: %2x\n",regs[0]);
+    fprintf(stderr,"r1: %2x\n",regs[1]);
+    fprintf(stderr,"r2: %2x\n",regs[2]);
+    fprintf(stderr,"r3: %2x\n",regs[3]);
+    fprintf(stderr,"r4: %2x\n",regs[4]);
+    fprintf(stderr,"r5: %2x\n",regs[5]);
+    fprintf(stderr,"r6: %2x\n",regs[6]);
+    fprintf(stderr,"r7: %2x\n",regs[7]);
+    fprintf(stderr,"pc: %2x\n",pc);
+    //dump memory to file
+    //dump stack to file
+    exit(1);
+}
 \ No newline at end of file
@@ -6,5 +6,37 @@
 #define SYNACORVM_CPU_H
 #include <stdio.h>
+#include "mem.h"
+#include "stack.h"
+#include "registers.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 start_execution();
+void core_dump();
 #endif //SYNACORVM_CPU_H
 #include <stdio.h>
+#include <string.h>
+#include "mem.h"
+#include "stack.h"
+
+void load_program(const char* path)
+{
+    FILE *fp = fopen(path,"r");
+    fseek(fp, 0L, SEEK_END);
+    long file_size = ftell(fp);
+    rewind(fp);
+    fread(mem,1,(size_t)file_size,fp);
+    fclose(fp);
+}
 int main(int argc, char** argv)
 {
+    if(argc != 2)
+    {
+        printf("Invalid argument\n\n");
+        printf(argv[0]);
+        printf(" path_to_binary\n");
+        return 1;
+    }
+    initialize_stack();
+    memset(regs,0x00,sizeof(short)*NUM_REGISTERS);
+    memset(mem,0x00,sizeof(short)*MEMSIZE);
+    load_program(argv[1]);
+    start_execution();
+    free_stack();
     return 0;
 }
 \ No newline at end of file
@@ -2,4 +2,6 @@
 // Created by imanol on 12/25/16.
 //
-#include "binary_decoder.h"
+#include "mem.h"
+
+short mem[MEMSIZE];
 \ No newline at end of file
@@ -5,6 +5,8 @@
 #ifndef SYNACORVM_MEM_H
 #define SYNACORVM_MEM_H
-short mem[32768]; //64KiB RAM
+#define MEMSIZE 32768
+
+extern short mem[MEMSIZE]; //64KiB RAM
 #endif //SYNACORVM_MEM_H
@@ -2,7 +2,7 @@
 // Created by imanol on 12/25/16.
 //
-#ifndef SYNACORVM_BINARY_DECODER_H
-#define SYNACORVM_BINARY_DECODER_H
+#include "registers.h"
-#endif //SYNACORVM_BINARY_DECODER_H
+short regs[NUM_REGISTERS];
+short pc = 0;
 \ No newline at end of file
@@ -5,15 +5,9 @@
 #ifndef SYNACORVM_REGISTERS_H
 #define SYNACORVM_REGISTERS_H
-short r0 = 0;
-short r1 = 0;
-short r2 = 0;
-short r3 = 0;
-short r4 = 0;
-short r5 = 0;
-short r6 = 0;
-short r7 = 0;
+#define NUM_REGISTERS 8
-short pc = 0;
+extern short regs[NUM_REGISTERS];
+extern short pc;
 #endif //SYNACORVM_REGISTERS_H
@@ -7,6 +7,7 @@
 #define EXTEND_SIZE 10
+uint8_t STACK_FAULT = 0;
 uint32_t stack_size = EXTEND_SIZE;
 uint32_t stack_pos = 0;
 short *stack;
@@ -16,19 +17,39 @@ void initialize_stack()
     stack = calloc(EXTEND_SIZE,sizeof(short));
 }
+void free_stack()
+{
+    free(stack);
+    stack_size = 0;
+    stack_pos = 0;
+    stack = NULL;
+}
+
 void extend_stack()
 {
     stack_size += EXTEND_SIZE;
-    realloc(stack,stack_size*sizeof(short));
+    void *new_ptr = realloc(stack,stack_size*sizeof(short));
+    if(new_ptr == NULL)
+    {
+        fprintf(stderr,"CRITICAL: STACK ALLOCATION ERROR\n");
+        core_dump();
+    }
+    stack = new_ptr;
 }
 void shrink_stack()
 {
     stack_size -= EXTEND_SIZE;
-    realloc(stack,stack_size*sizeof(short));
+    void *new_ptr = realloc(stack,stack_size*sizeof(short));
+    if(new_ptr == NULL)
+    {
+        fprintf(stderr,"CRITICAL: STACK ALLOCATION ERROR\n");
+        core_dump();
+    }
+    stack = new_ptr;
 }
-void push(short value)
+void stack_push(short value)
 {
     stack[stack_pos++] = value;
     if(stack_pos == stack_size-1)
@@ -36,12 +57,19 @@ void push(short value)
         extend_stack();
     }
 }
-short pop()
+
+short stack_pop()
 {
+    if(!stack_pos)
+    {
+        STACK_FAULT = 1;
+        return -1;
+    }
     short value = stack[stack_pos--];
     if(stack_size - stack_pos == 2*EXTEND_SIZE)
     {
         shrink_stack();
     }
     return value;
-}
 \ No newline at end of file
+}
+
@@ -6,9 +6,13 @@
 #define SYNACORVM_STACK_H
 #include <stdint.h>
+#include "cpu.h"
+
+extern uint8_t STACK_FAULT;
 void initialize_stack();
-void push(short value);
-short pop();
+void free_stack();
+void stack_push(short value);
+short stack_pop();
 #endif //SYNACORVM_STACK_H