From bea0edfd10340eea0d759053bcf4188b4d7338ce Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <giulio@depasquale.eu>
Date: Sun, 14 May 2017 14:06:17 +0200
Subject: [PATCH] Divise le classi, boilerplate

---
 cpp/a.out          | Bin 8552 -> 0 bytes
 cpp/debug.h        |  57 +++++++++++++++++-----------------
 cpp/emulator.cpp   |  38 +++++++++++------------
 cpp/instructions.h |  41 -------------------------
 cpp/vm.cpp         |  74 +++++++++++++++++++++++++++++++++++++++------
 cpp/vm.h           |  53 ++++++++++++++++++++++++++------
 6 files changed, 156 insertions(+), 107 deletions(-)
 delete mode 100755 cpp/a.out
 delete mode 100644 cpp/instructions.h

diff --git a/cpp/a.out b/cpp/a.out
deleted file mode 100755
index 2d21ebd3da6b9692e94187ae597da1cd70a92494..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8552
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
F0Ra5%dM^L~

diff --git a/cpp/debug.h b/cpp/debug.h
index c21572b..381411a 100644
--- a/cpp/debug.h
+++ b/cpp/debug.h
@@ -1,32 +1,33 @@
 #ifndef DBG_H
 #define DBG_H
+#include <stdio.h>
+
+#if DBG
+#define DBG_INFO(_x_)                                                          \
+  do {                                                                         \
+    printf("\t[*] ");                                                          \
+    printf _x_;                                                                \
+  } while (0)
+#define DBG_WARN(_x_)                                                          \
+  do {                                                                         \
+    printf("[!] ");                                                            \
+    printf _x_;                                                                \
+  } while (0)
+#define DBG_ERROR(_x_)                                                         \
+  do {                                                                         \
+    printf("[-] ");                                                            \
+    printf _x_;                                                                \
+  } while (0)
+#define DBG_SUCC(_x_)                                                          \
+  do {                                                                         \
+    printf("[+] ");                                                            \
+    printf _x_;                                                                \
+  } while (0)
+#else
+#define DBG_INFO(_x_)
+#define DBG_WARN(_x_)
+#define DBG_ERROR(_x_)
+#define DBG_SUCC(_x_)
+#endif
 
-    #if DBG
-    #define DBG_INFO(_x_)                                                          \
-    do {                                                                         \
-        printf("\t[*] ");                                                          \
-        printf _x_;                                                                \
-    } while (0)
-    #define DBG_WARN(_x_)                                                          \
-    do {                                                                         \
-        printf("[!] ");                                                            \
-        printf _x_;                                                                \
-    } while (0)
-    #define DBG_ERROR(_x_)                                                         \
-    do {                                                                         \
-        printf("[-] ");                                                            \
-        printf _x_;                                                                \
-    } while (0)
-    #define DBG_SUCC(_x_)                                                          \
-    do {                                                                         \
-        printf("[+] ");                                                            \
-        printf _x_;                                                                \
-    } while (0)
-    #else
-    #define DBG_INFO(_x_)
-    #define DBG_WARN(_x_)
-    #define DBG_ERROR(_x_)
-    #define DBG_SUCC(_x_)
-    #endif
-    
 #endif
\ No newline at end of file
diff --git a/cpp/emulator.cpp b/cpp/emulator.cpp
index 75f045d..7aed252 100644
--- a/cpp/emulator.cpp
+++ b/cpp/emulator.cpp
@@ -1,26 +1,26 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <fstream>
-#include "instructions.h"
-#include "vm.h"
 #include "debug.h"
+#include "vm.h"
+#include <fstream>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 using namespace std;
 
 int main() {
-    ifstream vmbytecode;
-    VM * vm;
-    uint8_t * data;
+  ifstream vmbytecode;
+  VM vm;
+  uint8_t *data;
 
-    
-    /*
-    if (vmbytecode != NULL) {
-        fread()        
-    } else {
-        fprintf(stderr, "Couldn't open bytecode!\n");
-        return 1;
-    }
-    */
-    return 0;
+  vm.status();
+  // vm.status();
+  /*
+  if (vmbytecode != NULL) {
+      fread()
+  } else {
+      fprintf(stderr, "Couldn't open bytecode!\n");
+      return 1;
+  }
+  */
+  return 0;
 }
\ No newline at end of file
diff --git a/cpp/instructions.h b/cpp/instructions.h
deleted file mode 100644
index 0303886..0000000
--- a/cpp/instructions.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "vm.h"
-#ifndef INS_H
-#define INS_H
-enum regs {
-    R0,
-	R1,
-	R2,
-	R3,
-	S0,
-	S1,
-	S2,
-	S3,
-	IP,
-	BP,
-	SP
-};
-
-enum ins {
-    MOVI,
-    MOVR,
-    MOVM,
-    ADDI,
-    ADDR,
-    ADDM,
-    SUBI,
-    SUBR,
-    SUBM,
-    XORI,
-    XORR,
-    XORM,
-    MULI,
-    MULR,
-    MULM,
-    DIVI,
-    DIVR,
-    DIVM,
-    HALT,
-    NOPE
-};
-
-#endif
\ No newline at end of file
diff --git a/cpp/vm.cpp b/cpp/vm.cpp
index daf23ad..2ec5f0e 100644
--- a/cpp/vm.cpp
+++ b/cpp/vm.cpp
@@ -1,15 +1,71 @@
-#include "vm.hh"
+#include "vm.h"
 #include "debug.h"
+#include "vmas.h"
+#include <string.h>
 
-void VM::VM(void) {
-    DBG_INFO(("Creating VM without code.\n"));
+VM::VM() {
+  DBG_INFO(("Creating VM without code.\n"));
+  init_regs();
 }
 
-void VM::VM(uint8_t * code, uint32_t codesize) {
-    DBG_INFO(("Creating VM with code.\n"));
-    memcpy(&vm.as.code, code, codesize);
+VM::VM(uint8_t *code, uint32_t codesize) {
+  DBG_INFO(("Creating VM with code.\n"));
+  init_regs();
+  as.insCode(code, codesize);
 }
 
-void VM::run(uint8_t * code) {
-    return;
-}
\ No newline at end of file
+void VM::init_regs(void) {
+  uint8_t i;
+
+  for (i = R0; i <= SP; i++) {
+    this->regs[i] = 0;
+  }
+  return;
+}
+
+void VM::status(void) {
+  uint8_t i;
+  DBG_INFO(("VM Status:\n"));
+  DBG_INFO(("~~~~~~~~~~\n"));
+  for (i = R0; i <= SP; i++) {
+    switch (i) {
+    case R0:
+      DBG_INFO(("R0:\t0x%x\n", this->regs[i]));
+      break;
+    case R1:
+      DBG_INFO(("R1:\t0x%x\n", this->regs[i]));
+      break;
+    case R2:
+      DBG_INFO(("R2:\t0x%x\n", this->regs[i]));
+      break;
+    case R3:
+      DBG_INFO(("R3:\t0x%x\n", this->regs[i]));
+      break;
+    case S0:
+      DBG_INFO(("S0:\t0x%x\n", this->regs[i]));
+      break;
+    case S1:
+      DBG_INFO(("S1:\t0x%x\n", this->regs[i]));
+      break;
+    case S2:
+      DBG_INFO(("S2:\t0x%x\n", this->regs[i]));
+      break;
+    case S3:
+      DBG_INFO(("S3:\t0x%x\n", this->regs[i]));
+      break;
+    case IP:
+      DBG_INFO(("IP:\t0x%x\n", this->regs[i]));
+      break;
+    case BP:
+      DBG_INFO(("BP:\t0x%x\n", this->regs[i]));
+      break;
+    case SP:
+      DBG_INFO(("SP:\t0x%x\n", this->regs[i]));
+      break;
+    }
+  }
+  DBG_INFO(("~~~~~~~~~~\n"));
+  return;
+}
+
+void VM::run(uint8_t *code) { return; }
\ No newline at end of file
diff --git a/cpp/vm.h b/cpp/vm.h
index 1bfdd35..0316583 100644
--- a/cpp/vm.h
+++ b/cpp/vm.h
@@ -1,20 +1,53 @@
 #ifndef VM_H
 #define VM_H
+#include <stdint.h>
+#include "vmas.h"
 
-class VMAddrSpace {
-    uint8_t stack[0x100], code[0x300], data[0x500];
+enum regs { R0, R1, R2, R3, S0, S1, S2, S3, IP, BP, SP };
+
+enum ins {
+  MOVI,
+  MOVR,
+  MOVM,
+  ADDI,
+  ADDR,
+  ADDM,
+  SUBI,
+  SUBR,
+  SUBM,
+  XORI,
+  XORR,
+  XORM,
+  NOTI,
+  NOTR,
+  NOTM,
+  MULI,
+  MULR,
+  MULM,
+  DIVI,
+  DIVR,
+  DIVM,
+  PUSH,
+  POOP,
+  CALL,
+  HALT,
+  NOPE
 };
 
 class VM {
-    uint16_t regs[0xb];
-    struct flags {
-        uint8_t zf:1;
-        uint8_t cf:1;
-    };
-    VMAddrSpace as;
+  uint16_t regs[0xb];
+  struct flags {
+    uint8_t zf : 1;
+    uint8_t cf : 1;
+  };
+  VMAddrSpace as;
 
-    public:
-        void run(uint8_t * code);
+public:
+  VM();
+  VM(uint8_t *code, uint32_t codesize);
+  void init_regs(void);
+  void status(void);
+  void run(uint8_t *code);
 };
 
 #endif
\ No newline at end of file