Added some more cli output

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

de/darkress/pic16f84sim/Main.java

@@ -1,18 +1,15 @@
 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) throws InterruptedException {
+    public static void main(String[] args) {
 
         Command[] program = Parser.parser("de/darkress/pic16f84sim/TestPrograms/TPicSim11.LST");
 
@@ -24,20 +21,10 @@ class Main
                 System.out.println("Resetting device");
                 Watchdog.resetProgram();
             }
-            System.out.println("Command: " + program[ProgramCounter.getPc()].toString());
+            String[] instructionName = program[ProgramCounter.getPc()].getClass().toString().split("\\.");
+            System.out.println("Command: " + instructionName[instructionName.length -1]);
             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.getRegister(0x20)) + " " + Integer.toHexString(Memory.getRegister(0x21)));
-            System.out.println(Integer.toHexString(Memory.getRegister(0x22)) + " " + Integer.toHexString(Memory.getRegister(0x23)));
-
-            System.out.println(Integer.toHexString(Memory.getPCLATH()) + " " + Integer.toHexString(Memory.getPCL()) + "\n");
-
-            if(ProgramCounter.getPc() == 0x10) {
-                System.out.println(Memory.getRegister(0x20));
-            }
+            Cli.showRegisters();
         }
     }
 }

de/darkress/pic16f84sim/cli/Cli.java

@@ -0,0 +1,41 @@
+package de.darkress.pic16f84sim.cli;
+
+import de.darkress.pic16f84sim.microcontroller.*;
+
+public class Cli
+{
+    public static void showRegisters() {
+        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");
+        printf(ProgramCounter.getPc(), "PC", false);
+        printf(Watchdog.getWatchdogTimer(), "Watchdog", false);
+        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/Retfie.java

@@ -0,0 +1,18 @@
+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)
         {
-            //retfie();
+            return new Retfie();
         }
 
         if (input == 0x0008)

de/darkress/pic16f84sim/microcontroller/Interrupt.java

@@ -0,0 +1,13 @@
+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

@@ -111,7 +111,7 @@ public class Memory
         return 1;
     }
 
-    private static int getFSR()
+    public static int getFSR()
     {
         return memory[0x4];
     }
@@ -143,6 +143,13 @@ public class Memory
         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];

de/darkress/pic16f84sim/microcontroller/ProgramCounter.java

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

de/darkress/pic16f84sim/microcontroller/Stack.java

@@ -18,10 +18,6 @@ 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

@@ -46,6 +46,12 @@ 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

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