A Extension, Reservation Table, and Multi-threading Support

.gitignore

@@ -6,3 +6,10 @@ out
 .classpath
 .project
 examples/riscv
+
+# RARS build
+build/
+rars.jar
+
+# macOS
+.DS_Store

examples/atomic_increment.s

@@ -0,0 +1,15 @@
+.globl main
+.data
+num:
+    .word 0x12345678
+
+.text
+main:
+    la      t0, num
+retry:
+    lr.w    t1, (t0)
+    # increment by 1
+    addi    t1, t1, 1
+    sc.w    t2, t1, (t0)
+    # if save fails; retry operations again
+    bne     zero, t2, retry

src/Settings.properties

@@ -30,4 +30,4 @@ DataSegmentHighlightBackground = 0x0099ccff
 DataSegmentHighlightForeground = 0
 RegisterHighlightBackground = 0x0099cc55
 RegisterHighlightForeground = 0
-
+PerHartExecution = false

src/rars/Globals.java

@@ -2,10 +2,12 @@
 
 import rars.assembler.SymbolTable;
 import rars.riscv.hardware.Memory;
+import rars.riscv.hardware.ReservationTables;
 import rars.riscv.InstructionSet;
 import rars.riscv.SyscallNumberOverride;
 import rars.util.PropertiesFile;
 import rars.venus.VenusUI;
+import rars.venus.GeneralVenusUI;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -60,6 +62,8 @@ public class Globals {
      * the program currently being worked with.  Used by GUI only, not command line.
      **/
     public static RISCVprogram program;
+
+    public static ArrayList<RISCVprogram> gPrograms;
     /**
      * Symbol table for file currently being assembled.
      **/
@@ -68,6 +72,10 @@ public class Globals {
      * Simulated memory component.
      **/
     public static Memory memory;
+    /**
+     * Simulated reservation tables component.
+     **/
+    public static ReservationTables reservationTables;
     /**
      * Lock variable used at head of synchronized block to guard memory and registers
      **/
@@ -140,6 +148,34 @@ public class Globals {
 
     public static boolean runSpeedPanelExists = false;
 
+    private static int harts = 1;
+
+    private static ArrayList<GeneralVenusUI> hartWindows =  new ArrayList<>();
+
+    public static void setHartWindows() {
+        for (int i = 1; i < Globals.getHarts(); i++) {
+            hartWindows.add(new GeneralVenusUI(i - 1));
+        }
+    }
+
+    public static ArrayList<GeneralVenusUI> getHartWindows(){
+        return hartWindows;
+    }
+
+    public static int getHarts() {
+        return harts;
+    }
+
+    public static void setHarts(int i) {
+        if ((harts == 1 && i < 0) || (harts == 7 && i > 0)) {
+            return;
+        } if (i > 0) {
+            reservationTables = new ReservationTables(++harts);
+        } else {
+            reservationTables = new ReservationTables(--harts);
+        }
+    }
+
     private static String getCopyrightYears() {
         return "2003-2019";
     }
@@ -166,7 +202,8 @@ public static Settings getSettings() {
 
     public static void initialize(boolean gui) {
         if (!initialized) {
-            memory = Memory.getInstance();  //clients can use Memory.getInstance instead of Globals.memory
+            memory = Memory.getInstance(); //clients can use Memory.getInstance instead of Globals.memory
+            reservationTables = new ReservationTables(harts);
             symbolTable = new SymbolTable("global");
             settings = new Settings(gui);
             instructionSet = new InstructionSet();

src/rars/Launch.java

@@ -78,6 +78,7 @@ public class Launch {
      * segments are <tt>.text</tt> and <tt>.data</tt>.  Current supported dump formats <br>
      * are <tt>Binary</tt>, <tt>HexText</tt>, <tt>BinaryText</tt>.<br>
      * h  -- display help.  Use by itself and with no filename</br>
+     * harts <n> -- the amount of harts to use for running RARS with<br>
      * hex  -- display memory or register contents in hexadecimal (default)<br>
      * ic  -- display count of basic instructions 'executed'");
      * mc  -- set memory configuration.  Option has 1 argument, e.g.<br>
@@ -384,6 +385,10 @@ private boolean parseCommandArgs(String[] args) {
                 countInstructions = true;
                 continue;
             }
+            if (args[i].toLowerCase().equals("harts")) {
+                Globals.setHarts(Integer.valueOf(args[++i]));
+                continue;
+            }
 
             if (new File(args[i]).exists()) {  // is it a file name?
                 filenameList.add(args[i]);
@@ -713,6 +718,7 @@ private void displayHelp() {
         out.println("            <segment> = " + segments+", or a range like 0x400000-0x10000000");
         out.println("            <format> = " + formats);
         out.println("      h  -- display this help.  Use by itself with no filename.");
+        out.println("  harts <n> -- the amount of harts to use for running RARS with");
         out.println("    hex  -- display memory or register contents in hexadecimal (default)");
         out.println("     ic  -- display count of basic instructions 'executed'");
         out.println("     mc <config>  -- set memory configuration.  Argument <config> is");
@@ -749,5 +755,3 @@ private void displayHelp() {
     }
 
 }
-
-

src/rars/ProgramStatement.java

@@ -65,6 +65,7 @@ public class ProgramStatement implements Comparable<ProgramStatement> {
     private int textAddress;
     private int sourceLine;
     private int binaryStatement;
+    private int currrentHart;
     private boolean altered;
     private static final String invalidOperator = "<INVALID>";
 
@@ -517,6 +518,15 @@ public void setSource(String src) {
         source = src;
     }
 
+    /**
+     * Set the current hart for this program statement.
+     *
+     * @param hart the new current hart
+     */
+    public void setCurrentHart(int hart) {
+        currrentHart = hart;
+    }
+
 
     /**
      * Produces RISCVprogram object representing the source file containing this statement.
@@ -645,6 +655,15 @@ public int[] getOperands() {
         return operands;
     }
 
+    /**
+     * Produces current hart that will simulate this statement.
+     *
+     * @return curent hart.
+     */
+    public int getCurrentHart() {
+        return currrentHart;
+    }
+
     /**
      * Produces operand value from given array position (first operand is position 0).
      *
@@ -873,5 +892,4 @@ private class ListElement {
             }
         }
     }
-
 }

src/rars/RISCVprogram.java

@@ -366,6 +366,10 @@ public void startSimulation(int maxSteps, int[] breakPoints) {
         sim.startSimulation(RegisterFile.getProgramCounter(), maxSteps, breakPoints);
     }
 
+    public void startSimulation(int maxSteps, int[] breakPoints, int hart) {
+        Simulator sim = Simulator.getInstance(hart);
+        sim.startSimulation(RegisterFile.getProgramCounter(hart), maxSteps, breakPoints, hart);
+    }
     /**
      * Instantiates a new {@link MacroPool} and sends reference of this
      * {@link RISCVprogram} to it

src/rars/Settings.java

@@ -153,7 +153,11 @@ public enum Bool {
         /**
          * Flag to determine whether a program uses rv64i instead of rv32i
          */
-        RV64_ENABLED("rv64Enabled", false);;
+        RV64_ENABLED("rv64Enabled", false),
+        /**
+         * Flag to determine if the step buttons should run for all harts or just indivdual hart
+         */
+        PER_HART_EXECUTION("PerHartExecution", false);;
 
         // TODO: add option for turning off user trap handling and interrupts
         private String name;
@@ -1320,4 +1324,4 @@ private int[] getTextSegmentColumnOrder(String stringOfColumnIndexes) {
         return list;
     }
 
-}
+}

src/rars/api/Program.java

@@ -130,6 +130,7 @@ private ErrorList assemble(ArrayList<RISCVprogram> programs) throws AssemblyExce
      */
     public void setup(ArrayList<String> args, String STDIN){
         RegisterFile.resetRegisters();
+        Globals.reservationTables.reset();
         FloatingPointRegisterFile.resetRegisters();
         ControlAndStatusRegisterFile.resetRegisters();
         InterruptController.reset();

src/rars/riscv/BasicInstructionFormat.java

@@ -41,5 +41,5 @@ public enum BasicInstructionFormat {
     S_FORMAT, // 2 src registers + small immediate
     B_FORMAT, // 2 src registers + small immediate shifted left
     U_FORMAT, // 1 dst register  + large immediate
-    J_FORMAT  // 1 dst register  + large immediate for jumping
+    J_FORMAT, // 1 dst register  + large immediate for jumping
 }

src/rars/riscv/InstructionSet.java

@@ -310,6 +310,10 @@ public static void processBranch(int displacement) {
         // Decrement needed because PC has already been incremented
         RegisterFile.setProgramCounter(RegisterFile.getProgramCounter() + displacement - Instruction.INSTRUCTION_LENGTH);
     }
+    public static void processBranch(int displacement, int hart) {
+        // Decrement needed because PC has already been incremented
+        RegisterFile.setProgramCounter(RegisterFile.getProgramCounter(hart) + displacement - Instruction.INSTRUCTION_LENGTH, hart);
+    }
 
    	/*
         * Method to process a jump.  DO NOT USE WITH BRANCH INSTRUCTIONS!
@@ -322,7 +326,9 @@ public static void processBranch(int displacement) {
     public static void processJump(int targetAddress) {
         RegisterFile.setProgramCounter(targetAddress);
     }
-
+    public static void processJump(int targetAddress, int hart) {
+        RegisterFile.setProgramCounter(targetAddress, hart);
+    }
    	/*
         * Method to process storing of a return address in the given
    	 * register.  This is used only by the "and link"
@@ -333,7 +339,9 @@ public static void processJump(int targetAddress) {
     public static void processReturnAddress(int register) {
         RegisterFile.updateRegister(register, RegisterFile.getProgramCounter());
     }
-
+    public static void processReturnAddress(int register, int hart){
+        RegisterFile.updateRegister(register, RegisterFile.getProgramCounter(hart), hart);
+    }
     private static class MatchMap implements Comparable<MatchMap> {
         private int mask;
         private int maskLength; // number of 1 bits in mask
@@ -368,4 +376,3 @@ public BasicInstruction find(int instr) {
         }
     }
 }
-