implemented Clrwdt Instruction

de/darkress/pic16f84sim/Main.java

@@ -1,6 +1,5 @@
 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;
@@ -25,10 +24,20 @@ class Main
                 System.out.println("Resetting device");
                 Watchdog.resetProgram();
             }
-            String[] instructionName = program[ProgramCounter.getPc()].getClass().toString().split("\\.");
+            System.out.println("Command: " + program[ProgramCounter.getPc()].toString());
-            System.out.println("Command: " + instructionName[instructionName.length -1]);
             program[ProgramCounter.getPc()].execute();
-            Cli.showRegisters();
+
+            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));
+            }
         }
     }
 }

de/darkress/pic16f84sim/cli/Cli.java

@@ -1,39 +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 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");
-    }
-
-    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/microcontroller/Memory.java

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

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