Fixed timer increase

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

de/darkress/pic16f84sim/Main.java

@@ -2,22 +2,29 @@ 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/TestPrograms/TPicSim7.LST");
-        Memory.workingRegister = 0x01;
+
-        Memory.setRegister(0x14, 0xA7); //240 << 224
+        Memory.initMemory();
-        program.add(CommandDecoder.decode(0x1C94));
+
-        for(int i = 0; i < program.size(); i++)
+        while(ProgramCounter.getPc() < 1024)
         {
-            program.get(ProgramCounter.getPc()).execute();
+            System.out.println("Command: " + program[ProgramCounter.getPc()].toString());
+            program[ProgramCounter.getPc()].execute();
+
+            System.out.println(Integer.toHexString(Memory.workingRegister) + " " + Cycles.getCycles());
+            System.out.println(Integer.toHexString(Memory.getOption()) + " " + Integer.toHexString(Memory.getTimer()));
+            System.out.println(Integer.toHexString(Memory.getPCLATH()) + " " + Integer.toHexString(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;
 
@@ -15,6 +16,8 @@ public class Addlw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal + Memory.workingRegister;
 
         checkZeroBit(result);
@@ -22,6 +25,5 @@ public class Addlw extends LiteralCommandUtils implements Command
         checkDigitCarryBit(literal);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,6 +18,8 @@ public class Addwf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address) + Memory.workingRegister;
 
         checkZeroBit(result);
@@ -24,6 +27,5 @@ public class Addwf extends FileRegisterCommandUtils implements Command
         checkDigitCarryBit(address);
 
         writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Andlw.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,11 +15,12 @@ public class Andlw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal & Memory.workingRegister;
 
         checkZeroBit(result);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,11 +18,12 @@ public class Andwf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address) & Memory.workingRegister;
 
         checkZeroBit(result);
 
         writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,10 +18,11 @@ public class Bcf extends BitOrientedCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address);
         result &= ~(1 << bitPlacement); //Mask n-th bit with 0
 
         Memory.setRegister(address, result);
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,10 +18,11 @@ public class Bsf extends BitOrientedCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address);
         result |= (1 << bitPlacement);
 
         Memory.setRegister(address, result);
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,13 +18,14 @@ public class Btfsc extends BitOrientedCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address);
 
         if((result & (1 << bitPlacement)) == 0) //Test if bit is clear
         {
-            ProgramCounter.incPC();
+            Nop nop = new Nop();
-        }
+            nop.execute();
-
+        }
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,13 +18,14 @@ public class Btfss extends BitOrientedCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address);
 
         if((result & (1 << bitPlacement)) > 0) //Test if bit is set
         {
-            ProgramCounter.incPC();
+            Nop nop = new Nop();
-        }
+            nop.execute();
-
+        }
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -15,7 +16,9 @@ public class Call extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
+        Cycles.incCycles();
         Stack.push(ProgramCounter.getPc() + 1);
         ProgramCounter.setPcFrom11BitLiteral(literal);
+        Cycles.incCycles(); //Simulate nop and 2-Cycle instruction
     }
 }

de/darkress/pic16f84sim/commands/Clrf.java

@@ -1,6 +1,6 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Clrf extends FileRegisterCommandUtils implements Command
@@ -17,11 +17,12 @@ public class Clrf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         final int result = 0;
 
         checkZeroBit(result);
 
         writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -8,11 +9,12 @@ public class Clrw extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         final int result = 0;
 
         checkZeroBit(result);
 
         Memory.workingRegister = result;
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,11 +18,12 @@ public class Comf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = 255 - Memory.getRegister(address); // Get inverse of 8Bit value
 
         checkZeroBit(result);
 
         writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,11 +18,12 @@ public class Decf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address) + 255; // Allow underflow
 
         checkZeroBit(result);
 
         writeToDestination(destinationBit, address, result % 256); // Catch underflow
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,6 +18,8 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address) + 255; // Allow underflow
 
         checkZeroBit(result);
@@ -25,8 +28,8 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
 
         if((result % 256) == 0)
         {
-            ProgramCounter.incPC();
+            Nop nop = new Nop();
-        }
+            nop.execute();
-        ProgramCounter.incPC();
+        }
     }
 }

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
@@ -14,6 +15,8 @@ public class Goto extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
+        Cycles.incCycles();
         ProgramCounter.setPcFrom11BitLiteral(literal);
+        Cycles.incCycles();
     }
 }

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;
 
@@ -17,11 +18,12 @@ public class Incf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address) + 1; // Allow underflow
 
         checkZeroBit(result);
 
         writeToDestination(destinationBit, address, result % 256); // Catch underflow
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,6 +18,8 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address) + 1;
 
         checkZeroBit(result);
@@ -25,8 +28,8 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
 
         if((result % 256) == 0)
         {
-            ProgramCounter.incPC();
+            Nop nop = new Nop();
-        }
+            nop.execute();
-        ProgramCounter.incPC();
+        }
     }
 }

de/darkress/pic16f84sim/commands/Iorlw.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,11 +15,12 @@ public class Iorlw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal | Memory.workingRegister;
 
         checkZeroBit(result);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,11 +18,12 @@ public class Iorwf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address) | Memory.workingRegister;
 
         checkZeroBit(result);
 
         writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,11 +18,12 @@ public class Movf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address);
 
         checkZeroBit(result);
 
         writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -15,7 +16,8 @@ public class Movlw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
-        Memory.workingRegister = literal;
         ProgramCounter.incPC();
+        Cycles.incCycles();
+        Memory.workingRegister = literal;
     }
 }

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;
 
@@ -17,9 +18,10 @@ public class Movwf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.workingRegister;
 
         writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
     }
 }

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.incCycles();
     }
 }

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;
@@ -16,7 +17,9 @@ public class Retlw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
+        Cycles.incCycles();
         Memory.workingRegister = literal;
         ProgramCounter.setPcFromStack(Stack.pop());
+        Cycles.incCycles(); // Simulate 2-Cycle Instruction
     }
 }

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;
 
@@ -8,6 +9,8 @@ public class Return extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
+        Cycles.incCycles();
         ProgramCounter.setPcFromStack(Stack.pop());
+        Cycles.incCycles(); // Simulate 2-Cycle Instruction
     }
 }

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;
 
@@ -17,6 +18,8 @@ public class Rlf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int register = Memory.getRegister(address);
         int newCarry = register >>7;
         int oldCarry = Memory.getCarryBit();
@@ -30,6 +33,5 @@ public class Rlf extends FileRegisterCommandUtils implements Command
         }
 
         writeToDestination(destinationBit, address, register);
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,6 +18,8 @@ public class Rrf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int register = Memory.getRegister(address);
         int newCarry = register & 0x01;
         int oldCarry = Memory.getCarryBit();
@@ -30,6 +33,5 @@ public class Rrf extends FileRegisterCommandUtils implements Command
         }
 
         writeToDestination(destinationBit, address, register);
-        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Sublw.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;
 
@@ -35,6 +36,8 @@ public class Sublw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal - Memory.workingRegister + 256;
 
         checkZeroBit(result);
@@ -42,6 +45,5 @@ public class Sublw extends LiteralCommandUtils implements Command
         checkDigitCarryBit(literal);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -37,6 +38,8 @@ public class Subwf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address) - Memory.workingRegister + 256;
 
         checkZeroBit(result);
@@ -44,6 +47,5 @@ public class Subwf extends FileRegisterCommandUtils implements Command
         checkDigitCarryBit(Memory.getRegister(address));
 
         writeToDestination(destinationBit, address, result % 256);
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,11 +18,12 @@ public class Swapf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = (Memory.getRegister(address) <<4) & 0xF0;
         int tmp = Memory.getRegister(address) >>4;
         result += tmp;
 
         writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Xorlw.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,11 +15,12 @@ public class Xorlw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal ^ Memory.workingRegister;
 
         checkZeroBit(result);
 
         Memory.workingRegister = result % 256;
-        ProgramCounter.incPC();
     }
 }

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;
 
@@ -17,11 +18,12 @@ public class Xorwf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = Memory.getRegister(address) ^ Memory.workingRegister;
 
         checkZeroBit(result);
 
         writeToDestination(destinationBit, address, result);
-        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/microcontroller/Cycles.java

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

de/darkress/pic16f84sim/microcontroller/Memory.java

@@ -4,6 +4,13 @@ import java.util.Arrays;
 
 public class Memory
 {
+    public static void initMemory()
+    {
+        Memory.memory[0x81] = 0xFF; //Option
+        Memory.memory[0x85] = 0x1F; //TrisA
+        Memory.memory[0x86] = 0xFF; //TrisB
+        Memory.setRegister(0x03, 0x18); //Status
+    }
     private static final int MEMORY_SIZE = 0xFF;  //Addressable Memory
     public static int workingRegister = 0;
     private static final int[] memory = new int[MEMORY_SIZE];
@@ -47,12 +54,19 @@ public class Memory
             setDataFromIndirectAddress(indirectAddress, data);
             return;
         }
+        if(address == 0x01) //Reset PrescalerCounter if change on Option or Timer Register
+        {
+            Timer.resetTimeToTimerIncrease();
+            Timer.setCyclesToTimerIncrease(Timer.getCyclesToTimerIncrease() - 1); //Decrease by one to account for
+            // this command execution
+        }
         if((Arrays.stream(bank0UniqueSpecialRegister).anyMatch(x -> x == address)) && getRegisterBank() == 0)
         {
             memory[address] = data;
             return;
         }
-        if((Arrays.stream(bank1UniqueSpecialRegister).anyMatch(x -> x == address)) && getRegisterBank() == 1)
+        if((Arrays.stream(bank0UniqueSpecialRegister).anyMatch(x -> x == address)) && getRegisterBank() == 1) //bank0
+            // because of 7 Bit address
         {
             memory[address + 128] = data;
             return;
@@ -72,6 +86,12 @@ public class Memory
 
     private static void setDataFromIndirectAddress(int address, int data)
     {
+        if(address == 0x81 || address == 0x01) //Reset PrescalerCounter if change on Option or Timer Register
+        {
+            Timer.resetTimeToTimerIncrease();
+            Timer.setCyclesToTimerIncrease(Timer.getCyclesToTimerIncrease() - 1); //Decrease by one to account for
+            // this command execution
+        }
         if((Arrays.stream(bank0UniqueSpecialRegister).anyMatch(x -> x == address)) || (Arrays.stream(bank1UniqueSpecialRegister).anyMatch(x -> x == address)))
         {
             memory[address] = data;
@@ -79,10 +99,6 @@ public class Memory
         }
         memory[address % 128] = data; // else: Registers.Registers which are mapped
         memory[address % 128 + 128] = data; //Ensure data is written to both banks to simulate mapping
-        if(address == 0x2) //Check if PCL is destination
-        {
-            ProgramCounter.loadPc();
-        }
     }
 
     private static int getRegisterBank()
@@ -121,6 +137,21 @@ public class Memory
         memory[0x8A] = data & 0x1F;
     }
 
+    public static int getOption()
+    {
+        return memory[0x81];
+    }
+
+    public static int getTimer()
+    {
+        return memory[0x01];
+    }
+
+    public static void setTimer(int data)
+    {
+        memory[0x01] = data;
+    }
+
     public static boolean getZeroBit()
     {
         return (memory[0x03] & 0x04) == 0x04;

de/darkress/pic16f84sim/microcontroller/Timer.java

@@ -0,0 +1,66 @@
+package de.darkress.pic16f84sim.microcontroller;
+
+public class Timer
+{
+    public static int getCyclesToTimerIncrease()
+    {
+        return cyclesToTimerIncrease;
+    }
+
+    public static void setCyclesToTimerIncrease(int cyclesToTimerIncrease)
+    {
+        Timer.cyclesToTimerIncrease = cyclesToTimerIncrease;
+    }
+
+    private static int cyclesToTimerIncrease = 1;
+
+    private static boolean timerEnabled()
+    {
+        return (Memory.getOption() & 0x20) != 0x20;
+    }
+
+    public static void resetTimeToTimerIncrease()
+    {
+        cyclesToTimerIncrease = getPrescalerFactor();
+    }
+
+    private static boolean getPrescalerAsssignment() {
+        return (Memory.getOption() & 0x08) == 0x08;
+    }
+
+    private static int getPrescalerFactor() {
+        final int MULTIPLIER = 2;
+        int prescalerPower = Memory.getOption() & 0x07;
+        int prescaler = (int)Math.pow(2, prescalerPower);
+        if(!getPrescalerAsssignment())
+        {
+            return prescaler * MULTIPLIER;
+        }
+        return prescaler;
+    }
+
+    private static void increaseTimerRegister()
+    {
+        int timerRegister = Memory.getRegister(0x01);
+        timerRegister = (timerRegister + 1) % 256;
+        if(timerRegister == 0) //check for timer Overflow  --> interrupt
+        {
+            System.out.println("Timer Overflow");
+        }
+        Memory.setTimer(timerRegister);
+    }
+
+    public static void increaseTimer()
+    {
+        if(!timerEnabled())
+        {
+            return;
+        }
+        cyclesToTimerIncrease--;
+        if(cyclesToTimerIncrease == 0)
+        {
+            resetTimeToTimerIncrease();
+            increaseTimerRegister();
+        }
+    }
+}

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;
     }
 }