implemented btfss Instruction

de/darkress/pic16f84sim/Main.java

@@ -1,40 +1,23 @@
 package de.darkress.pic16f84sim;
 
-import de.darkress.pic16f84sim.cli.Cli;
 import de.darkress.pic16f84sim.commands.Command;
+import de.darkress.pic16f84sim.decoder.CommandDecoder;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-import de.darkress.pic16f84sim.microcontroller.Watchdog;
-import de.darkress.pic16f84sim.parser.Parser;
 
-import java.util.Scanner;
+import java.util.ArrayList;
 
 class Main
 {
     public static void main(String[] args) {
 
-        Command[] program = Parser.parser("de/darkress/pic16f84sim/TestPrograms/TPicSim8.LST");
-
-        Memory.initMemory();
-
-        while(ProgramCounter.getPc() < 1024)
+        ArrayList<Command> program = new ArrayList<>();
+        Memory.workingRegister = 0x01;
+        Memory.setRegister(0x14, 0xA7); //240 << 224
+        program.add(CommandDecoder.decode(0x1C94));
+        for(int i = 0; i < program.size(); i++)
         {
-            if((Memory.getRegister(0x03) & 0x10) == 0x00) { // Checking WDT in Status Register
-                System.out.println("Resetting device");
-                Watchdog.resetProgram();
-            }
-            String[] instructionName = program[ProgramCounter.getPc()].getClass().toString().split("\\.");
-            System.out.println("Command: " + instructionName[instructionName.length -1]);
-            program[ProgramCounter.getPc()].execute();
-            Cli.showDefaultRegisters();
-            askForInput();
+            program.get(ProgramCounter.getPc()).execute();
         }
     }
-
-    private static void askForInput() {
-        System.out.println("Wanna give some more input?:");
-        Scanner scanner = new Scanner(System.in);
-        String userInput = scanner.nextLine();
-        if(!(userInput.equals(""))) askForInput();
-    }
 }

de/darkress/pic16f84sim/cli/Cli.java

@@ -1,42 +0,0 @@
-package de.darkress.pic16f84sim.cli;
-
-import de.darkress.pic16f84sim.microcontroller.Cycles;
-import de.darkress.pic16f84sim.microcontroller.Memory;
-import de.darkress.pic16f84sim.microcontroller.Stack;
-import de.darkress.pic16f84sim.microcontroller.Timer;
-
-public class Cli
-{
-    public static void showDefaultRegisters() {
-        printf(Memory.workingRegister, "W-Reg", true);
-        printf(Cycles.getCycles(), "Cycles", false);
-        System.out.printf("%n");
-        printf(Memory.getRegister(0x03), "Status", true);
-        printf(Memory.getOption(), "Option", true);
-        System.out.printf("%n");
-        printf(Memory.getFSR(), "FSR", true);
-        printf(Stack.getStackPointer(), "Stackpointer", true);
-        System.out.printf("%n");
-        printf(Memory.getTimer(), "Timer", true);
-        printf(Timer.getCyclesToTimerIncrease(), "Prescaler", true);
-        System.out.printf("%n");
-        printf(Memory.getPCLATH(), "PCLATH", true);
-        printf(Memory.getPCL(), "PCL", true);
-        System.out.printf("%n");
-        System.out.printf("%s:\t\t%s\t", "PortA", Integer.toBinaryString(Memory.getPortA()));
-        System.out.printf("%s:\t\t%s\t", "PortB", Integer.toBinaryString(Memory.getPortB()));
-        System.out.printf("%n");
-        printf(Memory.getRegister(0x0B), "IntCon", true);
-        System.out.printf("%n");
-
-    }
-
-    private static void printf(int value, String description, boolean hex) {
-        if(hex) {
-            System.out.printf("%s:\t\t%s\t", description, Integer.toHexString(value));
-        } else {
-            System.out.printf("%s:\t\t%d\t", description, value);
-        }
-
-    }
-}

de/darkress/pic16f84sim/commands/Addlw.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -16,8 +15,6 @@ public class Addlw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
-        ProgramCounter.incPC();
-        Cycles.incCycles();
         int result = literal + Memory.workingRegister;
 
         checkZeroBit(result);
@@ -25,5 +22,6 @@ public class Addlw extends LiteralCommandUtils implements Command
         checkDigitCarryBit(literal);
 
         Memory.workingRegister = result % 256;
+        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Addwf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,8 +17,6 @@ public class Addwf extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
-        ProgramCounter.incPC();
-        Cycles.incCycles();
         int result = Memory.getRegister(address) + Memory.workingRegister;
 
         checkZeroBit(result);
@@ -27,5 +24,6 @@ public class Addwf extends FileRegisterCommandUtils implements Command
         checkDigitCarryBit(address);
 
         writeToDestination(destinationBit, address, result);
+        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Andlw.java

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

de/darkress/pic16f84sim/commands/Andwf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,12 +17,11 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,11 +17,10 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,11 +17,10 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,14 +17,13 @@ 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
         {
-            Nop nop = new Nop();
-            nop.execute();
+            ProgramCounter.incPC();
         }
+
+        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Btfss.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,14 +17,13 @@ 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
         {
-            Nop nop = new Nop();
-            nop.execute();
+            ProgramCounter.incPC();
         }
+
+        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Call.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 import de.darkress.pic16f84sim.microcontroller.Stack;
 
@@ -16,9 +15,7 @@ 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.Cycles;
+import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Clrf extends FileRegisterCommandUtils implements Command
@@ -17,12 +17,11 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -9,12 +8,11 @@ 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/Clrwdt.java

@@ -1,24 +0,0 @@
-package de.darkress.pic16f84sim.commands;
-
-import de.darkress.pic16f84sim.microcontroller.*;
-
-public class Clrwdt extends LiteralCommandUtils implements Command
-{
-
-    public Clrwdt()
-    {
-    }
-
-    @Override
-    public void execute()
-    {
-        ProgramCounter.incPC();
-        Cycles.incCycles();
-
-        Memory.setRegister(0x03, Memory.getRegister(0x03) | 0x18);
-        if(Timer.getPrescalerAssignment()) {
-            Timer.resetTimeToTimerIncrease();
-            Watchdog.resetWatchdogTimer();
-        }
-    }
-}

de/darkress/pic16f84sim/commands/Comf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,12 +17,11 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,12 +17,11 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,8 +17,6 @@ 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);
@@ -29,7 +26,8 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
         if((result % 256) == 0)
         {
             Nop nop = new Nop();
-            nop.execute();
+            nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
         }
+        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Goto.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Goto extends LiteralCommandUtils implements Command
@@ -15,8 +14,6 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,12 +17,11 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,8 +17,6 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
     @Override
     public void execute()
     {
-        ProgramCounter.incPC();
-        Cycles.incCycles();
         int result = Memory.getRegister(address) + 1;
 
         checkZeroBit(result);
@@ -29,7 +26,8 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
         if((result % 256) == 0)
         {
             Nop nop = new Nop();
-            nop.execute();
+            nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
         }
+        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Iorlw.java

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

de/darkress/pic16f84sim/commands/Iorwf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,12 +17,11 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,12 +17,11 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -16,8 +15,7 @@ public class Movlw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
-        ProgramCounter.incPC();
-        Cycles.incCycles();
         Memory.workingRegister = literal;
+        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Movwf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,10 +17,9 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
 public class Nop extends LiteralCommandUtils implements Command
@@ -11,6 +10,5 @@ public class Nop extends LiteralCommandUtils implements Command
     {
         // Do nothing, just increment the PC
         ProgramCounter.incPC();
-        Cycles.incCycles();
     }
 }

de/darkress/pic16f84sim/commands/Retfie.java

@@ -1,18 +0,0 @@
-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 Retfie extends LiteralCommandUtils implements Command
-{
-    @Override
-    public void execute()
-    {
-        Cycles.incCycles();
-        Memory.setRegister(0x0B, Memory.getRegister(0x0B) | 0x80); //Set GIE
-        ProgramCounter.setPcFromStack(Stack.pop() + 1);
-        Cycles.incCycles(); // Simulate 2-Cycle Instruction
-    }
-}

de/darkress/pic16f84sim/commands/Retlw.java

@@ -1,6 +1,5 @@
 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;
@@ -17,9 +16,7 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 import de.darkress.pic16f84sim.microcontroller.Stack;
 
@@ -9,8 +8,6 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,8 +17,6 @@ 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();
@@ -33,5 +30,6 @@ public class Rlf extends FileRegisterCommandUtils implements Command
         }
 
         writeToDestination(destinationBit, address, register);
+        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Rrf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,8 +17,6 @@ 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();
@@ -33,5 +30,6 @@ public class Rrf extends FileRegisterCommandUtils implements Command
         }
 
         writeToDestination(destinationBit, address, register);
+        ProgramCounter.incPC();
     }
 }

de/darkress/pic16f84sim/commands/Sublw.java

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

de/darkress/pic16f84sim/commands/Subwf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -38,8 +37,6 @@ 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);
@@ -47,5 +44,6 @@ 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,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,12 +17,11 @@ 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,8 +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;
 
 public class Xorlw extends LiteralCommandUtils implements Command
 {
@@ -15,8 +13,6 @@ public class Xorlw extends LiteralCommandUtils implements Command
     @Override
     public void execute()
     {
-        ProgramCounter.incPC();
-        Cycles.incCycles();
         int result = literal ^ Memory.workingRegister;
 
         checkZeroBit(result);

de/darkress/pic16f84sim/commands/Xorwf.java

@@ -1,6 +1,5 @@
 package de.darkress.pic16f84sim.commands;
 
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
 
@@ -18,12 +17,11 @@ 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/decoder/CommandDecoder.java

@@ -97,12 +97,12 @@ public class CommandDecoder
 
         if (input == 0x0064)
         {
-            return new Clrwdt();
+            //clrwdt();
         }
 
         if (input == 0x0009)
         {
-            return new Retfie();
+            //retfie();
         }
 
         if (input == 0x0008)

de/darkress/pic16f84sim/microcontroller/Cycles.java

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

de/darkress/pic16f84sim/microcontroller/Interrupt.java

@@ -1,13 +0,0 @@
-package de.darkress.pic16f84sim.microcontroller;
-
-public class Interrupt
-{
-    private static boolean globalInterruptEnabled() {
-        return (Memory.getRegister(0x0B) & 0x80) == 0x80; // Check GIE
-
-    }
-    public static boolean checkTimerInterruptConditions() {
-        boolean timerInterruptEnabled = (Memory.getRegister(0x0B) & 0x20) == 0x20;
-        return globalInterruptEnabled() && timerInterruptEnabled;
-    }
-}

de/darkress/pic16f84sim/microcontroller/Memory.java

@@ -4,13 +4,6 @@ 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];
@@ -54,20 +47,12 @@ public class Memory
             setDataFromIndirectAddress(indirectAddress, data);
             return;
         }
-        if(address == 0x01 && !Timer.getPrescalerAssignment()) //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(bank0UniqueSpecialRegister).anyMatch(x -> x == address)) && getRegisterBank() == 1) //bank0
-            // because of 7 Bit address
+        if((Arrays.stream(bank1UniqueSpecialRegister).anyMatch(x -> x == address)) && getRegisterBank() == 1)
         {
             memory[address + 128] = data;
             return;
@@ -87,12 +72,6 @@ public class Memory
 
     private static void setDataFromIndirectAddress(int address, int data)
     {
-        if((address == 0x81 || address == 0x01) && !Timer.getPrescalerAssignment()) //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;
@@ -100,6 +79,10 @@ 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()
@@ -111,7 +94,7 @@ public class Memory
         return 1;
     }
 
-    public static int getFSR()
+    private static int getFSR()
     {
         return memory[0x4];
     }
@@ -138,28 +121,6 @@ public class Memory
         memory[0x8A] = data & 0x1F;
     }
 
-    public static int getOption()
-    {
-        return memory[0x81];
-    }
-
-    public static int getPortB() {
-        return memory[0x06];
-    }
-
-    public static int getPortA() {
-        return memory[0x05] & 0x1F;
-    }
-    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/ProgramCounter.java

@@ -36,12 +36,4 @@ public class ProgramCounter
         pc++;
         Memory.setPCL(pc & 0x00FF);
     }
-
-    public static void setProgramCounter(int value) {
-        if(value <= 0xFF && value >= 0)
-        {
-            pc = value;
-            Memory.setPCL(pc);
-        }
-    }
 }

de/darkress/pic16f84sim/microcontroller/Stack.java

@@ -18,6 +18,10 @@ public class Stack
         return stack[stackPointer];
     }
 
+    public static int peek()
+    {
+        return stack[(stackPointer + 7) % 8]; //Get TopOfStack -1 +8 = 7 and modulo 8 to avoid IndexOutOfBound
+    }
 
     private static void pointNext()
     {

de/darkress/pic16f84sim/microcontroller/Timer.java

@@ -1,82 +0,0 @@
-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();
-    }
-
-    public static boolean getPrescalerAssignment() {
-        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(!getPrescalerAssignment())
-        {
-            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.setRegister(0x0B, Memory.getRegister(0x0B) | 0x04); //set T0IF
-            if(Interrupt.checkTimerInterruptConditions())
-            {
-                Stack.push(ProgramCounter.getPc());
-                ProgramCounter.setProgramCounter(0x04); // Interrupt Vector
-            }
-        }
-        Memory.setTimer(timerRegister);
-    }
-
-    public static void decreasePrescaler()
-    {
-        if(getPrescalerAssignment()) { // Assigned to WatchdogTimer
-            cyclesToTimerIncrease--;
-            if(cyclesToTimerIncrease == 0) {
-                resetTimeToTimerIncrease();
-                Watchdog.decreaseWatchdogTimer();
-            }
-        } else {
-            Watchdog.decreaseWatchdogTimer();
-        }
-        if(timerEnabled()) {
-            if(!getPrescalerAssignment()) { // Assigned to timer0
-                cyclesToTimerIncrease--;
-                if(cyclesToTimerIncrease == 0) {
-                    resetTimeToTimerIncrease();
-                    Timer.increaseTimerRegister();
-                }
-            } else {
-                Timer.increaseTimerRegister();
-            }
-        }
-    }
-}

de/darkress/pic16f84sim/microcontroller/Watchdog.java

@@ -1,37 +0,0 @@
-package de.darkress.pic16f84sim.microcontroller;
-
-public class Watchdog
-{
-    private static int watchdogTimer = 18000;
-    public static int getWatchdogTimer()
-    {
-        return watchdogTimer;
-    }
-
-    public static void resetWatchdogTimer() {
-        watchdogTimer = 18000;
-    }
-
-    public static void decreaseWatchdogTimer()
-    {
-        watchdogTimer--;
-        checkWatchdog();
-    }
-
-    private static void checkWatchdog()
-    {
-        if(watchdogTimer == 0)
-        {
-            System.out.println("Watchdog Time-Out");
-            Memory.setRegister(0x03, Memory.getRegister(0x03) & 0xEF); //Clear !TO in StatusReg
-        }
-    }
-
-    public static void resetProgram()
-    {
-        Memory.setRegister(0x03, Memory.getRegister(0x03) | 0x10); //Set !T0 in StatusReg
-        ProgramCounter.setProgramCounter(0);
-        watchdogTimer = 18000;
-    }
-
-}

de/darkress/pic16f84sim/parser/Parser.java

@@ -1,8 +1,5 @@
 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;
@@ -11,9 +8,9 @@ import java.util.Scanner;
 
 public class Parser
 {
-    public static Command[] parser(String filePath)
+    public static List<Integer> parser(String filePath)
     {
-        ArrayList<String> instructions = new ArrayList<>();
+        ArrayList<Integer> program = new ArrayList<>();
         try {
             File file = new File(filePath);
             Scanner scanner = new Scanner(file);
@@ -22,10 +19,8 @@ public class Parser
                 if(!data.startsWith(" "))
                 {
                     String commandAndParametersString = "0x" + data.split(" ")[1];
-                    String instructionAddress = "0x" + data.split(" ")[0];
-                    //int commandAndParameters = Integer.decode(commandAndParametersString);
-                    //program.add(commandAndParameters);
-                    instructions.add(instructionAddress + ", " + commandAndParametersString);
+                    int commandAndParameters = Integer.decode(commandAndParametersString);
+                    program.add(commandAndParameters);
                 }
             }
             scanner.close();
@@ -33,16 +28,6 @@ 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;
     }
 }