Fixed timer increase

de/darkress/pic16f84sim/Main.java

@@ -1,40 +1,30 @@
 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.Scanner;
+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/TPicSim8.LST");
+        Command[] program = Parser.parser("de/darkress/pic16f84sim/TestPrograms/TPicSim7.LST");
 
         Memory.initMemory();
 
         while(ProgramCounter.getPc() < 1024)
         {
-            if((Memory.getRegister(0x03) & 0x10) == 0x00) { // Checking WDT in Status Register
+            System.out.println("Command: " + program[ProgramCounter.getPc()].toString());
-                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();
-        }
-    }
 
-    private static void askForInput() {
+            System.out.println(Integer.toHexString(Memory.workingRegister) + " " + Cycles.getCycles());
-        System.out.println("Wanna give some more input?:");
+            System.out.println(Integer.toHexString(Memory.getOption()) + " " + Integer.toHexString(Memory.getTimer()));
-        Scanner scanner = new Scanner(System.in);
+            System.out.println(Integer.toHexString(Memory.getPCLATH()) + " " + Integer.toHexString(Memory.getPCL()) + "\n");
-        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/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/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

@@ -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

@@ -5,7 +5,7 @@ public class Cycles {
 
     public static void incCycles()
     {
-        Timer.decreasePrescaler();
+        Timer.increaseTimer();
         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

@@ -54,8 +54,7 @@ public class Memory
             setDataFromIndirectAddress(indirectAddress, data);
             return;
         }
-        if(address == 0x01 && !Timer.getPrescalerAssignment()) //Reset PrescalerCounter if change on Option or Timer
+        if(address == 0x01) //Reset PrescalerCounter if change on Option or Timer Register
-            // Register
         {
             Timer.resetTimeToTimerIncrease();
             Timer.setCyclesToTimerIncrease(Timer.getCyclesToTimerIncrease() - 1); //Decrease by one to account for
@@ -87,7 +86,7 @@ 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
+        if(address == 0x81 || address == 0x01) //Reset PrescalerCounter if change on Option or Timer Register
         {
             Timer.resetTimeToTimerIncrease();
             Timer.setCyclesToTimerIncrease(Timer.getCyclesToTimerIncrease() - 1); //Decrease by one to account for
@@ -111,7 +110,7 @@ public class Memory
         return 1;
     }
 
-    public static int getFSR()
+    private static int getFSR()
     {
         return memory[0x4];
     }
@@ -143,13 +142,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/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

@@ -24,7 +24,7 @@ public class Timer
         cyclesToTimerIncrease = getPrescalerFactor();
     }
 
-    public static boolean getPrescalerAssignment() {
+    private static boolean getPrescalerAsssignment() {
         return (Memory.getOption() & 0x08) == 0x08;
     }
 
@@ -32,7 +32,7 @@ public class Timer
         final int MULTIPLIER = 2;
         int prescalerPower = Memory.getOption() & 0x07;
         int prescaler = (int)Math.pow(2, prescalerPower);
-        if(!getPrescalerAssignment())
+        if(!getPrescalerAsssignment())
         {
             return prescaler * MULTIPLIER;
         }
@@ -46,37 +46,21 @@ 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);
     }
 
-    public static void decreasePrescaler()
+    public static void increaseTimer()
     {
-        if(getPrescalerAssignment()) { // Assigned to WatchdogTimer
+        if(!timerEnabled())
+        {
+            return;
+        }
         cyclesToTimerIncrease--;
-            if(cyclesToTimerIncrease == 0) {
+        if(cyclesToTimerIncrease == 0)
+        {
             resetTimeToTimerIncrease();
-                Watchdog.decreaseWatchdogTimer();
+            increaseTimerRegister();
-            }
-        } 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;
-    }
-
-}