Compare commits

..

5 Commits

Author SHA1 Message Date
Darkress
bc53450507 Removed comments 2023-06-18 19:25:30 +02:00
Darkress
791201c884 timer0 Interrupt fully working 2023-06-18 19:24:40 +02:00
Darkress
60b288a762 Somewhat working Timer0Interrupt 2023-06-18 19:13:37 +02:00
Darkress
101c6ec464 removed unneccessary imports 2023-06-18 18:00:09 +02:00
darkress
4e5f53d46d Pinout in binary (#36)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#36
2023-06-17 23:49:11 +02:00
8 changed files with 49 additions and 11 deletions

View File

@@ -2,20 +2,16 @@ package de.darkress.pic16f84sim;
import de.darkress.pic16f84sim.cli.Cli; import de.darkress.pic16f84sim.cli.Cli;
import de.darkress.pic16f84sim.commands.Command; 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.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter; import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
import de.darkress.pic16f84sim.microcontroller.Watchdog; import de.darkress.pic16f84sim.microcontroller.Watchdog;
import de.darkress.pic16f84sim.parser.Parser; import de.darkress.pic16f84sim.parser.Parser;
import java.util.concurrent.TimeUnit;
class Main 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"); Command[] program = Parser.parser("de/darkress/pic16f84sim/TestPrograms/TPicSim8.LST");
Memory.initMemory(); Memory.initMemory();

View File

@@ -26,6 +26,8 @@ public class Cli
System.out.printf("%s:\t\t%s\t", "PortA", Integer.toBinaryString(Memory.getPortA())); 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("%s:\t\t%s\t", "PortB", Integer.toBinaryString(Memory.getPortB()));
System.out.printf("%n"); System.out.printf("%n");
printf(Memory.getRegister(0x0B), "IntCon", true);
System.out.printf("%n");
} }
private static void printf(int value, String description, boolean hex) { private static void printf(int value, String description, boolean hex) {

View File

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

View File

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

View File

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

View File

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

View File

@@ -46,6 +46,12 @@ public class Timer
if(timerRegister == 0) //check for timer Overflow --> interrupt if(timerRegister == 0) //check for timer Overflow --> interrupt
{ {
System.out.println("Timer Overflow"); 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); Memory.setTimer(timerRegister);
} }

View File

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