parser now acounts for instruction address

Co-authored-by: darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#30

de/darkress/pic16f84sim/Main.java

@@ -2,22 +2,28 @@ package de.darkress.pic16f84sim;
 
 import de.darkress.pic16f84sim.commands.Command;
 import de.darkress.pic16f84sim.decoder.CommandDecoder;
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+import de.darkress.pic16f84sim.parser.Parser;
 
-import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
 
 class Main
 {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
 
-        ArrayList<Command> program = new ArrayList<>();
+        Command[] program = Parser.parser("de/darkress/pic16f84sim/TPicSim101.LST");
-        Memory.workingRegister = 0x01;
+        /*for(int i = 0; i < instructions.size(); i++)
-        Memory.setRegister(0x14, 0xA7); //240 << 224
-        program.add(CommandDecoder.decode(0x1C94));
-        for(int i = 0; i < program.size(); i++)
         {
-            program.get(ProgramCounter.getPc()).execute();
+            program.add(CommandDecoder.decode(instructions.get(i)));
+        }*/
+
+        while(ProgramCounter.getPc() < 1024)
+        {
+            program[ProgramCounter.getPc()].execute();
+            System.out.println(Memory.workingRegister + " " + Cycles.getCycles());
+            System.out.println(Memory.getPCLATH() + " " + Memory.getPCL() + "\n");
         }
     }
 }

de/darkress/pic16f84sim/commands/Addlw.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Addlw extends LiteralCommandUtils implements Command
 
         Memory.workingRegister = result % 256;
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Addwf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -25,5 +26,6 @@ public class Addwf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Andlw.java

@@ -1,6 +1,8 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Andlw extends LiteralCommandUtils implements Command
 {
@@ -18,5 +20,7 @@ public class Andlw extends LiteralCommandUtils implements Command
         checkZeroBit(result);
 
         Memory.workingRegister = result % 256;
+        ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Andwf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Andwf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Bcf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -22,5 +23,6 @@ public class Bcf extends BitOrientedCommandUtils implements Command
 
         Memory.setRegister(address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Bsf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -22,5 +23,6 @@ public class Bsf extends BitOrientedCommandUtils implements Command
 
         Memory.setRegister(address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Btfsc.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -22,8 +23,10 @@ public class Btfsc extends BitOrientedCommandUtils implements Command
         if((result & (1 << bitPlacement)) == 0) //Test if bit is clear
         {
             ProgramCounter.incPC();
+            Cycles.addToCycles(1);
         }
 
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Btfss.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -22,8 +23,10 @@ public class Btfss extends BitOrientedCommandUtils implements Command
         if((result & (1 << bitPlacement)) > 0) //Test if bit is set
         {
             ProgramCounter.incPC();
+            Cycles.addToCycles(1);
         }
 
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Call.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 import de.darkress.pic16f84sim.microcontroller.Stack;
 
@@ -17,5 +18,6 @@ public class Call extends LiteralCommandUtils implements Command
     {
         Stack.push(ProgramCounter.getPc() + 1);
         ProgramCounter.setPcFrom11BitLiteral(literal);
+        Cycles.addToCycles(2);
     }
 }

de/darkress/pic16f84sim/commands/Clrf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Clrf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Clrw.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -14,5 +15,6 @@ public class Clrw extends FileRegisterCommandUtils implements Command
 
         Memory.workingRegister = result;
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Comf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Comf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Decf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Decf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result % 256); // Catch underflow
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Decfsz.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -25,9 +26,10 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
 
         if((result % 256) == 0)
         {
-            Nop nop = new Nop();
+            ProgramCounter.incPC();
-            nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
+            Cycles.addToCycles(1);
         }
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Goto.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Goto extends LiteralCommandUtils implements Command
@@ -15,5 +16,6 @@ public class Goto extends LiteralCommandUtils implements Command
     public void execute()
     {
         ProgramCounter.setPcFrom11BitLiteral(literal);
+        Cycles.addToCycles(2);
     }
 }

de/darkress/pic16f84sim/commands/Incf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Incf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result % 256); // Catch underflow
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Incfsz.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -25,9 +26,10 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
 
         if((result % 256) == 0)
         {
-            Nop nop = new Nop();
+            ProgramCounter.incPC();
-            nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
+            Cycles.addToCycles(1);
         }
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Iorlw.java

@@ -1,6 +1,8 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Iorlw extends LiteralCommandUtils implements Command
 {
@@ -18,5 +20,7 @@ public class Iorlw extends LiteralCommandUtils implements Command
         checkZeroBit(result);
 
         Memory.workingRegister = result % 256;
+        ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Iorwf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Iorwf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Movf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Movf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Movlw.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -17,5 +18,6 @@ public class Movlw extends LiteralCommandUtils implements Command
     {
         Memory.workingRegister = literal;
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Movwf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -21,5 +22,6 @@ public class Movwf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Nop.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Nop extends LiteralCommandUtils implements Command
@@ -10,5 +11,6 @@ public class Nop extends LiteralCommandUtils implements Command
     {
         // Do nothing, just increment the PC
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Retlw.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 import de.darkress.pic16f84sim.microcontroller.Stack;
@@ -18,5 +19,6 @@ public class Retlw extends LiteralCommandUtils implements Command
     {
         Memory.workingRegister = literal;
         ProgramCounter.setPcFromStack(Stack.pop());
+        Cycles.addToCycles(2);
     }
 }

de/darkress/pic16f84sim/commands/Return.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 import de.darkress.pic16f84sim.microcontroller.Stack;
 
@@ -9,5 +10,6 @@ public class Return extends LiteralCommandUtils implements Command
     public void execute()
     {
         ProgramCounter.setPcFromStack(Stack.pop());
+        Cycles.addToCycles(2);
     }
 }

de/darkress/pic16f84sim/commands/Rlf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -31,5 +32,6 @@ public class Rlf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, register);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Rrf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -31,5 +32,6 @@ public class Rrf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, register);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Sublw.java

@@ -1,6 +1,8 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Sublw extends LiteralCommandUtils implements Command
 {
@@ -41,5 +43,7 @@ public class Sublw extends LiteralCommandUtils implements Command
         checkDigitCarryBit(literal);
 
         Memory.workingRegister = result % 256;
+        ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Subwf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -45,5 +46,6 @@ public class Subwf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result % 256);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Swapf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Swapf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Xorlw.java

@@ -1,6 +1,8 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Xorlw extends LiteralCommandUtils implements Command
 {
@@ -18,5 +20,7 @@ public class Xorlw extends LiteralCommandUtils implements Command
         checkZeroBit(result);
 
         Memory.workingRegister = result % 256;
+        ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/commands/Xorwf.java

@@ -1,5 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -23,5 +24,6 @@ public class Xorwf extends FileRegisterCommandUtils implements Command
 
         writeToDestination(destinationBit, address, result);
         ProgramCounter.incPC();
+        Cycles.addToCycles(1);
     }
 }

de/darkress/pic16f84sim/microcontroller/Cycles.java

@@ -0,0 +1,14 @@
+package de.darkress.pic16f84sim.microcontroller;
+
+public class Cycles {
+    private static int cycles = 0;
+
+    public static void addToCycles(int increase)
+    {
+        cycles += increase;
+    }
+
+    public static int getCycles() {
+        return cycles;
+    }
+}

de/darkress/pic16f84sim/parser/Parser.java

@@ -1,5 +1,8 @@
 package de.darkress.pic16f84sim.parser;
 
+import de.darkress.pic16f84sim.commands.Command;
+import de.darkress.pic16f84sim.decoder.CommandDecoder;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -8,9 +11,9 @@ import java.util.Scanner;
 
 public class Parser
 {
-    public static List<Integer> parser(String filePath)
+    public static Command[] parser(String filePath)
     {
-        ArrayList<Integer> program = new ArrayList<>();
+        ArrayList<String> instructions = new ArrayList<>();
         try {
             File file = new File(filePath);
             Scanner scanner = new Scanner(file);
@@ -19,8 +22,10 @@ public class Parser
                 if(!data.startsWith(" "))
                 {
                     String commandAndParametersString = "0x" + data.split(" ")[1];
-                    int commandAndParameters = Integer.decode(commandAndParametersString);
+                    String instructionAddress = "0x" + data.split(" ")[0];
-                    program.add(commandAndParameters);
+                    //int commandAndParameters = Integer.decode(commandAndParametersString);
+                    //program.add(commandAndParameters);
+                    instructions.add(instructionAddress + ", " + commandAndParametersString);
                 }
             }
             scanner.close();
@@ -28,6 +33,16 @@ public class Parser
             System.out.println("An error occurred.");
             e.printStackTrace();
         }
+
+        Command[] program = new Command[1024];
+
+        for(int i = 0; i < instructions.size(); i++)
+        {
+            int instructionAddress = Integer.decode(instructions.get(i).split(", ")[0]);
+            int instruction = Integer.decode(instructions.get(i).split(", ")[1]);
+            program[instructionAddress] = CommandDecoder.decode(instruction);
+        }
+
         return program;
     }
 }