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

@@ -12,13 +12,9 @@ class Main
     public static void main(String[] args) {
 
         ArrayList<Command> program = new ArrayList<>();
-        int input1 = 0x27FF;
+        Memory.workingRegister = 0x01;
-        program.add(CommandDecoder.decode(0x3011)); //Write 0x11 to W
+        Memory.setRegister(0x14, 0xA7); //240 << 224
-        Memory.setRegister(0x14, 0x01);
+        program.add(CommandDecoder.decode(0x1C94));
-        program.add(CommandDecoder.decode(0x0B94));
-        program.add(CommandDecoder.decode(0x0B94));
-        program.add(CommandDecoder.decode(0x0B94));
-        program.add(CommandDecoder.decode(0x3F05));
         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/Bcf.java

@@ -0,0 +1,26 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.getRegister(address);
+        result &= ~(1 << bitPlacement); //Mask n-th bit with 0
+
+        Memory.setRegister(address, result);
+        ProgramCounter.incPC();
+    }
+}

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,26 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.getRegister(address);
+        result |= (1 << bitPlacement);
+
+        Memory.setRegister(address, result);
+        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/Clrf.java

@@ -0,0 +1,27 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Memory;
+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()
+    {
+        final int result = 0;
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result);
+        ProgramCounter.incPC();
+    }
+}

de/darkress/pic16f84sim/commands/Clrw.java

@@ -0,0 +1,18 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+
+public class Clrw extends FileRegisterCommandUtils implements Command
+{
+    @Override
+    public void execute()
+    {
+        final int result = 0;
+
+        checkZeroBit(result);
+
+        Memory.workingRegister = result;
+        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();
+            ProgramCounter.incPC();
-            nop.execute();
         }
         ProgramCounter.incPC();
     }

de/darkress/pic16f84sim/commands/Incf.java

@@ -0,0 +1,27 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        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

@@ -0,0 +1,32 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.getRegister(address) + 1;
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result % 256);
+
+        if((result % 256) == 0)
+        {
+            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/Iorwf.java

@@ -0,0 +1,27 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.getRegister(address) | Memory.workingRegister;
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result);
+        ProgramCounter.incPC();
+    }
+}

de/darkress/pic16f84sim/commands/Movf.java

@@ -0,0 +1,27 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.getRegister(address);
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result);
+        ProgramCounter.incPC();
+    }
+}

de/darkress/pic16f84sim/commands/Movwf.java

@@ -0,0 +1,25 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.workingRegister;
+
+        writeToDestination(destinationBit, address, result);
+        ProgramCounter.incPC();
+    }
+}

de/darkress/pic16f84sim/commands/Rlf.java

@@ -0,0 +1,35 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        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);
+        ProgramCounter.incPC();
+    }
+}

de/darkress/pic16f84sim/commands/Rrf.java

@@ -0,0 +1,35 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        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);
+        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/Subwf.java

@@ -0,0 +1,49 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.getRegister(address) - Memory.workingRegister + 256;
+
+        checkZeroBit(result);
+        checkCarryBit(result);
+        checkDigitCarryBit(Memory.getRegister(address));
+
+        writeToDestination(destinationBit, address, result % 256);
+        ProgramCounter.incPC();
+    }
+}

de/darkress/pic16f84sim/commands/Swapf.java

@@ -0,0 +1,27 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        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,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/commands/Xorwf.java

@@ -0,0 +1,27 @@
+package de.darkress.pic16f84sim.commands;
+
+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()
+    {
+        int result = Memory.getRegister(address) ^ Memory.workingRegister;
+
+        checkZeroBit(result);
+
+        writeToDestination(destinationBit, address, result);
+        ProgramCounter.incPC();
+    }
+}

de/darkress/pic16f84sim/decoder/CommandDecoder.java

@@ -19,32 +19,23 @@ public class CommandDecoder
             case 0xB00:
                 return new Decfsz(input);
             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:
@@ -56,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);
         }

de/darkress/pic16f84sim/microcontroller/Memory.java

@@ -153,9 +153,13 @@ 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()