Compare commits
3 Commits
interactiv
...
CommandLin
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6772f448ba | ||
|
|
9319a14d88 | ||
|
|
9d7d1ce5b1 |
@@ -2,18 +2,20 @@ 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/TPicSim11.LST");
|
||||
|
||||
Memory.initMemory();
|
||||
|
||||
@@ -26,15 +28,7 @@ class Main
|
||||
String[] instructionName = program[ProgramCounter.getPc()].getClass().toString().split("\\.");
|
||||
System.out.println("Command: " + instructionName[instructionName.length -1]);
|
||||
program[ProgramCounter.getPc()].execute();
|
||||
Cli.showDefaultRegisters();
|
||||
askForInput();
|
||||
Cli.showRegisters();
|
||||
}
|
||||
}
|
||||
|
||||
private static void askForInput() {
|
||||
System.out.println("Wanna give some more input?:");
|
||||
Scanner scanner = new Scanner(System.in);
|
||||
String userInput = scanner.nextLine();
|
||||
if(!(userInput.equals(""))) askForInput();
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import de.darkress.pic16f84sim.microcontroller.Timer;
|
||||
|
||||
public class Cli
|
||||
{
|
||||
public static void showDefaultRegisters() {
|
||||
public static void showRegisters() {
|
||||
printf(Memory.workingRegister, "W-Reg", true);
|
||||
printf(Cycles.getCycles(), "Cycles", false);
|
||||
System.out.printf("%n");
|
||||
@@ -23,12 +23,6 @@ public class Cli
|
||||
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) {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
@@ -102,7 +102,7 @@ public class CommandDecoder
|
||||
|
||||
if (input == 0x0009)
|
||||
{
|
||||
return new Retfie();
|
||||
//retfie();
|
||||
}
|
||||
|
||||
if (input == 0x0008)
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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];
|
||||
|
||||
@@ -37,11 +37,8 @@ public class ProgramCounter
|
||||
Memory.setPCL(pc & 0x00FF);
|
||||
}
|
||||
|
||||
public static void setProgramCounter(int value) {
|
||||
if(value <= 0xFF && value >= 0)
|
||||
{
|
||||
pc = value;
|
||||
Memory.setPCL(pc);
|
||||
}
|
||||
public static void resetProgramCounter() {
|
||||
pc = 0;
|
||||
Memory.setPCL(0x0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user