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,17 +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 java.util.ArrayList;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+import de.darkress.pic16f84sim.parser.Parser;
+
+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<>();
-        Memory.workingRegister = 0xAA;
-        int input1 = 0x3AFF;
-        program.add(CommandDecoder.decode(input1));
-        program.get(0).execute();
 
+        Command[] program = Parser.parser("de/darkress/pic16f84sim/TestPrograms/TPicSim7.LST");
+
+        Memory.initMemory();
+
+        while(ProgramCounter.getPc() < 1024)
+        {
+            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,8 +1,10 @@
 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 Addlw extends CommandUtils implements Command
+public class Addlw extends LiteralCommandUtils implements Command
 {
     private final int literal;
 
@@ -14,6 +16,8 @@ public class Addlw extends CommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal + Memory.workingRegister;
 
         checkZeroBit(result);

de/darkress/pic16f84sim/commands/Addwf.java

@@ -0,0 +1,31 @@
+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 Addwf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Addwf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int result = Memory.getRegister(address) + Memory.workingRegister;
+
+        checkZeroBit(result);
+        checkCarryBit(result);
+        checkDigitCarryBit(address);
+
+        writeToDestination(destinationBit, address, result);
+    }
+}

de/darkress/pic16f84sim/commands/Andlw.java

@@ -1,8 +1,10 @@
 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 CommandUtils implements Command
+public class Andlw extends LiteralCommandUtils implements Command
 {
     private final int literal;
 
@@ -13,6 +15,8 @@ public class Andlw extends CommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal & Memory.workingRegister;
 
         checkZeroBit(result);

de/darkress/pic16f84sim/commands/Andwf.java

@@ -0,0 +1,29 @@
+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 Andwf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Andwf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int result = Memory.getRegister(address) & Memory.workingRegister;
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result);
+    }
+}

de/darkress/pic16f84sim/commands/Bcf.java

@@ -0,0 +1,28 @@
+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 Bcf extends BitOrientedCommandUtils implements Command
+{
+    private final int address;
+    private int bitPlacement;
+
+    public Bcf(int input)
+    {
+        address = input & 0x007F;
+        bitPlacement = checkBitPlacement(input);
+    }
+
+    @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);
+    }
+}

de/darkress/pic16f84sim/commands/BitOrientedCommandUtils.java

@@ -0,0 +1,11 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Memory;
+
+public class BitOrientedCommandUtils
+{
+    protected int checkBitPlacement(int input)
+    {
+        return ((input & 0x0380) >>7);
+    }
+}

de/darkress/pic16f84sim/commands/Bsf.java

@@ -0,0 +1,28 @@
+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 Bsf extends BitOrientedCommandUtils implements Command
+{
+    private final int address;
+    private int bitPlacement;
+
+    public Bsf(int input)
+    {
+        address = input & 0x007F;
+        bitPlacement = checkBitPlacement(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int result = Memory.getRegister(address);
+        result |= (1 << bitPlacement);
+
+        Memory.setRegister(address, result);
+    }
+}

de/darkress/pic16f84sim/commands/Btfsc.java

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

de/darkress/pic16f84sim/commands/Btfss.java

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

de/darkress/pic16f84sim/commands/Call.java

@@ -0,0 +1,24 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Cycles;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+import de.darkress.pic16f84sim.microcontroller.Stack;
+
+public class Call extends LiteralCommandUtils implements Command
+{
+    private final int literal;
+
+    public Call(int input)
+    {
+        literal = input & 0x07FF;
+    }
+
+    @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

@@ -0,0 +1,28 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Cycles;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+
+public class Clrf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Clrf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = true;
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        final int result = 0;
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result);
+    }
+}

de/darkress/pic16f84sim/commands/Clrw.java

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

de/darkress/pic16f84sim/commands/Comf.java

@@ -0,0 +1,29 @@
+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 Comf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Comf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @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);
+    }
+}

de/darkress/pic16f84sim/commands/Decf.java

@@ -0,0 +1,29 @@
+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 Decf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Decf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @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
+    }
+}

de/darkress/pic16f84sim/commands/Decfsz.java

@@ -0,0 +1,35 @@
+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 Decfsz extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Decfsz(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @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
+
+        if((result % 256) == 0)
+        {
+            Nop nop = new Nop();
+            nop.execute();
+        }
+    }
+}

de/darkress/pic16f84sim/commands/FileRegisterCommandUtils.java

@@ -0,0 +1,51 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Memory;
+
+public class FileRegisterCommandUtils
+{
+    protected void checkZeroBit(int result)
+    {
+        if((result % 256) == 0){
+            Memory.setZeroBit();
+        } else{
+            Memory.clearZeroBit();
+        }
+    }
+
+    protected void checkCarryBit(int result)
+    {
+        if(result > 255){
+            Memory.setCarryBit();
+        } else{
+            Memory.clearCarryBit();
+        }
+    }
+
+    protected void checkDigitCarryBit(int address)
+    {
+        int literal = Memory.getRegister(address);
+        if(((Memory.workingRegister & 0x0F) + (literal & 0x0F)) > 15){
+            Memory.setDigitCarryBit();
+        } else{
+            Memory.clearDigitCarryBit();
+        }
+    }
+
+    protected void writeToDestination(boolean destinationBit, int fileAddress, int result)
+    {
+        if(destinationBit)
+        {
+            //Store in FileRegister
+            Memory.setRegister(fileAddress, result);
+        } else {
+            //Store in WRegister
+            Memory.workingRegister = result;
+        }
+    }
+
+    protected boolean checkDestinationBit(int input)
+    {
+        return (input & 0x0080) == 0x0080;
+    }
+}

de/darkress/pic16f84sim/commands/Goto.java

@@ -0,0 +1,22 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Cycles;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+
+public class Goto extends LiteralCommandUtils implements Command
+{
+    private final int literal;
+
+    public Goto(int input)
+    {
+        literal = input & 0x07FF;
+    }
+
+    @Override
+    public void execute()
+    {
+        Cycles.incCycles();
+        ProgramCounter.setPcFrom11BitLiteral(literal);
+        Cycles.incCycles();
+    }
+}

de/darkress/pic16f84sim/commands/Incf.java

@@ -0,0 +1,29 @@
+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 Incf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Incf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @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
+    }
+}

de/darkress/pic16f84sim/commands/Incfsz.java

@@ -0,0 +1,35 @@
+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 Incfsz extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Incfsz(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int result = Memory.getRegister(address) + 1;
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result % 256);
+
+        if((result % 256) == 0)
+        {
+            Nop nop = new Nop();
+            nop.execute();
+        }
+    }
+}

de/darkress/pic16f84sim/commands/Iorlw.java

@@ -1,8 +1,10 @@
 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 CommandUtils implements Command
+public class Iorlw extends LiteralCommandUtils implements Command
 {
     private final int literal;
 
@@ -13,6 +15,8 @@ public class Iorlw extends CommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal | Memory.workingRegister;
 
         checkZeroBit(result);

de/darkress/pic16f84sim/commands/Iorwf.java

@@ -0,0 +1,29 @@
+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 Iorwf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Iorwf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int result = Memory.getRegister(address) | Memory.workingRegister;
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result);
+    }
+}

de/darkress/pic16f84sim/commands/LiteralCommandUtils.java

@@ -2,7 +2,7 @@ package de.darkress.pic16f84sim.commands;
 
 import de.darkress.pic16f84sim.microcontroller.Memory;
 
-public class CommandUtils
+public class LiteralCommandUtils
 {
     protected void checkZeroBit(int result)
     {

de/darkress/pic16f84sim/commands/Movf.java

@@ -0,0 +1,29 @@
+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 Movf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Movf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int result = Memory.getRegister(address);
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result);
+    }
+}

de/darkress/pic16f84sim/commands/Movlw.java

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

de/darkress/pic16f84sim/commands/Movwf.java

@@ -0,0 +1,27 @@
+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 Movwf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Movwf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = true;
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int result = Memory.workingRegister;
+
+        writeToDestination(destinationBit, address, result);
+    }
+}

de/darkress/pic16f84sim/commands/Nop.java

@@ -0,0 +1,16 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Cycles;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+
+public class Nop extends LiteralCommandUtils implements Command
+{
+
+    @Override
+    public void execute()
+    {
+        // Do nothing, just increment the PC
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+    }
+}

de/darkress/pic16f84sim/commands/Retlw.java

@@ -0,0 +1,25 @@
+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;
+
+public class Retlw extends LiteralCommandUtils implements Command
+{
+    private final int literal;
+
+    public Retlw(int input)
+    {
+        literal = input & 0x00FF;
+    }
+
+    @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

@@ -0,0 +1,16 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Cycles;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+import de.darkress.pic16f84sim.microcontroller.Stack;
+
+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

@@ -0,0 +1,37 @@
+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 Rlf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Rlf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int register = Memory.getRegister(address);
+        int newCarry = register >>7;
+        int oldCarry = Memory.getCarryBit();
+        register = ((register <<1) + oldCarry) & 0xFF;
+
+        if(newCarry == 1)
+        {
+            Memory.setCarryBit();
+        } else if(newCarry == 0){
+            Memory.clearCarryBit();
+        }
+
+        writeToDestination(destinationBit, address, register);
+    }
+}

de/darkress/pic16f84sim/commands/Rrf.java

@@ -0,0 +1,37 @@
+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 Rrf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Rrf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int register = Memory.getRegister(address);
+        int newCarry = register & 0x01;
+        int oldCarry = Memory.getCarryBit();
+        register = (oldCarry << 7) + (register >>1);
+
+        if(newCarry == 1)
+        {
+            Memory.setCarryBit();
+        } else if(newCarry == 0){
+            Memory.clearCarryBit();
+        }
+
+        writeToDestination(destinationBit, address, register);
+    }
+}

de/darkress/pic16f84sim/commands/Sublw.java

@@ -1,8 +1,10 @@
 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 CommandUtils implements Command
+public class Sublw extends LiteralCommandUtils implements Command
 {
     private final int literal;
 
@@ -34,6 +36,8 @@ public class Sublw extends CommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal - Memory.workingRegister + 256;
 
         checkZeroBit(result);

de/darkress/pic16f84sim/commands/Subwf.java

@@ -0,0 +1,51 @@
+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 Subwf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Subwf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    protected void checkCarryBit(int result)
+    {
+        if(result <= 255){
+            Memory.clearCarryBit();
+        } else{
+            Memory.setCarryBit();
+        }
+    }
+
+    @Override
+    protected void checkDigitCarryBit(int literal)
+    {
+        if(((literal & 0x0F) - (Memory.workingRegister & 0x0F)) < 0){
+            Memory.clearDigitCarryBit();
+        } else{
+            Memory.setDigitCarryBit();
+        }
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int result = Memory.getRegister(address) - Memory.workingRegister + 256;
+
+        checkZeroBit(result);
+        checkCarryBit(result);
+        checkDigitCarryBit(Memory.getRegister(address));
+
+        writeToDestination(destinationBit, address, result % 256);
+    }
+}

de/darkress/pic16f84sim/commands/Swapf.java

@@ -0,0 +1,29 @@
+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 Swapf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Swapf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @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);
+    }
+}

de/darkress/pic16f84sim/commands/Xorlw.java

@@ -1,8 +1,10 @@
 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 CommandUtils implements Command
+public class Xorlw extends LiteralCommandUtils implements Command
 {
     private final int literal;
 
@@ -13,6 +15,8 @@ public class Xorlw extends CommandUtils implements Command
     @Override
     public void execute()
     {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
         int result = literal ^ Memory.workingRegister;
 
         checkZeroBit(result);

de/darkress/pic16f84sim/commands/Xorwf.java

@@ -0,0 +1,29 @@
+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 Xorwf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Xorwf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        ProgramCounter.incPC();
+        Cycles.incCycles();
+        int result = Memory.getRegister(address) ^ Memory.workingRegister;
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result);
+    }
+}

de/darkress/pic16f84sim/decoder/CommandDecoder.java

@@ -9,47 +9,33 @@ public class CommandDecoder
         switch(input & 0x3F00)
         {
             case 0x700:
-                //addwf();
+                return new Addwf(input);
-                break;
             case 0x500:
-                //andwf();
+                return new Andwf(input);
-                break;
             case 0x900:
-                //comf();
+                return new Comf(input);
-                break;
             case 0x300:
-                //decf();
+                return new Decf(input);
-                break;
             case 0xB00:
-                //decfsz();
+                return new Decfsz(input);
-                break;
             case 0xA00:
-                //incf();
+                return new Incf(input);
-                break;
             case 0xF00:
-                //incfsz();
+                return new Incfsz(input);
-                break;
             case 0x400:
-                //iorwf();
+                return new Iorwf(input);
-                break;
             case 0x800:
-                //movf();
+                return new Movf(input);
-                break;
             case 0xD00:
-                //rlf();
+                return new Rlf(input);
-                break;
             case 0xC00:
-                //rrf();
+                return new Rrf(input);
-                break;
             case 0x200:
-                //subwf();
+                return new Subwf(input);
-                break;
             case 0xE00:
-                //swapf();
+                return new Swapf(input);
-                break;
             case 0x600:
-                //xorwf();
+                return new Xorwf(input);
-                break;
             case 0x3900:
                 return new Andlw(input);
             case 0x3800:
@@ -61,38 +47,29 @@ public class CommandDecoder
         switch(input & 0x3F80)
         {
             case 0x180:
-                //clrf();
+                return new Clrf(input);
-                break;
             case 0x100:
-                //clrw();
+                return new Clrw();
-                break;
             case 0x80:
-                //movwf();
+                return new Movwf(input);
-                break;
         }
 
         switch(input & 0x3C00)
         {
             case 0x1000:
-                //bcf();
+                return new Bcf(input);
-                break;
             case 0x1400:
-                //bsf();
+                return new Bsf(input);
-                break;
             case 0x1800:
-                //btfsc();
+                return new Btfsc(input);
-                break;
             case 0x1C00:
-                //btfss();
+               return new Btfss(input);
-                break;
         }
 
         switch(input & 0x3E00)
         {
             case 0x3E00:
-                //addlw();
                 return new Addlw(input);
-                //break;
             case 0x3C00:
                 return new Sublw(input);
         }
@@ -100,11 +77,9 @@ public class CommandDecoder
         switch(input & 0x3800)
         {
             case 0x2000:
-                //call();
+                return new Call(input);
-                break;
             case 0x2800:
-                //goto();
+                return new Goto(input);
-                break;
         }
 
         switch(input & 0x3C00)
@@ -112,13 +87,12 @@ public class CommandDecoder
             case 0x3000:
                 return new Movlw(input);
             case 0x3400:
-                //retlw();
+                return new Retlw(input);
-                break;
         }
 
         if ((input | 0x0060) == 0x0060)
         {
-            //nop();
+            return new Nop();
         }
 
         if (input == 0x0064)
@@ -133,8 +107,7 @@ public class CommandDecoder
 
         if (input == 0x0008)
         {
-            //return();
+            return new Return();
-            //This is the function name. Do not mistake this for a normal return!
         }
 
         if (input == 0x0063)

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,18 +54,29 @@ 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;
         }
         memory[address] = data;
         memory[address + 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 getDataFromIndirectAddress(int address)
@@ -68,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;
@@ -91,6 +115,43 @@ public class Memory
         return memory[0x4];
     }
 
+    public static int getPCL()
+    {
+        return memory[0x2];
+    }
+
+    public static void setPCL(int data)
+    {
+        memory[0x2] = data;
+        memory[0x82] = data;
+    }
+
+    public static int getPCLATH()
+    {
+        return memory[0xA] & 0x1F;
+    }
+
+    public static void setPCLATH(int data)
+    {
+        memory[0xA] = data & 0x1F;
+        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;
@@ -99,6 +160,7 @@ public class Memory
     public static void setZeroBit()
     {
         memory[0x03] |= 0x04;
+        memory[0x83] |= 0x04;
     }
 
     public static void clearZeroBit()
@@ -114,6 +176,7 @@ public class Memory
     public static void setDigitCarryBit()
     {
         memory[0x03] |= 0x02;
+        memory[0x83] |= 0x02;
     }
 
     public static void clearDigitCarryBit()
@@ -121,14 +184,19 @@ public class Memory
         memory[0x03] &= 0xFD;
     }
 
-    public static boolean getCarryBit()
+    public static int getCarryBit()
     {
-        return (memory[0x03] & 0x01) == 0x01;
+        if((memory[0x03] & 0x01) == 0x01)
+        {
+            return 1;
+        }
+        else return 0;
     }
 
     public static void setCarryBit()
     {
         memory[0x03] |= 0x01;
+        memory[0x83] |= 0x01;
     }
 
     public static void clearCarryBit()

de/darkress/pic16f84sim/microcontroller/ProgramCounter.java

@@ -4,20 +4,36 @@ public class ProgramCounter
 
     //This class is not actual part of the µC. It is a storage for the current value of the PC
 {
-    private static int PC = 0;
+    private static int pc = 0;
 
-    public static int getPC()
+    public static int getPc()
     {
-        return PC;
+        return pc;
     }
 
-    public static void setPC(int PC)
+    public static void setPcFrom11BitLiteral(int data)
     {
-        ProgramCounter.PC = PC;
+        int pcl = data & 0x00FF;
+        int pch = Memory.getPCLATH();
+        pch = ((pch & 0xF8) <<8) + (data & 0x700);
+        Memory.setPCL(pcl);
+        pc = (pch) + pcl;
     }
 
-    public static void incPC()
+    public static void setPcFromStack(int stack)
     {
-        PC++;
+        pc = stack;
+        Memory.setPCL(pc & 0x00FF);
+    }
+
+    public static void loadPc()
+    {
+        pc = (Memory.getPCLATH() <<8) + Memory.getPCL();
+    }
+
+    public static void incPC() //is called after every instruction execution
+    {
+        pc++;
+        Memory.setPCL(pc & 0x00FF);
     }
 }

de/darkress/pic16f84sim/microcontroller/Stack.java

@@ -14,9 +14,8 @@ public class Stack
 
     public static int pop()
     {
-        int tmp = stack[stackPointer];
         pointPrevious();
-        return tmp;
+        return stack[stackPointer];
     }
 
     public static int peek()

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