increment PC after every Instruction

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

de/darkress/pic16f84sim/Main.java

@@ -13,8 +13,8 @@ class Main
 
         ArrayList<Command> program = new ArrayList<>();
         Memory.workingRegister = 0x01;
-        Memory.setRegister(0x14, 0xA5); //240 << 224
-        program.add(CommandDecoder.decode(0x1594));
+        Memory.setRegister(0x14, 0xA7); //240 << 224
+        program.add(CommandDecoder.decode(0x1C94));
         for(int i = 0; i < program.size(); i++)
         {
             program.get(ProgramCounter.getPc()).execute();

de/darkress/pic16f84sim/commands/Andlw.java

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

de/darkress/pic16f84sim/commands/Btfsc.java

@@ -0,0 +1,29 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.getRegister(address);
+
+        if((result & (1 << bitPlacement)) == 0) //Test if bit is clear
+        {
+            ProgramCounter.incPC();
+        }
+
+        ProgramCounter.incPC();
+    }
+}

de/darkress/pic16f84sim/commands/Btfss.java

@@ -0,0 +1,29 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.getRegister(address);
+
+        if((result & (1 << bitPlacement)) > 0) //Test if bit is set
+        {
+            ProgramCounter.incPC();
+        }
+
+        ProgramCounter.incPC();
+    }
+}

de/darkress/pic16f84sim/commands/Decfsz.java

@@ -25,8 +25,7 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
 
         if((result % 256) == 0)
         {
-            Nop nop = new Nop();
-            nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
+            ProgramCounter.incPC();
         }
         ProgramCounter.incPC();
     }

de/darkress/pic16f84sim/commands/Incfsz.java

@@ -25,8 +25,7 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
 
         if((result % 256) == 0)
         {
-            Nop nop = new Nop();
-            nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
+            ProgramCounter.incPC();
         }
         ProgramCounter.incPC();
     }

de/darkress/pic16f84sim/commands/Iorlw.java

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

de/darkress/pic16f84sim/commands/Sublw.java

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

de/darkress/pic16f84sim/commands/Xorlw.java

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

de/darkress/pic16f84sim/decoder/CommandDecoder.java

@@ -61,19 +61,15 @@ public class CommandDecoder
             case 0x1400:
                 return new Bsf(input);
             case 0x1800:
-                //btfsc();
-                break;
+                return new Btfsc(input);
             case 0x1C00:
-                //btfss();
-                break;
+               return new Btfss(input);
         }
 
         switch(input & 0x3E00)
         {
             case 0x3E00:
-                //addlw();
                 return new Addlw(input);
-                //break;
             case 0x3C00:
                 return new Sublw(input);
         }