1.1.0: Added embedded assembler and support for .asm

Author: Pyrix25633

Makefile

@@ -5,7 +5,7 @@ WININCLUDES = -I libs/SDL2/include -I C:/C++ -I libs
 WINCFLAGS = -L libs/SDL2/lib -lSDL2main -lSDL2 -lSDL2_image -L libs/jsoncpp/build-shared -ljsoncpp
 DEBUGFLAGS = -c src/*.cpp -std=c++14 -m64 -g -I include
 RELEASEFLAGS = -c src/*.cpp -std=c++14 -m64 -O3 -I include
-VERSION = 1.0.4
+VERSION = 1.1.0
 NAME = risc-sim
 
 default:

README.txt

@@ -0,0 +1,3 @@
+START: LDWI R0 0008
+       RSH
+       HLT

example_binaries/rsh.asm

@@ -1,10 +1,15 @@
 {
-  "latest": "1.0.4",
+  "latest": "1.1.0",
   "keep": [
     "binaries/",
     "settings/"
   ],
   "releases": [
+    {
+      "tag": "1.1.0",
+      "linux": "risc-sim-1.1.0-linux-x64.tar.gz",
+      "win": "risc-sim-1.1.0-windows-x64.zip"
+    },
     {
       "tag": "1.0.4",
       "linux": "risc-sim-1.0.4-linux-x64.tar.gz",

github-updater.risc-sim.json

@@ -137,7 +137,7 @@ namespace math {
     string StatusRegisterToHexstr(StatusRegister sr);
     /**
      * @brief Function to get the hex string from the Control Bus
-     * @param sr The Control Bus
+     * @param cb The Control Bus
      * @return The hex string
     */
     string ControlBusToHexstr(ControlBus cb);
@@ -147,4 +147,23 @@ namespace math {
      * @returns The twos complement
     */
     Uint16 twosComplement(Uint16 n);
+    /**
+     * @brief Function to get the register from an argument
+     * @param arg The argument
+     * @returns The register
+    */
+    string argumentToRegister(string arg);
+    /**
+     * @brief Function to transform a word into little endian
+     * @param w The word
+     * @returns The little endian string
+    */
+    vector<string> wordToLittleEndian(string w);
+    /**
+     * @brief Function to see if a string is contained in a string vector
+     * @param v The string vector
+     * @param s The string
+     * @returns True if found
+    */
+    bool vectorContains(vector<string> v, string s);
 }

include/math.hpp

@@ -446,8 +446,10 @@ class CentralMemory {
         void reset(Uint32 psize);
         /**
          * @brief Program to load the program
+         * @param interpreterSettings The interpreter settings, type IterpreterSettings
+         * @param logger The logger, type Logger
         */
-        void loadProgram(string path, bool bin, Logger* logger);
+        void loadProgram(InterpreterSettings* settings, Logger* logger);
         /**
          * @brief Function that reads the system bus and operate
         */

include/risc.hpp

@@ -76,7 +76,7 @@ struct WindowSettings {
 struct InterpreterSettings {
     string file;
     Uint32 ramSize, start;
-    bool binary;
+    Uint8 type;
 };
 /**
  * @brief Structure to contain binary interpreter settings

include/utils.hpp

@@ -1,6 +1,6 @@
 {
   "interpreter": {
-    "file": "binary.hex",
+    "file": "rsh.asm",
     "ram_size": 100,
     "start": 0
   },

settings/settings.json

@@ -33,18 +33,19 @@ int main(int argc, char* args[]) {
     bool fullInstruction = false, constantFullInstruction = false, progressBarAll = false;
     Uint8 key; //For keyboard input
 
+    //Capturing cout in log file
+    if(settings.console.log) freopen("log.txt", "w", stdout);
+    logger.setColors(settings.console);
+
     //Interpreter
     SystemBus SB;
     CentralMemory CM(&SB, settings.interpreter.ramSize);
     InputOutputDevices IOD(&SB);
     CentralProcessingUnit CPU(&SB, &CM, &IOD, settings.interpreter);
-    CM.loadProgram(settings.interpreter.file, settings.interpreter.binary, &logger);
+    CM.loadProgram(&settings.interpreter, &logger);
+    CPU.reset(settings.interpreter);
     IOD.input(0x0);
 
-    //Capturing cout in log file
-    if(settings.console.log) freopen("log.txt", "w", stdout);
-    logger.setColors(settings.console);
-
     //SDL and IMG initialization
     cout << logger.getStringTime();
     if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) > 0) {
@@ -63,7 +64,7 @@ int main(int argc, char* args[]) {
     //Printing the settings
     cout << logger.getStringTime() << logger.info << "Settings:" << endl << settings << logger.reset << endl;
     //Render the window
-    RenderWindow window("RISC-CPU SIMULATOR v1.0.4", settings.win.width, settings.win.height,
+    RenderWindow window("RISC-CPU SIMULATOR v1.1.0", settings.win.width, settings.win.height,
                         flags, &logger, &settings, "res/icon-64.png");
     SDL_ShowCursor(0);
 
@@ -390,11 +391,11 @@ int main(int argc, char* args[]) {
                     refresh = true;
                     constantFullInstruction = false;
                     settings = JsonManager::getSettings();
-                    CPU.reset(settings.interpreter);
                     SB = SystemBus();
                     CM.reset(settings.interpreter.ramSize);
                     IOD.reset();
-                    CM.loadProgram(settings.interpreter.file, settings.interpreter.binary, &logger);
+                    CM.loadProgram(&settings.interpreter, &logger);
+                    CPU.reset(settings.interpreter);
                     msStep = 1000 / settings.win.maxFps;
                 }
             }

src/main.cpp

@@ -159,4 +159,24 @@ string math::ControlBusToHexstr(ControlBus cb) {
     s[2] = (cb.W ? 'W' : 'B');
     s[3] = '\0';
     return s;
+}
+
+string math::argumentToRegister(string arg) {
+    if(arg.length() != 2 || arg[0] != 'R') throw(1);
+    return arg.substr(1, 1);
+}
+
+vector<string> math::wordToLittleEndian(string w) {
+    if(w.length() != 4) throw(2);
+    vector<string> v;
+    v.push_back(w.substr(2, 2));
+    v.push_back(w.substr(0, 2));
+    return v;
+}
+
+bool math::vectorContains(vector<string> v, string s) {
+    for(string e : v) {
+        if(e == s) return true;
+    }
+    return false;
 }