Pinout in binary

de/darkress/pic16f84sim/Main.java

@@ -2,14 +2,18 @@ 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.Cycles;
 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.concurrent.TimeUnit;
+
 class Main
 {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
 
         Command[] program = Parser.parser("de/darkress/pic16f84sim/TestPrograms/TPicSim11.LST");
 

de/darkress/pic16f84sim/cli/Cli.java

@@ -1,6 +1,9 @@
 package de.darkress.pic16f84sim.cli;
 
-import de.darkress.pic16f84sim.microcontroller.*;
+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
 {
@@ -23,11 +26,6 @@ public class Cli
         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");
-        printf(ProgramCounter.getPc(), "PC", false);
-        printf(Watchdog.getWatchdogTimer(), "Watchdog", false);
-        System.out.printf("%n");
     }
 
     private static void printf(int value, String description, boolean hex) {

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/decoder/CommandDecoder.java

@@ -102,7 +102,7 @@ public class CommandDecoder
 
         if (input == 0x0009)
         {
-            return new Retfie();
+            //retfie();
         }
 
         if (input == 0x0008)

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/ProgramCounter.java

@@ -37,11 +37,8 @@ public class ProgramCounter
         Memory.setPCL(pc & 0x00FF);
     }
 
-    public static void setProgramCounter(int value) {
+    public static void resetProgramCounter() {
-        if(value <= 0xFF && value >= 0)
+        pc = 0;
-        {
+        Memory.setPCL(0x0);
-            pc = value;
-            Memory.setPCL(pc);
-        }
     }
 }

de/darkress/pic16f84sim/microcontroller/Timer.java

@@ -46,12 +46,6 @@ public class Timer
         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);
     }

de/darkress/pic16f84sim/microcontroller/Watchdog.java

@@ -30,7 +30,7 @@ public class Watchdog
     public static void resetProgram()
     {
         Memory.setRegister(0x03, Memory.getRegister(0x03) | 0x10); //Set !T0 in StatusReg
-        ProgramCounter.setProgramCounter(0);
+        ProgramCounter.resetProgramCounter();
         watchdogTimer = 18000;
     }