Compare commits
5 Commits
main
...
fec427794d
| Author | SHA1 | Date | |
|---|---|---|---|
| fec427794d | |||
| 4310011f0e | |||
| ca36cffd47 | |||
| 133ee646d1 | |||
| 52daa062df |
@ -1,37 +1,36 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
|
||||
public class Commands {
|
||||
private static int wRegister = 0;
|
||||
public class Commands extends PICComponent implements CommandInterface {
|
||||
private int wRegister;
|
||||
private long totalExecutionTime;
|
||||
|
||||
static long totalExecutionTime = 0;
|
||||
public Commands(){
|
||||
super();
|
||||
wRegister = 0;
|
||||
totalExecutionTime = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static int get_wRegister() {
|
||||
public int get_wRegister() {
|
||||
return wRegister;
|
||||
}
|
||||
|
||||
public static void addExecutionTime(int i) {
|
||||
public void addExecutionTime(int i) {
|
||||
totalExecutionTime += i;
|
||||
Timer.cycles(i);
|
||||
EEPROM.registerTime(false);
|
||||
timer.cycles(i);
|
||||
eeprom.registerTime(false);
|
||||
}
|
||||
|
||||
public static long getTotalExecutionTime() {
|
||||
return (long) (totalExecutionTime * Controller_Frontend.getExecutionTimeMultiplier());
|
||||
public double getTotalExecutionTime() {
|
||||
return (totalExecutionTime * frontendController.getExecutionTimeMultiplier());
|
||||
}
|
||||
|
||||
public static void resetTotalExecutionTime() {
|
||||
public void resetTotalExecutionTime() {
|
||||
totalExecutionTime = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public static void decode(int instruction){
|
||||
public void decode(int instruction){
|
||||
final int jumpaddr = 0x7FF;
|
||||
final int fileregaddr = 0x7F;
|
||||
final int constant = 0xFF;
|
||||
@ -62,12 +61,12 @@ public class Commands {
|
||||
switch (instruction & 0x3C00){
|
||||
case 0b01000000000000:
|
||||
System.out.println("BCF: " + f + " " + b);
|
||||
DataRegister.clearBit(f, b);
|
||||
dataRegister.clearBit(f, b);
|
||||
addExecutionTime(1);
|
||||
return;
|
||||
case 0b01010000000000:
|
||||
System.out.println("BSF: " + f + " " + b);
|
||||
DataRegister.setBit(f, b);
|
||||
dataRegister.setBit(f, b);
|
||||
addExecutionTime(1);
|
||||
return;
|
||||
case 0b01100000000000:
|
||||
@ -223,7 +222,7 @@ public class Commands {
|
||||
switch (instruction){
|
||||
case 0b01100100:
|
||||
System.out.println("CLRWDT");
|
||||
WatchdogTimer.reset();
|
||||
watchdogTimer.reset();
|
||||
return;
|
||||
case 0b1001:
|
||||
System.out.println("RETFIE");
|
||||
@ -232,7 +231,7 @@ public class Commands {
|
||||
return;
|
||||
case 0b1000:
|
||||
System.out.println("RETURN");
|
||||
DataRegister.setPC(ProgramStack.pop());
|
||||
dataRegister.setPC(programStack.pop());
|
||||
return;
|
||||
case 0b01100011:
|
||||
System.out.println("SLEEP");
|
||||
@ -253,309 +252,314 @@ public class Commands {
|
||||
|
||||
}
|
||||
|
||||
public static void SLEEP() {
|
||||
Controller_Frontend.sleep ();
|
||||
public void SLEEP() {
|
||||
frontendController.sleep();
|
||||
}
|
||||
|
||||
public static void RETFIE() {
|
||||
DataRegister.setBit(DataRegister.getINTCON(), 7); // GIE wieder setzen
|
||||
DataRegister.setPC(ProgramStack.pop());
|
||||
public void RETFIE() {
|
||||
dataRegister.setBit(dataRegister.getINTCON(), 7); // GIE wieder setzen
|
||||
dataRegister.setPC(programStack.pop());
|
||||
}
|
||||
|
||||
public static void NOP () {
|
||||
public void NOP () {
|
||||
System.out.println("NOP");
|
||||
addExecutionTime(1);
|
||||
}
|
||||
|
||||
public static void GOTO(int jump) {
|
||||
DataRegister.setPC(jump-1);
|
||||
public void GOTO(int jump) {
|
||||
dataRegister.setPC(jump-1);
|
||||
}
|
||||
|
||||
public static void CALL(int jump) {
|
||||
ProgramStack.push(DataRegister.getPC()+1);
|
||||
DataRegister.setPC(jump-1);
|
||||
public void CALL(int jump) {
|
||||
programStack.push(dataRegister.getPC()+1);
|
||||
dataRegister.setPC(jump-1);
|
||||
addExecutionTime(1);
|
||||
}
|
||||
|
||||
public static void MOVWF(int file) {
|
||||
DataRegister.setRegister(file, wRegister);
|
||||
public void MOVWF(int file) {
|
||||
dataRegister.setRegister(file, wRegister);
|
||||
}
|
||||
|
||||
public static void CLRW() {
|
||||
public void CLRW() {
|
||||
wRegister = 0;
|
||||
DataRegister.determineZeroFlag(wRegister);
|
||||
dataRegister.determineZeroFlag(wRegister);
|
||||
|
||||
addExecutionTime(1);
|
||||
|
||||
}
|
||||
|
||||
public static void CLRF(int file) {
|
||||
DataRegister.setRegister(file, 0);
|
||||
DataRegister.determineZeroFlag(DataRegister.getRegister(file));
|
||||
public void CLRF(int file) {
|
||||
dataRegister.setRegister(file, 0);
|
||||
dataRegister.determineZeroFlag(dataRegister.getRegister(file));
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static void IORLW(int literal) {
|
||||
public void IORLW(int literal) {
|
||||
wRegister |= literal;
|
||||
DataRegister.determineZeroFlag(wRegister);
|
||||
dataRegister.determineZeroFlag(wRegister);
|
||||
}
|
||||
|
||||
public static void XORLW(int literal) {
|
||||
public void XORLW(int literal) {
|
||||
wRegister ^= literal;
|
||||
DataRegister.determineZeroFlag(wRegister);
|
||||
dataRegister.determineZeroFlag(wRegister);
|
||||
}
|
||||
|
||||
public static void ANDLW(int literal) {
|
||||
public void ANDLW(int literal) {
|
||||
wRegister &= literal;
|
||||
DataRegister.determineZeroFlag(wRegister);
|
||||
dataRegister.determineZeroFlag(wRegister);
|
||||
}
|
||||
|
||||
public static void XORWF(int file, int destination) {
|
||||
int result = wRegister ^ DataRegister.getRegister(file);
|
||||
public void XORWF(int file, int destination) {
|
||||
int result = wRegister ^ dataRegister.getRegister(file);
|
||||
if (destination == 0){
|
||||
wRegister = result;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result);
|
||||
dataRegister.setRegister(file, result);
|
||||
}
|
||||
DataRegister.determineZeroFlag(result);
|
||||
dataRegister.determineZeroFlag(result);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static void SWAPF(int file, int destination) {
|
||||
int content = DataRegister.getRegister(file);
|
||||
public void SWAPF(int file, int destination) {
|
||||
int content = dataRegister.getRegister(file);
|
||||
int result = (content & 0x0F) << 4 | (content & 0xF0) >> 4;
|
||||
if (destination == 0){
|
||||
wRegister = result;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result);
|
||||
dataRegister.setRegister(file, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void SUBWF(int file, int destination) {
|
||||
int result = (DataRegister.getRegister(file) - wRegister) ;
|
||||
public void SUBWF(int file, int destination) {
|
||||
int result = (dataRegister.getRegister(file) - wRegister) ;
|
||||
if (wRegister == 0 || result >= 0){
|
||||
DataRegister.setCarryFlag(1);
|
||||
DataRegister.setDigitCarryFlag(1);
|
||||
dataRegister.setCarryFlag(1);
|
||||
dataRegister.setDigitCarryFlag(1);
|
||||
}
|
||||
else {
|
||||
DataRegister.setCarryFlag(0);
|
||||
DataRegister.setDigitCarryFlag(0);
|
||||
dataRegister.setCarryFlag(0);
|
||||
dataRegister.setDigitCarryFlag(0);
|
||||
}
|
||||
if (destination == 0){
|
||||
wRegister = result & 0xFF;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result & 0xFF);
|
||||
dataRegister.setRegister(file, result & 0xFF);
|
||||
}
|
||||
DataRegister.determineZeroFlag(result);
|
||||
dataRegister.determineZeroFlag(result);
|
||||
addExecutionTime(1);
|
||||
}
|
||||
|
||||
public static void RLF(int file, int destination) {
|
||||
int fcontent = DataRegister.getRegister(file);
|
||||
int carry = DataRegister.getCarryFlag();
|
||||
public void RLF(int file, int destination) {
|
||||
int fcontent = dataRegister.getRegister(file);
|
||||
int carry = dataRegister.getCarryFlag();
|
||||
int result = (fcontent << 1) | carry;
|
||||
DataRegister.determineCarryFlag(result);
|
||||
dataRegister.determineCarryFlag(result);
|
||||
if (destination == 0){
|
||||
wRegister = result & 0xFF;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result & 0xFF);
|
||||
dataRegister.setRegister(file, result & 0xFF);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void RRF(int file, int destination) {
|
||||
int fcontent = DataRegister.getRegister(file);
|
||||
int carry = DataRegister.getCarryFlag() << 7;
|
||||
public void RRF(int file, int destination) {
|
||||
int fcontent = dataRegister.getRegister(file);
|
||||
int carry = dataRegister.getCarryFlag() << 7;
|
||||
int contentlow = fcontent & 0b1;
|
||||
int result = (fcontent >> 1) | carry;
|
||||
DataRegister.setCarryFlag(contentlow);
|
||||
dataRegister.setCarryFlag(contentlow);
|
||||
if (destination == 0){
|
||||
wRegister = result & 0xFF;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result & 0xFF);
|
||||
dataRegister.setRegister(file, result & 0xFF);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void MOVF(int file, int destination) {
|
||||
int content = DataRegister.getRegister(file);
|
||||
public void MOVF(int file, int destination) {
|
||||
int content = dataRegister.getRegister(file);
|
||||
if (destination == 0){
|
||||
wRegister = content;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, content);
|
||||
dataRegister.setRegister(file, content);
|
||||
}
|
||||
DataRegister.determineZeroFlag(content);
|
||||
dataRegister.determineZeroFlag(content);
|
||||
}
|
||||
|
||||
public static void IORWF(int file, int destination) {
|
||||
int result = wRegister | DataRegister.getRegister(file);
|
||||
public void IORWF(int file, int destination) {
|
||||
int result = wRegister | dataRegister.getRegister(file);
|
||||
if (destination == 0){
|
||||
wRegister = result;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result);
|
||||
dataRegister.setRegister(file, result);
|
||||
}
|
||||
DataRegister.determineZeroFlag(result);
|
||||
|
||||
dataRegister.determineZeroFlag(result);
|
||||
}
|
||||
|
||||
public static void INCFSZ(int file, int destination) {
|
||||
int result = (DataRegister.getRegister(file) + 1) & 0xFF;
|
||||
public void INCFSZ(int file, int destination) {
|
||||
int result = (dataRegister.getRegister(file) + 1) & 0xFF;
|
||||
if (destination == 0){
|
||||
wRegister = result;
|
||||
addExecutionTime(1);
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result);
|
||||
dataRegister.setRegister(file, result);
|
||||
|
||||
}
|
||||
if (result == 0) {
|
||||
DataRegister.increasePC();
|
||||
dataRegister.increasePC();
|
||||
}
|
||||
}
|
||||
|
||||
public static void INCF(int file, int destination) {
|
||||
int result = (DataRegister.getRegister(file) + 1) & 0xFF;
|
||||
public void INCF(int file, int destination) {
|
||||
int result = (dataRegister.getRegister(file) + 1) & 0xFF;
|
||||
if (destination == 0){
|
||||
wRegister = result;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result);
|
||||
dataRegister.setRegister(file, result);
|
||||
}
|
||||
DataRegister.determineZeroFlag(result);
|
||||
dataRegister.determineZeroFlag(result);
|
||||
|
||||
}
|
||||
|
||||
public static void DECFSZ(int file, int destination) {
|
||||
int result = (DataRegister.getRegister(file) -1) & 0xFF;
|
||||
public void DECFSZ(int file, int destination) {
|
||||
int result = (dataRegister.getRegister(file) -1) & 0xFF;
|
||||
if (destination == 0){
|
||||
wRegister = result;
|
||||
addExecutionTime(1);
|
||||
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result);
|
||||
dataRegister.setRegister(file, result);
|
||||
|
||||
}
|
||||
if (result == 0){
|
||||
DataRegister.increasePC();
|
||||
dataRegister.increasePC();
|
||||
}
|
||||
}
|
||||
|
||||
public static void DECF(int file, int destination) {
|
||||
int result = (DataRegister.getRegister(file) -1) & 0xFF;
|
||||
public void DECF(int file, int destination) {
|
||||
int result = (dataRegister.getRegister(file) -1) & 0xFF;
|
||||
if (destination == 0){
|
||||
wRegister = result;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result);
|
||||
dataRegister.setRegister(file, result);
|
||||
}
|
||||
DataRegister.determineZeroFlag(result);
|
||||
dataRegister.determineZeroFlag(result);
|
||||
|
||||
|
||||
}
|
||||
|
||||
private static void COMF(int file, int destination) {
|
||||
int result = (~ DataRegister.getRegister(file)) & 0xFF;
|
||||
private void COMF(int file, int destination) {
|
||||
int result = (~ dataRegister.getRegister(file)) & 0xFF;
|
||||
if (destination == 0){
|
||||
wRegister = result;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result);
|
||||
dataRegister.setRegister(file, result);
|
||||
}
|
||||
DataRegister.determineZeroFlag(result);
|
||||
dataRegister.determineZeroFlag(result);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static void ANDWF(int file, int destination) {
|
||||
int result = wRegister & DataRegister.getRegister(file);
|
||||
public void ANDWF(int file, int destination) {
|
||||
int result = wRegister & dataRegister.getRegister(file);
|
||||
if (destination == 0){
|
||||
wRegister = result & 0xFF;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result & 0xFF);
|
||||
dataRegister.setRegister(file, result & 0xFF);
|
||||
}
|
||||
DataRegister.determineZeroFlag(result);
|
||||
DataRegister.determineCarryFlag(result);
|
||||
DataRegister.determineDigitCarryFlag((wRegister&0b11101111) & (DataRegister.getRegister(file)&0b1111));
|
||||
dataRegister.determineZeroFlag(result);
|
||||
dataRegister.determineCarryFlag(result);
|
||||
dataRegister.determineDigitCarryFlag((wRegister&0b11101111) & (dataRegister.getRegister(file)&0b1111));
|
||||
|
||||
}
|
||||
|
||||
public static void ADDWF(int file, int destination) {
|
||||
int result = wRegister + DataRegister.getRegister(file);
|
||||
if (wRegister == 0 || DataRegister.getRegister(file) == 0){
|
||||
DataRegister.setCarryFlag(0);
|
||||
DataRegister.setDigitCarryFlag(0);
|
||||
public void ADDWF(int file, int destination) {
|
||||
int result = wRegister + dataRegister.getRegister(file);
|
||||
if (wRegister == 0 || dataRegister.getRegister(file) == 0){
|
||||
dataRegister.setCarryFlag(0);
|
||||
dataRegister.setDigitCarryFlag(0);
|
||||
}
|
||||
else {
|
||||
DataRegister.determineCarryFlag(result);
|
||||
DataRegister.determineDigitCarryFlag((wRegister&0b11101111) + (DataRegister.getRegister(file)&0b1111));
|
||||
dataRegister.determineCarryFlag(result);
|
||||
dataRegister.determineDigitCarryFlag((wRegister&0b11101111) + (dataRegister.getRegister(file)&0b1111));
|
||||
}
|
||||
if (destination == 0) {
|
||||
wRegister = result & 0xFF;
|
||||
}
|
||||
else {
|
||||
DataRegister.setRegister(file, result & 0xFF);
|
||||
dataRegister.setRegister(file, result & 0xFF);
|
||||
}
|
||||
DataRegister.determineZeroFlag(result);
|
||||
dataRegister.determineZeroFlag(result);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static void SUBLW(int literal) {
|
||||
public void SUBLW(int literal) {
|
||||
int result = literal - wRegister;
|
||||
if (wRegister == 0 || result >= 0){
|
||||
DataRegister.setCarryFlag(1);
|
||||
DataRegister.setDigitCarryFlag(1);
|
||||
dataRegister.setCarryFlag(1);
|
||||
dataRegister.setDigitCarryFlag(1);
|
||||
}
|
||||
else {
|
||||
|
||||
DataRegister.setCarryFlag(0);
|
||||
DataRegister.setDigitCarryFlag(0);
|
||||
dataRegister.setCarryFlag(0);
|
||||
dataRegister.setDigitCarryFlag(0);
|
||||
}
|
||||
wRegister = result & 0xFF;
|
||||
DataRegister.determineZeroFlag(result);
|
||||
dataRegister.determineZeroFlag(result);
|
||||
}
|
||||
|
||||
public static void ADDLW(int literal) {
|
||||
public void ADDLW(int literal) {
|
||||
int result = wRegister + literal;
|
||||
wRegister = result & 0xFF;
|
||||
DataRegister.determineZeroFlag(result);
|
||||
DataRegister.determineCarryFlag(result);
|
||||
DataRegister.determineDigitCarryFlag((wRegister&0b11101111) + (literal&0b1111));
|
||||
dataRegister.determineZeroFlag(result);
|
||||
dataRegister.determineCarryFlag(result);
|
||||
dataRegister.determineDigitCarryFlag((wRegister&0b11101111) + (literal&0b1111));
|
||||
}
|
||||
|
||||
public static void RETLW(int literal) {
|
||||
public void RETLW(int literal) {
|
||||
wRegister = literal;
|
||||
DataRegister.setPC(ProgramStack.pop());
|
||||
dataRegister.setPC(programStack.pop());
|
||||
}
|
||||
|
||||
public static void MOVLW(int literal) {
|
||||
public void MOVLW(int literal) {
|
||||
wRegister = literal;
|
||||
}
|
||||
|
||||
public static void BTFSC(int address, int bit) {
|
||||
if (DataRegister.getBit(address, bit) == 0){
|
||||
DataRegister.increasePC();
|
||||
public void BTFSC(int address, int bit) {
|
||||
if (dataRegister.getBit(address, bit) == 0){
|
||||
dataRegister.increasePC();
|
||||
addExecutionTime(1);
|
||||
}
|
||||
}
|
||||
|
||||
public static void BTFSS(int address, int bit) {
|
||||
if (DataRegister.getBit(address, bit) == 1){
|
||||
DataRegister.increasePC();
|
||||
public void BTFSS(int address, int bit) {
|
||||
if (dataRegister.getBit(address, bit) == 1){
|
||||
dataRegister.increasePC();
|
||||
addExecutionTime(1);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
System.out.println("Commands");
|
||||
super.initialize(picComponents);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,6 +2,8 @@ package fabrik.simulator.pic16f84;
|
||||
|
||||
import com.gluonhq.charm.glisten.control.ToggleButtonGroup;
|
||||
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
import fabrik.simulator.pic16f84.interfaces.WatchdogTimerInterface;
|
||||
import javafx.application.Platform;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.collections.ObservableList;
|
||||
@ -35,17 +37,17 @@ import java.util.Set;
|
||||
|
||||
import static java.lang.Math.max;
|
||||
|
||||
public class Controller_Frontend {
|
||||
public class Controller_Frontend extends PICComponent implements FrontendControllerInterface {
|
||||
|
||||
private int [] prog;
|
||||
private int [][] read;
|
||||
private int [] ind;
|
||||
|
||||
private static double executionTimeMultiplier = 1;
|
||||
private PICComponents picComponents;
|
||||
private double executionTimeMultiplier = 1;
|
||||
|
||||
|
||||
|
||||
public static double getExecutionTimeMultiplier(){
|
||||
public double getExecutionTimeMultiplier(){
|
||||
return executionTimeMultiplier;
|
||||
}
|
||||
|
||||
@ -53,12 +55,6 @@ public class Controller_Frontend {
|
||||
|
||||
private boolean continueExecutionAfterBreakpoint = false;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@FXML
|
||||
private ComboBox<String> executionTimeComboBox;
|
||||
|
||||
@ -84,24 +80,26 @@ public class Controller_Frontend {
|
||||
@FXML
|
||||
private CheckBox wdtCheck;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private static volatile boolean isAutoRunActive = false;
|
||||
private static volatile boolean isSleeping = false;
|
||||
|
||||
public static boolean isSleeping (){
|
||||
|
||||
public Controller_Frontend() {
|
||||
super();
|
||||
System.out.println(this);
|
||||
}
|
||||
|
||||
|
||||
public boolean isSleeping (){
|
||||
return isSleeping;
|
||||
}
|
||||
|
||||
public static void stopRunFromBackend(String message){
|
||||
public void stopRunFromBackend(String message){
|
||||
isAutoRunActive = false;
|
||||
if (isSleeping)
|
||||
wakeUpFromSleep();
|
||||
else
|
||||
DataRegister.resetPC();
|
||||
dataRegister.resetPC();
|
||||
Stage stoppedStage = new Stage();
|
||||
stoppedStage.setTitle("Programm unterbrochen!");
|
||||
VBox vbox = new VBox();
|
||||
@ -118,11 +116,11 @@ public class Controller_Frontend {
|
||||
stoppedStage.show();
|
||||
}
|
||||
|
||||
public static void sleep() {
|
||||
public void sleep() {
|
||||
isSleeping = true;
|
||||
}
|
||||
|
||||
public static void wakeUpFromSleep() {
|
||||
public void wakeUpFromSleep() {
|
||||
isSleeping = false;
|
||||
}
|
||||
|
||||
@ -140,7 +138,7 @@ public class Controller_Frontend {
|
||||
|
||||
Thread autoRunThread = new Thread(() -> {
|
||||
try {
|
||||
while (DataRegister.getPC() < prog.length && isAutoRunActive){
|
||||
while (dataRegister.getPC() < prog.length && isAutoRunActive){
|
||||
|
||||
Platform.runLater(() -> {
|
||||
try {
|
||||
@ -197,9 +195,9 @@ public class Controller_Frontend {
|
||||
int currentIndex;
|
||||
// Aktuelle Zeile abrufen
|
||||
if (!isSleeping)
|
||||
currentIndex = ind[DataRegister.getPC()];
|
||||
currentIndex = ind[dataRegister.getPC()];
|
||||
else
|
||||
currentIndex = ind[DataRegister.getPC()]-1;
|
||||
currentIndex = ind[dataRegister.getPC()]-1;
|
||||
|
||||
// Überprüfung ob ein Breakpoint gesetzt ist testte
|
||||
|
||||
@ -233,19 +231,19 @@ public class Controller_Frontend {
|
||||
markSelectedRow(currentIndex, selectedRowStyle);
|
||||
|
||||
if (!isSleeping) {
|
||||
Commands.decode(prog[DataRegister.getPC()]);
|
||||
DataRegister.increasePC();
|
||||
commands.decode(prog[dataRegister.getPC()]);
|
||||
dataRegister.increasePC();
|
||||
}
|
||||
else {
|
||||
Commands.decode(0);
|
||||
commands.decode(0);
|
||||
}
|
||||
WatchdogTimer.testAndTrigger();
|
||||
watchdogTimer.testAndTrigger();
|
||||
Table.refresh();
|
||||
CreateWindow.refreshTable();
|
||||
IOPorts.refreshUI(getTRISbuttons(), getPORTbuttons());
|
||||
ioPorts.refreshUI(getTRISbuttons(), getPORTbuttons());
|
||||
updateStack();
|
||||
updateWatchdog();
|
||||
long totalExecutionTime = Commands.getTotalExecutionTime();
|
||||
double totalExecutionTime = commands.getTotalExecutionTime();
|
||||
totalExecutionTimeLabel.setText("Total Execution Time: " + totalExecutionTime + "µs");
|
||||
}
|
||||
|
||||
@ -285,24 +283,26 @@ public class Controller_Frontend {
|
||||
stopAutoRun(null);
|
||||
if(selectedFile != null){
|
||||
String fileAddress = selectedFile.getAbsolutePath();
|
||||
DataRegister.initDataRegister();
|
||||
DataRegister.resetPC();
|
||||
System.out.println(dataRegister);
|
||||
if (null == dataRegister) dataRegister = (DataRegisterInterface) picComponents.getComponent(DataRegisterInterface.class);
|
||||
dataRegister.initDataRegister();
|
||||
dataRegister.resetPC();
|
||||
toggleLEDs(null);
|
||||
IOPorts.reset();
|
||||
ioPorts.reset();
|
||||
|
||||
for (ToggleButtonGroup toggleButtonGroup : allPORTbuttons) {
|
||||
try {
|
||||
toggleButtonGroup.getToggles().get(0).setSelected(true);
|
||||
toggleButtonGroup.getToggles().get(1).setSelected(false);
|
||||
IOPorts.setPORTfromUI(toggleButtonGroup);
|
||||
ioPorts.setPORTfromUI(toggleButtonGroup);
|
||||
} catch (NullPointerException ignored) {}
|
||||
}
|
||||
ProgramStack.reset();
|
||||
programStack.reset();
|
||||
wakeUpFromSleep();
|
||||
breakpoints.clear();
|
||||
IOPorts.refreshUI(getTRISbuttons(), getPORTbuttons());
|
||||
Commands.resetTotalExecutionTime();
|
||||
WatchdogTimer.reset();
|
||||
ioPorts.refreshUI(getTRISbuttons(), getPORTbuttons());
|
||||
commands.resetTotalExecutionTime();
|
||||
watchdogTimer.reset();
|
||||
wdtCheck.setSelected(false);
|
||||
Table.refresh();
|
||||
read = ParseFile.parseDatei(fileAddress);
|
||||
@ -396,11 +396,11 @@ public class Controller_Frontend {
|
||||
@FXML
|
||||
public void toggleWatchdog(ActionEvent actionEvent) {
|
||||
if (wdtCheck.isSelected()){
|
||||
WatchdogTimer.enable();
|
||||
watchdogTimer.enable();
|
||||
|
||||
}
|
||||
else{
|
||||
WatchdogTimer.disable();
|
||||
watchdogTimer.disable();
|
||||
}
|
||||
}
|
||||
|
||||
@ -473,15 +473,15 @@ public class Controller_Frontend {
|
||||
allPORTButtons[i].getToggles().get(0).setSelected(true);
|
||||
allTRISButtons[i].getToggles().get(1).setSelected(false);
|
||||
allPORTButtons[i].getToggles().get(1).setSelected(false);
|
||||
ToggleButtonGroupExt.get().addAlwaysOneSelectedSupport(allTRISButtons[i]);
|
||||
ToggleButtonGroupExt.get().addAlwaysOneSelectedSupport(allPORTButtons[i]);
|
||||
toggleButtonExt.addAlwaysOneSelectedSupport(allTRISButtons[i]);
|
||||
toggleButtonExt.addAlwaysOneSelectedSupport(allPORTButtons[i]);
|
||||
}
|
||||
|
||||
ledCheckA.setSelected(false);
|
||||
ledCheckB.setSelected(false);
|
||||
setTRISbuttons(allTRISButtons);
|
||||
setPORTbuttons(allPORTButtons);
|
||||
IOPorts.setLEDs(allLEDsA, allLEDsB);
|
||||
ioPorts.setLEDs(allLEDsA, allLEDsB);
|
||||
|
||||
lstContentListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
|
||||
|
||||
@ -554,7 +554,7 @@ public class Controller_Frontend {
|
||||
|
||||
@FXML
|
||||
public void toggleLEDs (ActionEvent actionEvent) {
|
||||
IOPorts.setLEDs(new boolean[]{ledCheckA.isSelected(), ledCheckB.isSelected()});
|
||||
ioPorts.setLEDs(new boolean[]{ledCheckA.isSelected(), ledCheckB.isSelected()});
|
||||
}
|
||||
|
||||
@FXML
|
||||
@ -568,9 +568,9 @@ public class Controller_Frontend {
|
||||
}
|
||||
|
||||
private void updateStack (){
|
||||
stackIndex.setText("Stack-Pointer: " + ProgramStack.getStackPointer());
|
||||
stackIndex.setText("Stack-Pointer: " + programStack.getStackPointer());
|
||||
ObservableList<String> observedList = FXCollections.observableArrayList();
|
||||
List<Integer> stackList = ProgramStack.getStack();
|
||||
List<Integer> stackList = programStack.getStack();
|
||||
for (Integer integer : stackList) {
|
||||
observedList.add("0x" + format(Integer.toHexString(integer).toUpperCase()));
|
||||
}
|
||||
@ -578,9 +578,15 @@ public class Controller_Frontend {
|
||||
}
|
||||
|
||||
private void updateWatchdog (){
|
||||
wdtCheck.setText("Watchdog-Timer: " + WatchdogTimer.get() + "µs");
|
||||
wdtCheck.setText("Watchdog-Timer: " + watchdogTimer.get() + "µs");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
super.initialize(picComponents);
|
||||
this.picComponents = picComponents;
|
||||
System.out.println("Frontend");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,11 +1,14 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
import javafx.application.Application;
|
||||
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.Scene;
|
||||
|
||||
import javafx.scene.control.Tab;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.VBox;
|
||||
import javafx.stage.Stage;
|
||||
@ -14,17 +17,30 @@ import java.io.IOException;
|
||||
import java.util.Objects;
|
||||
|
||||
public class CreateWindow extends Application {
|
||||
|
||||
private static VBox table;
|
||||
private PICComponents picComponents = new PICComponents(); // Subjekt
|
||||
public static GridPane grid = new GridPane();
|
||||
private static VBox table;
|
||||
|
||||
@Override
|
||||
public void start(Stage primaryStage) throws IOException {
|
||||
DataRegister.initDataRegister();
|
||||
table = Table.refresh();
|
||||
FXMLLoader codewindow = new FXMLLoader(CreateWindow.class.getResource("frontend.fxml"));
|
||||
Parent code = codewindow.load();
|
||||
|
||||
picComponents.registerComponent(CommandInterface.class, new Commands());
|
||||
picComponents.registerComponent(ToggleButtonInterface.class, new ToggleButtonGroupExt());
|
||||
picComponents.registerComponent(FrontendControllerInterface.class, new Controller_Frontend());
|
||||
picComponents.registerComponent(DataRegisterInterface.class, new DataRegister());
|
||||
picComponents.registerComponent(EEPROMInterface.class, new EEPROM());
|
||||
picComponents.registerComponent(InterruptInterface.class, new Interrupts());
|
||||
picComponents.registerComponent(IOPortInterface.class, new IOPorts());
|
||||
picComponents.registerComponent(PreScalerInterface.class, new PreScaler());
|
||||
picComponents.registerComponent(ProgramStackInterface.class, new ProgramStack());
|
||||
picComponents.registerComponent(TimerInterface.class, new Timer());
|
||||
picComponents.registerComponent(WatchdogTimerInterface.class, new WatchdogTimer());
|
||||
picComponents.initAll();
|
||||
|
||||
FXMLLoader codewindow = new FXMLLoader(CreateWindow.class.getResource("frontend.fxml"));
|
||||
codewindow.setController(picComponents.getComponent(FrontendControllerInterface.class));
|
||||
Parent code = codewindow.load();
|
||||
table = Table.init(picComponents);
|
||||
grid.add(table, 1, 1);
|
||||
grid.add(code, 0, 1);
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
public class DataEntry {
|
||||
|
||||
|
||||
private final String address;
|
||||
private final String value;
|
||||
|
||||
public DataEntry(String address, String value) {
|
||||
this.address = address;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getAddress() {
|
||||
return address;
|
||||
}
|
||||
|
||||
public String getValue(int columnIndex) {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,42 +1,55 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
import fabrik.simulator.pic16f84.interfaces.DataRegisterInterface;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public class DataRegister {
|
||||
private static final int INDF = 0x0;
|
||||
private static final int PCL = 0x2;
|
||||
private static final int STATUS = 0x3;
|
||||
private static final int FSR = 0x4;
|
||||
private static final int PORTA = 0x5;
|
||||
private static final int PORTB = 0x6;
|
||||
private static final int PCLATH = 0xA;
|
||||
private static final int INTCON = 0xB;
|
||||
public class DataRegister extends PICComponent implements DataRegisterInterface {
|
||||
private final int INDF = 0x0;
|
||||
private final int PCL = 0x2;
|
||||
private final int STATUS = 0x3;
|
||||
private final int FSR = 0x4;
|
||||
private final int PORTA = 0x5;
|
||||
private final int PORTB = 0x6;
|
||||
private final int PCLATH = 0xA;
|
||||
private final int INTCON = 0xB;
|
||||
|
||||
private static final int EEDATA = 0x08;
|
||||
private static final int EEADR = 0x09;
|
||||
private static final int EECON1 = 0x88;
|
||||
private static final int EECON2 = 0x89;
|
||||
private final int EEDATA = 0x08;
|
||||
private final int EEADR = 0x09;
|
||||
private final int EECON1 = 0x88;
|
||||
private final int EECON2 = 0x89;
|
||||
|
||||
private static final int TRISA = 0x85;
|
||||
private static final int TRISB = 0x86;
|
||||
private final int TRISA = 0x85;
|
||||
private final int TRISB = 0x86;
|
||||
|
||||
private static final int C = 0x0;
|
||||
private static final int DC = 0x1;
|
||||
private static final int Z = 0x2;
|
||||
private static final int RP0 = 0x5;
|
||||
private final int C = 0x0;
|
||||
private final int DC = 0x1;
|
||||
private final int Z = 0x2;
|
||||
private final int RP0 = 0x5;
|
||||
|
||||
|
||||
private static final int [] dataRegister = new int[0xFF];
|
||||
private static final int [] syncedRegisters = {INDF, PCL, STATUS, FSR, PCLATH, INTCON};
|
||||
private static final int [] eepromRegisters = {EEDATA, EEADR, EECON1, EECON2};
|
||||
public static final int [] ioRegisters = {PORTA, PORTB, TRISA, TRISB};
|
||||
private final int [] dataRegister = new int[0xFF];
|
||||
private final int [] syncedRegisters = {INDF, PCL, STATUS, FSR, PCLATH, INTCON};
|
||||
private final int [] eepromRegisters = {EEDATA, EEADR, EECON1, EECON2};
|
||||
public final int [] ioRegisters = {PORTA, PORTB, TRISA, TRISB};
|
||||
|
||||
public static void initDataRegister() {
|
||||
|
||||
public DataRegister () {
|
||||
super();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
super.initialize(picComponents);
|
||||
System.out.println("DataRegister.\n");
|
||||
initOrReset();
|
||||
}
|
||||
|
||||
private void initOrReset () {
|
||||
dataRegister[PCL] = 0b0;
|
||||
dataRegister[STATUS] = 0b00011000;
|
||||
dataRegister[PCLATH] = 0b0;
|
||||
dataRegister[INTCON] = 0b0;
|
||||
|
||||
dataRegister[0x81] = 0b11111111;
|
||||
dataRegister[0x80 + PCL] = dataRegister[PCL];
|
||||
dataRegister[0x80 + STATUS] = dataRegister[STATUS];
|
||||
@ -47,11 +60,15 @@ public class DataRegister {
|
||||
carryFlag = 0;
|
||||
zeroFlag = 0;
|
||||
digitCarryFlag = 0;
|
||||
IOPorts.resetTRIS();
|
||||
ioPorts.resetTRIS();
|
||||
System.out.println(Arrays.toString(dataRegister));
|
||||
}
|
||||
|
||||
private static boolean isSyncedRegister (int address){
|
||||
public void initDataRegister() {
|
||||
initOrReset();
|
||||
}
|
||||
|
||||
private boolean isSyncedRegister (int address){
|
||||
for (int register : syncedRegisters){
|
||||
if (address == register || address == 0x80 + register){
|
||||
return true;
|
||||
@ -60,11 +77,11 @@ public class DataRegister {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static int[] getDataRegister() {
|
||||
public int[] getDataRegister() {
|
||||
return dataRegister;
|
||||
}
|
||||
|
||||
private static int determineIndirectAndChange (int address){
|
||||
private int determineIndirectAndChange (int address){
|
||||
if (address == INDF || address == 0x80 + INDF) {
|
||||
return dataRegister[FSR];
|
||||
}
|
||||
@ -72,29 +89,29 @@ public class DataRegister {
|
||||
return address;
|
||||
}
|
||||
|
||||
public static int getFSR (){
|
||||
public int getFSR (){
|
||||
return dataRegister[FSR];
|
||||
}
|
||||
|
||||
private static int bank() {
|
||||
private int bank() {
|
||||
return ((dataRegister[STATUS] >> RP0) & 1) * 0x80;
|
||||
}
|
||||
|
||||
public static int getRegister(int fileAddress){
|
||||
public int getRegister(int fileAddress){
|
||||
int address = determineIndirectAndChange (fileAddress);
|
||||
if (bank () + address == EECON2)
|
||||
return 0;
|
||||
return dataRegister[bank() + address];
|
||||
}
|
||||
|
||||
public static void setRegister(int fileAddress, int content){
|
||||
public void setRegister(int fileAddress, int content){
|
||||
int address = determineIndirectAndChange (fileAddress);
|
||||
if (Arrays.stream(ioRegisters).anyMatch(i -> i == address)){
|
||||
IOPorts.setRegister(bank() + address, content);
|
||||
ioPorts.setRegister(bank() + address, content);
|
||||
return;
|
||||
}
|
||||
if (Arrays.stream(eepromRegisters).anyMatch(i -> i == address)){
|
||||
EEPROM.parse(bank() + address, content, 0b11);
|
||||
eeprom.parse(bank() + address, content, 0b11);
|
||||
return;
|
||||
}
|
||||
if (fileAddress == PCL || fileAddress == 0x80 + PCL){
|
||||
@ -110,28 +127,28 @@ public class DataRegister {
|
||||
}
|
||||
}
|
||||
if (address == 1)
|
||||
PreScaler.resetFromRegister();
|
||||
preScaler.resetFromRegister();
|
||||
}
|
||||
|
||||
public static int getBit(int fileAddress, int bit) {
|
||||
public int getBit(int fileAddress, int bit) {
|
||||
int address = determineIndirectAndChange (fileAddress);
|
||||
if (bank() + address == EECON2)
|
||||
return 0;
|
||||
return (dataRegister[bank() + address] >> bit) & 1;
|
||||
}
|
||||
|
||||
public static int getDirectBit(int address, int bit){
|
||||
public int getDirectBit(int address, int bit){
|
||||
return (dataRegister[address] >> bit) & 1;
|
||||
}
|
||||
|
||||
public static void clearBit(int fileAddress, int bit) {
|
||||
public void clearBit(int fileAddress, int bit) {
|
||||
int address = determineIndirectAndChange (fileAddress);
|
||||
if (Arrays.stream(ioRegisters).anyMatch(i -> i == address)){
|
||||
IOPorts.clearBit(bank() + address, bit);
|
||||
ioPorts.clearBit(bank() + address, bit);
|
||||
return;
|
||||
}
|
||||
if (Arrays.stream(eepromRegisters).anyMatch(i -> i == address)){
|
||||
EEPROM.parse(bank () + address, bit, 0b00);
|
||||
eeprom.parse(bank () + address, bit, 0b00);
|
||||
return;
|
||||
}
|
||||
if (!isSyncedRegister(address)) {
|
||||
@ -149,17 +166,17 @@ public class DataRegister {
|
||||
}
|
||||
}
|
||||
if (address == 1)
|
||||
PreScaler.resetFromRegister();
|
||||
preScaler.resetFromRegister();
|
||||
}
|
||||
|
||||
public static void setBit(int fileAddress, int bit) {
|
||||
public void setBit(int fileAddress, int bit) {
|
||||
int address = determineIndirectAndChange (fileAddress);
|
||||
if (Arrays.stream(ioRegisters).anyMatch(i -> i == address)){
|
||||
IOPorts.setBit(bank() + address, bit);
|
||||
ioPorts.setBit(bank() + address, bit);
|
||||
return;
|
||||
}
|
||||
if (Arrays.stream(eepromRegisters).anyMatch(i -> i == address)){
|
||||
EEPROM.parse(bank () + address, bit, 0b10);
|
||||
eeprom.parse(bank () + address, bit, 0b10);
|
||||
return;
|
||||
}
|
||||
if (!isSyncedRegister(address)) {
|
||||
@ -177,10 +194,10 @@ public class DataRegister {
|
||||
}
|
||||
}
|
||||
if (address == 1)
|
||||
PreScaler.resetFromRegister();
|
||||
preScaler.resetFromRegister();
|
||||
}
|
||||
|
||||
public static void setDirectBit (int fileAddress, int bit, int value){
|
||||
public void setDirectBit (int fileAddress, int bit, int value){
|
||||
if (getDirectBit(fileAddress, bit) == 0 && value == 1){
|
||||
dataRegister[fileAddress] += (int) Math.pow(2, bit);
|
||||
} else if (getDirectBit(fileAddress, bit) == 1 && value == 0){
|
||||
@ -188,14 +205,14 @@ public class DataRegister {
|
||||
}
|
||||
}
|
||||
|
||||
private static int programCounter = 0;
|
||||
private int programCounter = 0;
|
||||
|
||||
private static void writeToPCL(){
|
||||
private void writeToPCL(){
|
||||
dataRegister[PCL] = programCounter & 0xFF;
|
||||
dataRegister[0x80 + PCL] = dataRegister[PCL];
|
||||
}
|
||||
|
||||
public static void increasePC (){
|
||||
public void increasePC (){
|
||||
if (programCounter != 0x3FF) {
|
||||
programCounter++;
|
||||
}
|
||||
@ -205,28 +222,28 @@ public class DataRegister {
|
||||
writeToPCL();
|
||||
}
|
||||
|
||||
public static void setPC (int value){
|
||||
public void setPC (int value){
|
||||
programCounter = value + ((getRegister(PCLATH) & 0b11000) << 8);
|
||||
writeToPCL();
|
||||
}
|
||||
|
||||
public static void resetPC () {
|
||||
public void resetPC () {
|
||||
programCounter = 0;
|
||||
}
|
||||
|
||||
public static int getPC(){
|
||||
public int getPC(){
|
||||
return programCounter;
|
||||
}
|
||||
|
||||
private static void setFlags() {
|
||||
private void setFlags() {
|
||||
carryFlag = getDirectBit(STATUS, C);
|
||||
digitCarryFlag = getDirectBit(STATUS, DC);
|
||||
zeroFlag = getDirectBit(STATUS, Z);
|
||||
}
|
||||
|
||||
private static int zeroFlag = 0;
|
||||
private int zeroFlag = 0;
|
||||
|
||||
public static void determineZeroFlag(int result){
|
||||
public void determineZeroFlag(int result){
|
||||
if (result == 0){
|
||||
zeroFlag = 1;
|
||||
if (getBit(STATUS, Z) == 0){
|
||||
@ -243,13 +260,13 @@ public class DataRegister {
|
||||
}
|
||||
}
|
||||
|
||||
public static int getZeroFlag(){
|
||||
public int getZeroFlag(){
|
||||
return zeroFlag;
|
||||
}
|
||||
|
||||
private static int carryFlag = 0;
|
||||
private int carryFlag = 0;
|
||||
|
||||
public static void setCarryFlag(int value){
|
||||
public void setCarryFlag(int value){
|
||||
carryFlag = value;
|
||||
if (value == 1){
|
||||
if (getBit(STATUS, C) == 0){
|
||||
@ -265,7 +282,7 @@ public class DataRegister {
|
||||
}
|
||||
}
|
||||
|
||||
public static void determineCarryFlag (int result){
|
||||
public void determineCarryFlag (int result){
|
||||
if (result > 0xFF){
|
||||
setCarryFlag(1);
|
||||
}
|
||||
@ -274,13 +291,13 @@ public class DataRegister {
|
||||
}
|
||||
}
|
||||
|
||||
public static int getCarryFlag (){
|
||||
public int getCarryFlag (){
|
||||
return carryFlag;
|
||||
}
|
||||
|
||||
private static int digitCarryFlag = 0;
|
||||
private int digitCarryFlag = 0;
|
||||
|
||||
public static void setDigitCarryFlag(int value){
|
||||
public void setDigitCarryFlag(int value){
|
||||
digitCarryFlag = value;
|
||||
if (value == 1){
|
||||
if (getBit(STATUS, DC) == 0){
|
||||
@ -296,7 +313,7 @@ public class DataRegister {
|
||||
}
|
||||
}
|
||||
|
||||
public static void determineDigitCarryFlag(int result){
|
||||
public void determineDigitCarryFlag(int result){
|
||||
if (result >> 4 == 1){
|
||||
setDigitCarryFlag(1);
|
||||
}
|
||||
@ -305,33 +322,32 @@ public class DataRegister {
|
||||
}
|
||||
}
|
||||
|
||||
public static int getDigitCarryFlag(){
|
||||
public int getDigitCarryFlag(){
|
||||
return digitCarryFlag;
|
||||
}
|
||||
|
||||
public static void setDirectRegister(int fileAddress, int content) {
|
||||
public void setDirectRegister(int fileAddress, int content) {
|
||||
dataRegister[fileAddress] = content;
|
||||
}
|
||||
|
||||
|
||||
public static int getPCL() {
|
||||
public int getPCL() {
|
||||
return PCL;
|
||||
}
|
||||
public static int getSTATUS() {
|
||||
public int getSTATUS() {
|
||||
return STATUS;
|
||||
}
|
||||
|
||||
public static int getPCLATH() {
|
||||
public int getPCLATH() {
|
||||
return PCLATH;
|
||||
}
|
||||
public static int getINTCON() {
|
||||
public int getINTCON() {
|
||||
return INTCON;
|
||||
}
|
||||
|
||||
public static int getDirectRegister(int address) {
|
||||
public int getDirectRegister(int address) {
|
||||
return dataRegister[address];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
|
||||
import eu.hansolo.tilesfx.Command;
|
||||
import org.json.simple.JSONObject;
|
||||
import org.json.simple.parser.JSONParser;
|
||||
import org.json.simple.parser.ParseException;
|
||||
@ -11,26 +12,30 @@ import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
import static fabrik.simulator.pic16f84.Commands.getTotalExecutionTime;
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
|
||||
public class EEPROM {
|
||||
private static final int EEDATA = 0x08;
|
||||
private static final int EEADR = 0x09;
|
||||
private static final int EECON1 = 0x88;
|
||||
private static final int EECON2 = 0x89;
|
||||
public class EEPROM extends PICComponent implements EEPROMInterface {
|
||||
private final int EEDATA = 0x08;
|
||||
private final int EEADR = 0x09;
|
||||
private final int EECON1 = 0x88;
|
||||
private final int EECON2 = 0x89;
|
||||
|
||||
private static final int RD = 0x00;
|
||||
private static final int WR = 0x01;
|
||||
private static final int WRERR = 0x03;
|
||||
private static final int EEIF = 0x04;
|
||||
private final int RD = 0x00;
|
||||
private final int WR = 0x01;
|
||||
private final int WRERR = 0x03;
|
||||
private final int EEIF = 0x04;
|
||||
|
||||
private static boolean readControl = false;
|
||||
private static boolean writeControl = false;
|
||||
private static boolean [] eecon2stages = {false, false};
|
||||
private boolean readControl = false;
|
||||
private boolean writeControl = false;
|
||||
private boolean [] eecon2stages = {false, false};
|
||||
|
||||
private static long startTime;
|
||||
|
||||
public static long read (int address) {
|
||||
private double startTime;
|
||||
|
||||
public EEPROM (){
|
||||
}
|
||||
|
||||
public long read (int address) {
|
||||
FileReader reader;
|
||||
try {
|
||||
reader = new FileReader("eeprom.json");
|
||||
@ -47,19 +52,19 @@ public class EEPROM {
|
||||
Object requestedData = data.get(String.valueOf(address));
|
||||
try {
|
||||
readControl = false;
|
||||
DataRegister.setDirectBit(EECON1, RD, 0);
|
||||
dataRegister.setDirectBit(EECON1, RD, 0);
|
||||
return (long) requestedData;
|
||||
} catch (NullPointerException e) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
public static void write (int address, long data) {
|
||||
public void write (int address, long data) {
|
||||
FileReader reader;
|
||||
try {
|
||||
reader = new FileReader("eeprom.json");
|
||||
} catch (FileNotFoundException ignored) {
|
||||
DataRegister.setDirectBit(EECON1, WRERR, 1);
|
||||
dataRegister.setDirectBit(EECON1, WRERR, 1);
|
||||
return;
|
||||
}
|
||||
JSONParser parser = new JSONParser();
|
||||
@ -67,32 +72,32 @@ public class EEPROM {
|
||||
try {
|
||||
eeprom = (JSONObject) parser.parse(reader);
|
||||
} catch (ParseException | IOException ignored) {
|
||||
DataRegister.setDirectBit(EECON1, WRERR, 1);
|
||||
dataRegister.setDirectBit(EECON1, WRERR, 1);
|
||||
return;
|
||||
}
|
||||
eeprom.put(String.valueOf(address), data);
|
||||
try {
|
||||
Files.write(Paths.get("eeprom.json"), eeprom.toJSONString().getBytes());
|
||||
} catch (IOException ignored) {
|
||||
DataRegister.setDirectBit(EECON1, WRERR, 1);
|
||||
dataRegister.setDirectBit(EECON1, WRERR, 1);
|
||||
return;
|
||||
}
|
||||
registerTime(true);
|
||||
}
|
||||
|
||||
public static void registerTime(boolean reset) {
|
||||
public void registerTime(boolean reset) {
|
||||
if (reset)
|
||||
startTime = getTotalExecutionTime();
|
||||
else if ((getTotalExecutionTime() >= (startTime + 1000)) && writeControl) {
|
||||
startTime = commands.getTotalExecutionTime();
|
||||
else if ((commands.getTotalExecutionTime() >= (startTime + 1000)) && writeControl) {
|
||||
eecon2stages = new boolean[]{false, false};
|
||||
DataRegister.setDirectBit(EECON1, EEIF, 1);
|
||||
DataRegister.setDirectBit(EECON1, WR, 0);
|
||||
dataRegister.setDirectBit(EECON1, EEIF, 1);
|
||||
dataRegister.setDirectBit(EECON1, WR, 0);
|
||||
writeControl = false;
|
||||
startTime = 0;
|
||||
}
|
||||
}
|
||||
|
||||
public static void parse(int address, int content, int opcode) {
|
||||
public void parse(int address, int content, int opcode) {
|
||||
//OPCODE: 0b1x = set
|
||||
//OPCODE: 0b0x = clear
|
||||
//OPCODE: 0bx1 = byte
|
||||
@ -100,21 +105,21 @@ public class EEPROM {
|
||||
switch (opcode){
|
||||
case 0b00: // CLEAR BIT
|
||||
if(address == EECON1) {
|
||||
if (DataRegister.getDirectBit(address, content) == 1)
|
||||
setEECON1((int) (DataRegister.getDirectRegister(EECON1) - Math.pow(2, content)));
|
||||
if (dataRegister.getDirectBit(address, content) == 1)
|
||||
setEECON1((int) (dataRegister.getDirectRegister(EECON1) - Math.pow(2, content)));
|
||||
} else {
|
||||
DataRegister.setDirectBit(address, content, 0);
|
||||
dataRegister.setDirectBit(address, content, 0);
|
||||
}
|
||||
break;
|
||||
case 0b10: // SET BIT
|
||||
if(address == EECON1) {
|
||||
if (DataRegister.getDirectBit(address, content) == 0)
|
||||
setEECON1((int) (DataRegister.getDirectRegister(EECON1) + Math.pow(2, content)));
|
||||
if (dataRegister.getDirectBit(address, content) == 0)
|
||||
setEECON1((int) (dataRegister.getDirectRegister(EECON1) + Math.pow(2, content)));
|
||||
} else {
|
||||
if (address == EEADR && content >= 0b01000000)
|
||||
DataRegister.setDirectBit(address, content, 0);
|
||||
dataRegister.setDirectBit(address, content, 0);
|
||||
else
|
||||
DataRegister.setDirectBit(address, content, 1);
|
||||
dataRegister.setDirectBit(address, content, 1);
|
||||
}
|
||||
break;
|
||||
case 0b11: // SET BYTE
|
||||
@ -131,20 +136,20 @@ public class EEPROM {
|
||||
else
|
||||
eecon2stages = new boolean[]{false, false};
|
||||
}
|
||||
DataRegister.setDirectRegister(address, content);
|
||||
dataRegister.setDirectRegister(address, content);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private static void setEECON1(int content) {
|
||||
private void setEECON1(int content) {
|
||||
content &= 0b00011111;
|
||||
boolean writeEnabled = ((content & 0b100) >> 2) == 1;
|
||||
if ((content & 0b1) == 1) { // READ
|
||||
readControl = true;
|
||||
DataRegister.setDirectRegister(EECON1, content);
|
||||
int data = (int) read(DataRegister.getDirectRegister(EEADR));
|
||||
DataRegister.setDirectRegister(EEDATA, data);
|
||||
dataRegister.setDirectRegister(EECON1, content);
|
||||
int data = (int) read(dataRegister.getDirectRegister(EEADR));
|
||||
dataRegister.setDirectRegister(EEDATA, data);
|
||||
return;
|
||||
}
|
||||
else if ((content & 0b1) == 0 && readControl) // RD kann nicht manuell gecleart werden
|
||||
@ -152,8 +157,8 @@ public class EEPROM {
|
||||
if (((content & 0b10) >> 1) == 1) { // WRITE CONTROL
|
||||
if (writeEnabled && eecon2stages[0] && eecon2stages[1]) {
|
||||
writeControl = true;
|
||||
DataRegister.setDirectRegister(EECON1, content);
|
||||
write(DataRegister.getDirectRegister(EEADR), DataRegister.getDirectRegister(EEDATA));
|
||||
dataRegister.setDirectRegister(EECON1, content);
|
||||
write(dataRegister.getDirectRegister(EEADR), dataRegister.getDirectRegister(EEDATA));
|
||||
return;
|
||||
}
|
||||
else {
|
||||
@ -162,6 +167,12 @@ public class EEPROM {
|
||||
}
|
||||
else if ((((content & 0b10) >> 1) == 0) && writeControl) // WR kann nicht manuell gecleart werden
|
||||
content |= 0b10;
|
||||
DataRegister.setDirectRegister(EECON1, content);
|
||||
dataRegister.setDirectRegister(EECON1, content);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
System.out.println("EEPROM");
|
||||
super.initialize(picComponents);
|
||||
}
|
||||
}
|
||||
|
||||
151
src/main/java/fabrik/simulator/pic16f84/EmptyRegister.java
Normal file
151
src/main/java/fabrik/simulator/pic16f84/EmptyRegister.java
Normal file
@ -0,0 +1,151 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
import fabrik.simulator.pic16f84.interfaces.DataRegisterInterface;
|
||||
|
||||
public class EmptyRegister implements DataRegisterInterface {
|
||||
|
||||
@Override
|
||||
public void clearBit(int f, int b) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBit(int f, int b) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPC(int pop) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getINTCON() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPC() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRegister(int file, int wRegister) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void determineZeroFlag(int wRegister) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRegister(int file) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCarryFlag(int i) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDigitCarryFlag(int i) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCarryFlag() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void determineCarryFlag(int result) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void increasePC() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void determineDigitCarryFlag(int i) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBit(int address, int bit) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDirectBit(int option, int psa) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDirectRegister(int option) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDirectBit(int option, int i, int i1) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDirectRegister(int porta, int i) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void resetPC() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getDataRegister() {
|
||||
return new int[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDigitCarryFlag() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getZeroFlag() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getFSR() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initDataRegister() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPCL() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPCLATH() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSTATUS() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,39 +1,42 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
import com.gluonhq.charm.glisten.control.ToggleButtonGroup;
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
import javafx.collections.ObservableList;
|
||||
import javafx.scene.control.ToggleButton;
|
||||
import javafx.scene.paint.Color;
|
||||
import javafx.scene.paint.RadialGradient;
|
||||
import javafx.scene.paint.Stop;
|
||||
import javafx.scene.shape.Circle;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class IOPorts {
|
||||
private static final int A = 0;
|
||||
private static final int B = 1;
|
||||
private static final int PORTA = 5;
|
||||
private static final int PORTB = 6;
|
||||
private static final int TRISA = 0x85;
|
||||
private static final int TRISB = 0x86;
|
||||
public class IOPorts extends PICComponent implements IOPortInterface {
|
||||
private final int A = 0;
|
||||
private final int B = 1;
|
||||
private final int PORTA = 5;
|
||||
private final int PORTB = 6;
|
||||
private final int TRISA = 0x85;
|
||||
private final int TRISB = 0x86;
|
||||
|
||||
private static int [] trisLatch = {0xFF, 0xFF};
|
||||
private static int [] dataLatch = new int[2];
|
||||
private static boolean isLEDenabledA = false;
|
||||
private static boolean isLEDenabledB = false;
|
||||
private static Circle[] allLEDsA;
|
||||
private static Circle[] allLEDsB;
|
||||
private int [] trisLatch = {0xFF, 0xFF};
|
||||
private int [] dataLatch = new int[2];
|
||||
private boolean isLEDenabledA = false;
|
||||
private boolean isLEDenabledB = false;
|
||||
private Circle[] allLEDsA;
|
||||
private Circle[] allLEDsB;
|
||||
|
||||
|
||||
private static int RB4 = 0x10;
|
||||
private static int RB5 = 0x20;
|
||||
private static int RB6 = 0x40;
|
||||
private static int RB7 = 0x80;
|
||||
private int RB4 = 0x10;
|
||||
private int RB5 = 0x20;
|
||||
private int RB6 = 0x40;
|
||||
private int RB7 = 0x80;
|
||||
|
||||
public IOPorts(){
|
||||
super();
|
||||
}
|
||||
|
||||
public static void setBit (int address, int bit){
|
||||
public void setBit (int address, int bit){
|
||||
if (address < 7) {
|
||||
dataLatch[address - PORTA] |= (1 << bit);
|
||||
}
|
||||
@ -43,7 +46,7 @@ public class IOPorts {
|
||||
refreshPorts();
|
||||
}
|
||||
|
||||
public static void clearBit(int address, int bit) {
|
||||
public void clearBit(int address, int bit) {
|
||||
if (address < 7) {
|
||||
if (((dataLatch[address-PORTA] >> bit)&1) == 1){
|
||||
dataLatch[address-PORTA] -= (int) Math.pow(2, bit);
|
||||
@ -57,7 +60,7 @@ public class IOPorts {
|
||||
refreshPorts();
|
||||
}
|
||||
|
||||
public static void setRegister(int address, int content) {
|
||||
public void setRegister(int address, int content) {
|
||||
if (address < 7) {
|
||||
dataLatch[address - PORTA] = content;
|
||||
}
|
||||
@ -67,24 +70,24 @@ public class IOPorts {
|
||||
refreshPorts();
|
||||
}
|
||||
|
||||
private static void refreshPorts() {
|
||||
DataRegister.setDirectRegister(PORTA, ((~((~dataLatch[A])&0x1F | trisLatch[A])) | (trisLatch[A] & DataRegister.getDirectRegister(PORTA))) & 0xFF);
|
||||
DataRegister.setDirectRegister(PORTB, ((~((~dataLatch[B])&0xFF | trisLatch[B])) | (trisLatch[B] & DataRegister.getDirectRegister(PORTB))) & 0xFF);
|
||||
DataRegister.setDirectRegister(TRISA, trisLatch[A]);
|
||||
DataRegister.setDirectRegister(TRISB, trisLatch[B]);
|
||||
private void refreshPorts() {
|
||||
dataRegister.setDirectRegister(PORTA, ((~((~dataLatch[A])&0x1F | trisLatch[A])) | (trisLatch[A] & dataRegister.getDirectRegister(PORTA))) & 0xFF);
|
||||
dataRegister.setDirectRegister(PORTB, ((~((~dataLatch[B])&0xFF | trisLatch[B])) | (trisLatch[B] & dataRegister.getDirectRegister(PORTB))) & 0xFF);
|
||||
dataRegister.setDirectRegister(TRISA, trisLatch[A]);
|
||||
dataRegister.setDirectRegister(TRISB, trisLatch[B]);
|
||||
if (((trisLatch[A] >> 4) & 1 )== 1)
|
||||
Timer.incrementFromPin(DataRegister.getDirectRegister(PORTA));
|
||||
timer.incrementFromPin(dataRegister.getDirectRegister(PORTA));
|
||||
ToggleButtonGroup[] buttons = Controller_Frontend.getPORTbuttons();
|
||||
for (int i = 0; i < buttons.length; i++){
|
||||
int port = (i < 8) ? PORTA : PORTB;
|
||||
int bit = i % 8;
|
||||
boolean value = ((DataRegister.getDirectRegister(port) >> bit) & 1) == 1;
|
||||
boolean value = ((dataRegister.getDirectRegister(port) >> bit) & 1) == 1;
|
||||
buttons[i].getToggles().get(0).setSelected(!value);
|
||||
buttons[i].getToggles().get(1).setSelected(value);
|
||||
}
|
||||
}
|
||||
|
||||
public static void refreshUI(ToggleButtonGroup[] buttonsTRIS, ToggleButtonGroup[] buttonsPORT) {
|
||||
public void refreshUI(ToggleButtonGroup[] buttonsTRIS, ToggleButtonGroup[] buttonsPORT) {
|
||||
for (int i = 0; i< buttonsTRIS.length; i++){
|
||||
int tris = (i < 8) ? trisLatch[A] : trisLatch[B];
|
||||
boolean val = isInput(tris, i%8);
|
||||
@ -95,18 +98,18 @@ public class IOPorts {
|
||||
}
|
||||
}
|
||||
|
||||
private static void updateLEDs(boolean updateAll, int index, boolean val) {
|
||||
private void updateLEDs(boolean updateAll, int index, boolean val) {
|
||||
if (updateAll) {
|
||||
if (index < 8) {
|
||||
if (isLEDenabledA && !val) {
|
||||
if (DataRegister.getDirectBit(PORTA, index) == 1)
|
||||
if (dataRegister.getDirectBit(PORTA, index) == 1)
|
||||
allLEDsA[index].setFill(new RadialGradient(0, 0, 0.5, 0.5, 0.7, true, null, new Stop(0, Color.BLACK), new Stop(1, Color.DARKGRAY)));
|
||||
else
|
||||
allLEDsA[index].setFill(new RadialGradient(0, 0, 0.5, 0.5, 0.7, true, null, new Stop(0, Color.BLACK), new Stop(1, Color.DARKGRAY)));
|
||||
}
|
||||
} else {
|
||||
if (isLEDenabledB && !val) {
|
||||
if (DataRegister.getDirectBit(PORTB, index - 8) == 1)
|
||||
if (dataRegister.getDirectBit(PORTB, index - 8) == 1)
|
||||
allLEDsB[index - 8].setFill(new RadialGradient(0, 0, 0.5, 0.5, 0.7, true, null, new Stop(0, Color.RED), new Stop(1, Color.DARKGRAY)));
|
||||
else
|
||||
allLEDsB[index - 8].setFill(new RadialGradient(0, 0, 0.5, 0.5, 0.7, true, null, new Stop(0, Color.BLACK), new Stop(1, Color.DARKGRAY)));
|
||||
@ -115,23 +118,23 @@ public class IOPorts {
|
||||
}
|
||||
else {
|
||||
if (index < 8)
|
||||
if (val || DataRegister.getDirectBit(PORTA, index) == 0)
|
||||
if (val || dataRegister.getDirectBit(PORTA, index) == 0)
|
||||
allLEDsA[index].setFill(new RadialGradient(0, 0, 0.5, 0.5, 0.7, true, null, new Stop(0, Color.BLACK), new Stop(1, Color.DARKGRAY)));
|
||||
else
|
||||
allLEDsA[index].setFill(new RadialGradient(0, 0, 0.5, 0.5, 0.7, true, null, new Stop(0, Color.RED), new Stop(1, Color.DARKGRAY)));
|
||||
else
|
||||
if (val || DataRegister.getDirectBit(PORTB, index - 8) == 0)
|
||||
if (val || dataRegister.getDirectBit(PORTB, index - 8) == 0)
|
||||
allLEDsB[index - 8].setFill(new RadialGradient(0, 0, 0.5, 0.5, 0.7, true, null, new Stop(0, Color.BLACK), new Stop(1, Color.DARKGRAY)));
|
||||
else
|
||||
allLEDsB[index - 8].setFill(new RadialGradient(0, 0, 0.5, 0.5, 0.7, true, null, new Stop(0, Color.RED), new Stop(1, Color.DARKGRAY)));
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isInput(int i, int bit) {
|
||||
private boolean isInput(int i, int bit) {
|
||||
return (i >> bit & 1) == 1;
|
||||
}
|
||||
|
||||
public static void setTRISfromUI(ToggleButtonGroup parent) throws IOException {
|
||||
public void setTRISfromUI(ToggleButtonGroup parent) throws IOException {
|
||||
int [] params = getToggleParams(parent);
|
||||
int tris = params[0];
|
||||
int bit = params[1];
|
||||
@ -150,23 +153,23 @@ public class IOPorts {
|
||||
refreshTable(parent);
|
||||
}
|
||||
|
||||
public static void setPORTfromUI(ToggleButtonGroup parent) throws IOException {
|
||||
public void setPORTfromUI(ToggleButtonGroup parent) throws IOException {
|
||||
int [] params = getToggleParams(parent);
|
||||
int port = params[0];
|
||||
int bit = params[1];
|
||||
int value = params [2];
|
||||
value = (value == 1) ? 0 : 1;
|
||||
int oldValue = DataRegister.getDirectBit(port, bit);
|
||||
DataRegister.setDirectBit(port, bit, value);
|
||||
int oldValue = dataRegister.getDirectBit(port, bit);
|
||||
dataRegister.setDirectBit(port, bit, value);
|
||||
refreshPorts();
|
||||
refreshTable(parent);
|
||||
if (port == PORTB && bit >= 4)
|
||||
Interrupts.triggerRBInterrupt(oldValue, value);
|
||||
interrupts.triggerRBInterrupt(oldValue, value);
|
||||
else if (port == PORTB && bit == 0)
|
||||
Interrupts.triggerRB0Interrupt(oldValue, value);
|
||||
interrupts.triggerRB0Interrupt(oldValue, value);
|
||||
}
|
||||
|
||||
public static void setLEDs (boolean[] leds) {
|
||||
public void setLEDs (boolean[] leds) {
|
||||
boolean isAnowDisabled = isLEDenabledA && !leds[0];
|
||||
isLEDenabledA = leds[0];
|
||||
boolean isBnowDisabled = isLEDenabledB && !leds[1];
|
||||
@ -183,17 +186,17 @@ public class IOPorts {
|
||||
}
|
||||
}
|
||||
|
||||
public static void setLEDs (Circle[] a, Circle[] b){
|
||||
public void setLEDs (Circle[] a, Circle[] b){
|
||||
allLEDsA = a;
|
||||
allLEDsB = b;
|
||||
}
|
||||
|
||||
public static void refreshTable(ToggleButtonGroup parent) {
|
||||
public void refreshTable(ToggleButtonGroup parent) {
|
||||
Table.refresh();
|
||||
CreateWindow.refreshTable();
|
||||
}
|
||||
|
||||
private static int[] getToggleParams(ToggleButtonGroup parent) {
|
||||
private int[] getToggleParams(ToggleButtonGroup parent) {
|
||||
String group = parent.getId();
|
||||
ObservableList<ToggleButton> toggles = parent.getToggles();
|
||||
int fileAddress;
|
||||
@ -213,13 +216,19 @@ public class IOPorts {
|
||||
return new int[]{fileAddress, bit, value};
|
||||
}
|
||||
|
||||
public static void reset() {
|
||||
public void reset() {
|
||||
trisLatch = new int[]{0xFF, 0xFF};
|
||||
dataLatch = new int[2];
|
||||
refreshPorts();
|
||||
}
|
||||
|
||||
public static void resetTRIS (){
|
||||
public void resetTRIS (){ // Only Backend
|
||||
trisLatch = new int[] {0xFF, 0xFF};
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
super.initialize(picComponents);
|
||||
System.out.println("IOPorts.\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,48 +1,58 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
public class Interrupts {
|
||||
private static final int INTCON = 0xB;
|
||||
private static final int T0IF = 0x2;
|
||||
private static final int ISR = 0x4;
|
||||
private static final int GIE = 0x7;
|
||||
private static final int T0IE = 0x5;
|
||||
private static final int RBIE = 0x3;
|
||||
private static final int RBIF = 0x0;
|
||||
private static final int INTEDG = 0x6;
|
||||
private static final int OPTION = 0x81;
|
||||
private static final int INTE = 0x4;
|
||||
private static final int INTF = 0x1;
|
||||
import eu.hansolo.tilesfx.Command;
|
||||
import fabrik.simulator.pic16f84.interfaces.CommandInterface;
|
||||
import fabrik.simulator.pic16f84.interfaces.DataRegisterInterface;
|
||||
import fabrik.simulator.pic16f84.interfaces.FrontendControllerInterface;
|
||||
import fabrik.simulator.pic16f84.interfaces.InterruptInterface;
|
||||
|
||||
public static void triggerTMR0(boolean manual) {
|
||||
public class Interrupts extends PICComponent implements InterruptInterface {
|
||||
private final int INTCON = 0xB;
|
||||
private final int T0IF = 0x2;
|
||||
private final int ISR = 0x4;
|
||||
private final int GIE = 0x7;
|
||||
private final int T0IE = 0x5;
|
||||
private final int RBIE = 0x3;
|
||||
private final int RBIF = 0x0;
|
||||
private final int INTEDG = 0x6;
|
||||
private final int OPTION = 0x81;
|
||||
private final int INTE = 0x4;
|
||||
private final int INTF = 0x1;
|
||||
|
||||
|
||||
public Interrupts () {
|
||||
}
|
||||
|
||||
public void triggerTMR0(boolean manual) {
|
||||
triggerInterrupt(T0IF, T0IE);
|
||||
if (manual)
|
||||
DataRegister.increasePC();
|
||||
dataRegister.increasePC();
|
||||
}
|
||||
|
||||
private static void triggerInterrupt(int flag, int enableFlag) {
|
||||
DataRegister.setBit(INTCON, flag);
|
||||
enableFlag = DataRegister.getDirectBit(INTCON, enableFlag);
|
||||
int globalFlag = DataRegister.getDirectBit(INTCON, GIE);
|
||||
private void triggerInterrupt(int flag, int enableFlag) {
|
||||
dataRegister.setBit(INTCON, flag);
|
||||
enableFlag = dataRegister.getDirectBit(INTCON, enableFlag);
|
||||
int globalFlag = dataRegister.getDirectBit(INTCON, GIE);
|
||||
if (enableFlag == 1) {
|
||||
Controller_Frontend.wakeUpFromSleep();
|
||||
frontendController.wakeUpFromSleep();
|
||||
if (globalFlag == 1) {
|
||||
DataRegister.clearBit(INTCON, GIE);
|
||||
Commands.CALL(ISR);
|
||||
dataRegister.clearBit(INTCON, GIE);
|
||||
commands.CALL(ISR);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void triggerRBInterrupt(int oldValue, int newValue) {
|
||||
public void triggerRBInterrupt(int oldValue, int newValue) {
|
||||
if (newValue != oldValue){
|
||||
triggerInterrupt(RBIF, RBIE);
|
||||
DataRegister.increasePC();
|
||||
dataRegister.increasePC();
|
||||
}
|
||||
}
|
||||
|
||||
public static void triggerRB0Interrupt(int oldValue, int newValue){
|
||||
public void triggerRB0Interrupt(int oldValue, int newValue){
|
||||
if (newValue != oldValue){
|
||||
int intedg = DataRegister.getDirectBit(OPTION, INTEDG);
|
||||
int intedg = dataRegister.getDirectBit(OPTION, INTEDG);
|
||||
if (intedg == 1) {
|
||||
if (oldValue == 0 && newValue == 1)
|
||||
triggerInterrupt(INTF, INTE);
|
||||
@ -50,9 +60,13 @@ public class Interrupts {
|
||||
if (oldValue == 1 && newValue == 0)
|
||||
triggerInterrupt(INTF, INTE);
|
||||
}
|
||||
DataRegister.increasePC();
|
||||
dataRegister.increasePC();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
super.initialize(picComponents);
|
||||
}
|
||||
}
|
||||
|
||||
35
src/main/java/fabrik/simulator/pic16f84/PICComponent.java
Normal file
35
src/main/java/fabrik/simulator/pic16f84/PICComponent.java
Normal file
@ -0,0 +1,35 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
|
||||
public abstract class PICComponent {
|
||||
DataRegisterInterface dataRegister;
|
||||
EEPROMInterface eeprom;
|
||||
PreScaler preScaler;
|
||||
IOPortInterface ioPorts;
|
||||
TimerInterface timer;
|
||||
InterruptInterface interrupts;
|
||||
//TableInterface table;
|
||||
//WindowManagement createWindow;
|
||||
FrontendControllerInterface frontendController;
|
||||
WatchdogTimerInterface watchdogTimer;
|
||||
ProgramStackInterface programStack;
|
||||
CommandInterface commands;
|
||||
ToggleButtonInterface toggleButtonExt;
|
||||
|
||||
void initialize(PICComponents picComponents) {
|
||||
toggleButtonExt = (ToggleButtonInterface) picComponents.getComponent(ToggleButtonInterface.class);
|
||||
dataRegister = (DataRegisterInterface) picComponents.getComponent(DataRegisterInterface.class);
|
||||
eeprom = (EEPROMInterface) picComponents.getComponent(EEPROMInterface.class);
|
||||
ioPorts = (IOPortInterface) picComponents.getComponent(IOPortInterface.class);
|
||||
preScaler = (PreScaler) picComponents.getComponent(PreScalerInterface.class);
|
||||
timer = (TimerInterface) picComponents.getComponent(TimerInterface.class);
|
||||
interrupts = (InterruptInterface) picComponents.getComponent(InterruptInterface.class);
|
||||
//table = (TableInterface) picComponents.getComponent(TableInterface.class);
|
||||
//createWindow = (WindowManagement) picComponents.getComponent(WindowManagement.class);
|
||||
frontendController = (FrontendControllerInterface) picComponents.getComponent(FrontendControllerInterface.class);
|
||||
watchdogTimer = (WatchdogTimerInterface) picComponents.getComponent(WatchdogTimerInterface.class);
|
||||
programStack = (ProgramStackInterface) picComponents.getComponent(ProgramStackInterface.class);
|
||||
commands = (CommandInterface) picComponents.getComponent(CommandInterface.class);
|
||||
}
|
||||
}
|
||||
27
src/main/java/fabrik/simulator/pic16f84/PICComponents.java
Normal file
27
src/main/java/fabrik/simulator/pic16f84/PICComponents.java
Normal file
@ -0,0 +1,27 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
public class PICComponents {
|
||||
private final HashMap<Class<? extends PICComponentInterface>, PICComponentInterface> componentCatalogue;
|
||||
|
||||
public PICComponents() {
|
||||
super();
|
||||
this.componentCatalogue = new HashMap<>();
|
||||
}
|
||||
|
||||
public void registerComponent (Class<? extends PICComponentInterface> componentClass, PICComponentInterface component) {
|
||||
this.componentCatalogue.put(componentClass, component);
|
||||
}
|
||||
|
||||
public PICComponentInterface getComponent(Class<? extends PICComponentInterface> componentClass) {
|
||||
return this.componentCatalogue.get(componentClass);
|
||||
}
|
||||
|
||||
public void initAll() {
|
||||
for (PICComponentInterface component : componentCatalogue.values()) component.initialize(this);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,42 +1,60 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
public class PreScaler {
|
||||
private static final int PSA = 0x3;
|
||||
private static final int OPTION = 0x81;
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
|
||||
private static int scaler = 0b111;
|
||||
public class PreScaler extends PICComponent implements PreScalerInterface {
|
||||
|
||||
public static boolean isPrescalerOnTimer (){
|
||||
return DataRegister.getDirectBit(OPTION, PSA) == 0;
|
||||
private final int PSA = 0x3;
|
||||
private final int OPTION = 0x81;
|
||||
private int scaler;
|
||||
|
||||
public PreScaler () {
|
||||
super();
|
||||
scaler = 0b111;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPrescalerOnTimer(){
|
||||
return dataRegister.getDirectBit(OPTION, PSA) == 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static int getScaler() {
|
||||
@Override
|
||||
public int getScaler() {
|
||||
return scaler;
|
||||
}
|
||||
|
||||
public static int getFactor () {
|
||||
int scale = DataRegister.getDirectRegister(OPTION) & 0b111;
|
||||
@Override
|
||||
public int getFactor() {
|
||||
int scale = dataRegister.getDirectRegister(OPTION) & 0b111;
|
||||
int timer = isPrescalerOnTimer() ? 1 : 0;
|
||||
return (int) Math.pow (2, scale+timer);
|
||||
}
|
||||
|
||||
public static void reset (){
|
||||
DataRegister.setDirectBit(OPTION, 0, 0);
|
||||
DataRegister.setDirectBit(OPTION, 1, 0);
|
||||
DataRegister.setDirectBit(OPTION, 2, 0);
|
||||
@Override
|
||||
public void reset(){
|
||||
dataRegister.setDirectBit(OPTION, 0, 0);
|
||||
dataRegister.setDirectBit(OPTION, 1, 0);
|
||||
dataRegister.setDirectBit(OPTION, 2, 0);
|
||||
}
|
||||
|
||||
public static void resetFromRegister() {
|
||||
@Override
|
||||
public void resetFromRegister() {
|
||||
scaler = getFactor();
|
||||
}
|
||||
|
||||
public static void decrement(boolean manual) {
|
||||
@Override
|
||||
public void decrement(boolean manual) {
|
||||
scaler--;
|
||||
if (scaler == 0) {
|
||||
scaler = getFactor();
|
||||
Timer.increment(manual);
|
||||
timer.increment(manual);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
super.initialize(picComponents);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
import fabrik.simulator.pic16f84.interfaces.ProgramStackInterface;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ProgramStack {
|
||||
private static List<Integer> returnStack = new ArrayList<>(8);
|
||||
private static int stackIndex = 0;
|
||||
public class ProgramStack extends PICComponent implements ProgramStackInterface {
|
||||
private List<Integer> returnStack = new ArrayList<>(8);
|
||||
private int stackIndex = 0;
|
||||
|
||||
private static void incIndex(){
|
||||
private void incIndex(){
|
||||
if (stackIndex == 7){
|
||||
stackIndex = 0;
|
||||
}
|
||||
@ -16,7 +18,7 @@ public class ProgramStack {
|
||||
}
|
||||
}
|
||||
|
||||
public static void push(int value) {
|
||||
public void push(int value) {
|
||||
if ((returnStack.size() != 8 ) && (returnStack.size() <= stackIndex)){
|
||||
returnStack.add(value);
|
||||
incIndex();
|
||||
@ -27,21 +29,26 @@ public class ProgramStack {
|
||||
}
|
||||
}
|
||||
|
||||
public static int pop() {
|
||||
public int pop() {
|
||||
stackIndex = (stackIndex > 0) ? --stackIndex : 7;
|
||||
return returnStack.get(stackIndex)-1;
|
||||
}
|
||||
|
||||
public static void reset (){
|
||||
public void reset (){
|
||||
returnStack.clear();
|
||||
stackIndex = 0;
|
||||
}
|
||||
|
||||
public static int getStackPointer(){
|
||||
public int getStackPointer(){
|
||||
return stackIndex;
|
||||
}
|
||||
|
||||
public static List<Integer> getStack() {
|
||||
public List<Integer> getStack() {
|
||||
return returnStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
super.initialize(picComponents);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.geometry.Insets;
|
||||
|
||||
@ -20,10 +21,14 @@ public class Table {
|
||||
|
||||
//Hier wird die Tabelle aktualisiert
|
||||
//Tabelle aktualisieren
|
||||
private static DataRegisterInterface dataRegister;
|
||||
private static CommandInterface commands;
|
||||
|
||||
private static final int NUM_COLUMNS = 8; // Anzahl der Spalten
|
||||
private static final double TABLE_WIDTH = 425; // Breite der TableView
|
||||
private static final double TABLE_HEIGHT = 600; // Höhe der TableView
|
||||
private static IOPortInterface ioPorts;
|
||||
private static PreScalerInterface preScaler;
|
||||
|
||||
private static String formatHex(String s) {
|
||||
return (s.length() == 1) ? "0" + s : s;
|
||||
@ -41,9 +46,17 @@ public class Table {
|
||||
return s;
|
||||
}
|
||||
|
||||
public static VBox init(PICComponents picComponents){
|
||||
dataRegister = (DataRegisterInterface) picComponents.getComponent(DataRegisterInterface.class);
|
||||
commands = (CommandInterface) picComponents.getComponent(CommandInterface.class);
|
||||
ioPorts = (IOPortInterface) picComponents.getComponent(IOPortInterface.class);
|
||||
preScaler = (PreScalerInterface) picComponents.getComponent(PreScalerInterface.class);
|
||||
return refresh();
|
||||
}
|
||||
|
||||
public static VBox refresh() {
|
||||
// Erstelle eine Instanz der DataRegister-Klasse
|
||||
|
||||
// Erstelle eine Instanz der dataRegister-Klasse
|
||||
|
||||
|
||||
// Erstelle eine TableView für die Datenanzeige
|
||||
@ -69,14 +82,14 @@ public class Table {
|
||||
}
|
||||
|
||||
// Fülle die TableView mit Daten aus dem Array
|
||||
int numRows = (int) Math.ceil((double) DataRegister.getDataRegister().length / NUM_COLUMNS);
|
||||
int numRows = (int) Math.ceil((double) dataRegister.getDataRegister().length / NUM_COLUMNS);
|
||||
for (int row = 0; row < numRows; row++) {
|
||||
DataEntry[] rowData = new DataEntry[NUM_COLUMNS];
|
||||
for (int col = 0; col < NUM_COLUMNS; col++) {
|
||||
int index = row * NUM_COLUMNS + col;
|
||||
if (index < DataRegister.getDataRegister().length) {
|
||||
if (index < dataRegister.getDataRegister().length) {
|
||||
String address = "0x" + formatHex(Integer.toHexString(index).toUpperCase());
|
||||
String value = "0x" + formatHex(Integer.toHexString(DataRegister.getDataRegister()[index]).toUpperCase());
|
||||
String value = "0x" + formatHex(Integer.toHexString(dataRegister.getDataRegister()[index]).toUpperCase());
|
||||
rowData[col] = new DataEntry(address, value);
|
||||
} else {
|
||||
rowData[col] = new DataEntry("", "");
|
||||
@ -89,17 +102,17 @@ public class Table {
|
||||
|
||||
Label spacing = new Label(" ");
|
||||
Label spacing2 = new Label(" ");
|
||||
Label wRegisterLabel = new Label("W-Register: 0x" + formatHex(Integer.toHexString(Commands.get_wRegister()).toUpperCase()));
|
||||
Label cLabel = new Label("Carry-Flag: " + DataRegister.getCarryFlag());
|
||||
Label dcLabel = new Label("DigitCarry-Flag: " + DataRegister.getDigitCarryFlag());
|
||||
Label zLabel = new Label("Zero-Flag: " + DataRegister.getZeroFlag());
|
||||
Label pcLabel = new Label("PC: 0x" + formatHex(Integer.toHexString(DataRegister.getPC()).toUpperCase()));
|
||||
Label pclLabel = new Label("PCL: 0x" + formatHex(Integer.toHexString(DataRegister.getRegister(DataRegister.getPCL())).toUpperCase()));
|
||||
Label pclathLabel = new Label("PCLATH: 0x" + formatHex(Integer.toHexString(DataRegister.getRegister(DataRegister.getPCLATH())).toUpperCase()));
|
||||
Label statusLabel = new Label("STATUS: 0b" + formatBin(Integer.toBinaryString(DataRegister.getRegister(DataRegister.getSTATUS())))+ " (0x" + formatHex(Integer.toHexString(DataRegister.getRegister(DataRegister.getSTATUS())).toUpperCase()) + ")");
|
||||
Label fsrLabel = new Label("FSR: 0x" + formatHex(Integer.toHexString(DataRegister.getFSR()).toUpperCase()));
|
||||
Label prescalerLabel = new Label("Prescaler: 0x" + formatHex(Integer.toHexString(PreScaler.getScaler())).toUpperCase());
|
||||
Label intconLabel = new Label("INTCON: 0b" + formatBin(Integer.toBinaryString(DataRegister.getRegister(DataRegister.getINTCON()))) + " (0x" + formatHex(Integer.toHexString(DataRegister.getRegister(DataRegister.getINTCON())).toUpperCase()) + ")");
|
||||
Label wRegisterLabel = new Label("W-Register: 0x" + formatHex(Integer.toHexString(commands.get_wRegister()).toUpperCase()));
|
||||
Label cLabel = new Label("Carry-Flag: " + dataRegister.getCarryFlag());
|
||||
Label dcLabel = new Label("DigitCarry-Flag: " + dataRegister.getDigitCarryFlag());
|
||||
Label zLabel = new Label("Zero-Flag: " + dataRegister.getZeroFlag());
|
||||
Label pcLabel = new Label("PC: 0x" + formatHex(Integer.toHexString(dataRegister.getPC()).toUpperCase()));
|
||||
Label pclLabel = new Label("PCL: 0x" + formatHex(Integer.toHexString(dataRegister.getRegister(dataRegister.getPCL())).toUpperCase()));
|
||||
Label pclathLabel = new Label("PCLATH: 0x" + formatHex(Integer.toHexString(dataRegister.getRegister(dataRegister.getPCLATH())).toUpperCase()));
|
||||
Label statusLabel = new Label("STATUS: 0b" + formatBin(Integer.toBinaryString(dataRegister.getRegister(dataRegister.getSTATUS())))+ " (0x" + formatHex(Integer.toHexString(dataRegister.getRegister(dataRegister.getSTATUS())).toUpperCase()) + ")");
|
||||
Label fsrLabel = new Label("FSR: 0x" + formatHex(Integer.toHexString(dataRegister.getFSR()).toUpperCase()));
|
||||
Label prescalerLabel = new Label("Prescaler: 0x" + formatHex(Integer.toHexString(preScaler.getScaler())).toUpperCase());
|
||||
Label intconLabel = new Label("INTCON: 0b" + formatBin(Integer.toBinaryString(dataRegister.getRegister(dataRegister.getINTCON()))) + " (0x" + formatHex(Integer.toHexString(dataRegister.getRegister(dataRegister.getINTCON())).toUpperCase()) + ")");
|
||||
wRegisterLabel.setStyle("-fx-font-weight: bold");
|
||||
pcLabel.setStyle("-fx-font-weight: bold");
|
||||
statusLabel.setStyle("-fx-font-weight: bold");
|
||||
@ -129,8 +142,8 @@ public class Table {
|
||||
}
|
||||
|
||||
private static void triggerReset() {
|
||||
DataRegister.initDataRegister();
|
||||
IOPorts.refreshUI(Controller_Frontend.getTRISbuttons(), Controller_Frontend.getPORTbuttons());
|
||||
dataRegister.initDataRegister();
|
||||
ioPorts.refreshUI(Controller_Frontend.getTRISbuttons(), Controller_Frontend.getPORTbuttons());
|
||||
CreateWindow.refreshTable();
|
||||
}
|
||||
|
||||
|
||||
@ -1,19 +1,26 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
public class Timer {
|
||||
private static final int TIMERREG = 0x1;
|
||||
private static final int T0SE = 0x4;
|
||||
private static final int T0CS = 0x5;
|
||||
private static final int OPTION = 0x81;
|
||||
import fabrik.simulator.pic16f84.interfaces.DataRegisterInterface;
|
||||
import fabrik.simulator.pic16f84.interfaces.FrontendControllerInterface;
|
||||
import fabrik.simulator.pic16f84.interfaces.InterruptInterface;
|
||||
import fabrik.simulator.pic16f84.interfaces.TimerInterface;
|
||||
|
||||
private static int oldpin = 0;
|
||||
public class Timer extends PICComponent implements TimerInterface {
|
||||
private final int TIMERREG = 0x1;
|
||||
private final int T0SE = 0x4;
|
||||
private final int T0CS = 0x5;
|
||||
private final int OPTION = 0x81;
|
||||
|
||||
private int oldpin = 0;
|
||||
|
||||
public static void cycles(int cycles){
|
||||
if (DataRegister.getDirectBit(OPTION, T0CS) == 0){
|
||||
if (PreScaler.isPrescalerOnTimer()){
|
||||
public Timer (){
|
||||
}
|
||||
|
||||
public void cycles(int cycles){
|
||||
if (dataRegister.getDirectBit(OPTION, T0CS) == 0){
|
||||
if (preScaler.isPrescalerOnTimer()){
|
||||
for (int i = 0; i < cycles; i++){
|
||||
PreScaler.decrement(false);
|
||||
preScaler.decrement(false);
|
||||
}
|
||||
} else {
|
||||
increment(false);
|
||||
@ -22,23 +29,23 @@ public class Timer {
|
||||
}
|
||||
|
||||
|
||||
public static void incrementFromPin (int register){
|
||||
if ((DataRegister.getDirectBit(OPTION, T0CS) == 1) && !Controller_Frontend.isSleeping()){
|
||||
public void incrementFromPin (int register){
|
||||
if ((dataRegister.getDirectBit(OPTION, T0CS) == 1) && !frontendController.isSleeping()){
|
||||
int newpin = (register >> 4) & 1;
|
||||
if (newpin != oldpin) {
|
||||
if (DataRegister.getDirectBit(OPTION, T0SE) == 0) {
|
||||
if (dataRegister.getDirectBit(OPTION, T0SE) == 0) {
|
||||
// Low to high
|
||||
if (newpin == 1 && oldpin == 0) {
|
||||
if (PreScaler.isPrescalerOnTimer())
|
||||
PreScaler.decrement(true);
|
||||
if (preScaler.isPrescalerOnTimer())
|
||||
preScaler.decrement(true);
|
||||
else
|
||||
increment(true);
|
||||
}
|
||||
} else {
|
||||
// High to low
|
||||
if (newpin == 0 && oldpin == 1) {
|
||||
if (PreScaler.isPrescalerOnTimer())
|
||||
PreScaler.decrement(true);
|
||||
if (preScaler.isPrescalerOnTimer())
|
||||
preScaler.decrement(true);
|
||||
else
|
||||
increment(true);
|
||||
}
|
||||
@ -48,14 +55,19 @@ public class Timer {
|
||||
}
|
||||
}
|
||||
|
||||
public static void increment(boolean manual) {
|
||||
int timer = DataRegister.getDirectRegister(TIMERREG);
|
||||
public void increment(boolean manual) {
|
||||
int timer = dataRegister.getDirectRegister(TIMERREG);
|
||||
timer++;
|
||||
if (timer > 0xFF){
|
||||
Interrupts.triggerTMR0(manual);
|
||||
DataRegister.setDirectRegister(TIMERREG, 0);
|
||||
interrupts.triggerTMR0(manual);
|
||||
dataRegister.setDirectRegister(TIMERREG, 0);
|
||||
} else {
|
||||
DataRegister.setDirectRegister(1, timer);
|
||||
dataRegister.setDirectRegister(1, timer);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
super.initialize(picComponents);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
import com.gluonhq.charm.glisten.control.ToggleButtonGroup;
|
||||
import fabrik.simulator.pic16f84.interfaces.IOPortInterface;
|
||||
import fabrik.simulator.pic16f84.interfaces.ToggleButtonInterface;
|
||||
import javafx.collections.ListChangeListener;
|
||||
import javafx.event.EventHandler;
|
||||
import javafx.scene.control.Toggle;
|
||||
@ -9,17 +11,12 @@ import javafx.scene.input.MouseEvent;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class ToggleButtonGroupExt {
|
||||
public class ToggleButtonGroupExt extends PICComponent implements ToggleButtonInterface {
|
||||
|
||||
|
||||
private static ToggleButtonGroupExt me;
|
||||
|
||||
private ToggleButtonGroupExt() {
|
||||
}
|
||||
|
||||
public static ToggleButtonGroupExt get() {
|
||||
if (me == null) {
|
||||
me = new ToggleButtonGroupExt();
|
||||
}
|
||||
return me;
|
||||
public ToggleButtonGroupExt() {
|
||||
}
|
||||
|
||||
|
||||
@ -45,14 +42,14 @@ public class ToggleButtonGroupExt {
|
||||
ToggleButtonGroup parent = (ToggleButtonGroup) ((ToggleButton) mouseEvent.getSource()).getParent();
|
||||
if (parent.getId().contains("TRIS")) {
|
||||
try {
|
||||
IOPorts.setTRISfromUI(parent);
|
||||
ioPorts.setTRISfromUI(parent);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
else {
|
||||
try {
|
||||
IOPorts.setPORTfromUI(parent);
|
||||
ioPorts.setPORTfromUI(parent);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
@ -60,4 +57,10 @@ public class ToggleButtonGroupExt {
|
||||
mouseEvent.consume();
|
||||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
System.out.println("ToggleButtonGroupExt");
|
||||
super.initialize(picComponents);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,49 +1,59 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
|
||||
public class WatchdogTimer {
|
||||
private static long watchdogTime;
|
||||
private static long lastReset = 0;
|
||||
private static boolean enabled = false;
|
||||
private static long rawtimer = 0;
|
||||
private static long realtimer = 0;
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
|
||||
private static long getTimeFromRegister() {
|
||||
return (PreScaler.isPrescalerOnTimer()) ? 18L : PreScaler.getFactor() * 18L;
|
||||
public class WatchdogTimer extends PICComponent implements WatchdogTimerInterface {
|
||||
private long watchdogTime;
|
||||
private double lastReset = 0;
|
||||
private boolean enabled = false;
|
||||
private long rawtimer = 0;
|
||||
private long realtimer = 0;
|
||||
|
||||
public WatchdogTimer(){
|
||||
}
|
||||
|
||||
public static void testAndTrigger() {
|
||||
private long getTimeFromRegister() {
|
||||
return (preScaler.isPrescalerOnTimer()) ? 18L : preScaler.getFactor() * 18L;
|
||||
}
|
||||
|
||||
public void testAndTrigger() {
|
||||
watchdogTime = getTimeFromRegister() * 1000;
|
||||
if (enabled) {
|
||||
if (realtimer >= (watchdogTime + lastReset - 1)) {
|
||||
DataRegister.clearBit(3, 4);
|
||||
lastReset = Commands.getTotalExecutionTime();
|
||||
Controller_Frontend.stopRunFromBackend("Watchdog Timer");
|
||||
dataRegister.clearBit(3, 4);
|
||||
lastReset = commands.getTotalExecutionTime();
|
||||
frontendController.stopRunFromBackend("Watchdog Timer");
|
||||
}
|
||||
else {
|
||||
rawtimer++;
|
||||
realtimer = (long) (rawtimer * Controller_Frontend.getExecutionTimeMultiplier());
|
||||
realtimer = (long) (rawtimer * frontendController.getExecutionTimeMultiplier());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void reset (){
|
||||
lastReset = Commands.getTotalExecutionTime();
|
||||
public void reset (){
|
||||
lastReset = commands.getTotalExecutionTime();
|
||||
rawtimer = 0;
|
||||
realtimer = 0;
|
||||
PreScaler.reset();
|
||||
DataRegister.setBit(3, 3);
|
||||
DataRegister.setBit(3, 4);
|
||||
preScaler.reset();
|
||||
dataRegister.setBit(3, 3);
|
||||
dataRegister.setBit(3, 4);
|
||||
}
|
||||
|
||||
public static void enable() {
|
||||
public void enable() {
|
||||
enabled = true;
|
||||
}
|
||||
|
||||
public static void disable() {
|
||||
public void disable() {
|
||||
enabled = false;
|
||||
}
|
||||
|
||||
public static long get (){
|
||||
public long get (){
|
||||
return realtimer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(PICComponents picComponents) {
|
||||
super.initialize(picComponents);
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
public interface CommandInterface extends PICComponentInterface {
|
||||
void CALL(int isr);
|
||||
|
||||
double getTotalExecutionTime();
|
||||
|
||||
int get_wRegister();
|
||||
|
||||
void decode(int i);
|
||||
|
||||
void resetTotalExecutionTime();
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
public interface DataRegisterInterface extends PICComponentInterface {
|
||||
void clearBit(int f, int b);
|
||||
|
||||
void setBit(int f, int b);
|
||||
|
||||
void setPC(int pop);
|
||||
|
||||
int getINTCON();
|
||||
|
||||
int getPC();
|
||||
|
||||
void setRegister(int file, int wRegister);
|
||||
|
||||
void determineZeroFlag(int wRegister);
|
||||
|
||||
int getRegister(int file);
|
||||
|
||||
void setCarryFlag(int i);
|
||||
|
||||
void setDigitCarryFlag(int i);
|
||||
|
||||
int getCarryFlag();
|
||||
|
||||
void determineCarryFlag(int result);
|
||||
|
||||
void increasePC();
|
||||
|
||||
void determineDigitCarryFlag(int i);
|
||||
|
||||
int getBit(int address, int bit);
|
||||
|
||||
int getDirectBit(int option, int psa);
|
||||
|
||||
int getDirectRegister(int option);
|
||||
|
||||
void setDirectBit(int option, int i, int i1);
|
||||
|
||||
void setDirectRegister(int porta, int i);
|
||||
|
||||
void resetPC();
|
||||
|
||||
int[] getDataRegister();
|
||||
|
||||
int getDigitCarryFlag();
|
||||
|
||||
int getZeroFlag();
|
||||
|
||||
int getFSR();
|
||||
|
||||
void initDataRegister();
|
||||
|
||||
int getPCL();
|
||||
|
||||
int getPCLATH();
|
||||
|
||||
int getSTATUS();
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
public interface EEPROMInterface extends PICComponentInterface {
|
||||
void registerTime(boolean b);
|
||||
|
||||
void parse(int i, int content, int i1);
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
public interface FrontendControllerInterface extends PICComponentInterface {
|
||||
double getExecutionTimeMultiplier();
|
||||
|
||||
void sleep();
|
||||
|
||||
void wakeUpFromSleep();
|
||||
|
||||
boolean isSleeping();
|
||||
|
||||
void stopRunFromBackend(String watchdogTimer);
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
import com.gluonhq.charm.glisten.control.ToggleButtonGroup;
|
||||
import javafx.scene.shape.Circle;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public interface IOPortInterface extends PICComponentInterface {
|
||||
void resetTRIS();
|
||||
|
||||
void setRegister(int i, int content);
|
||||
|
||||
void clearBit(int i, int bit);
|
||||
|
||||
void setBit(int i, int bit);
|
||||
|
||||
void setPORTfromUI(ToggleButtonGroup parent) throws IOException;
|
||||
|
||||
void setTRISfromUI(ToggleButtonGroup parent) throws IOException;
|
||||
|
||||
void refreshUI(ToggleButtonGroup[] triSbuttons, ToggleButtonGroup[] porTbuttons);
|
||||
|
||||
void reset();
|
||||
|
||||
void setLEDs(Circle[] allLEDsA, Circle[] allLEDsB);
|
||||
|
||||
void setLEDs(boolean[] booleans);
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
public interface InterruptInterface extends PICComponentInterface {
|
||||
void triggerRBInterrupt(int oldValue, int value);
|
||||
|
||||
void triggerRB0Interrupt(int oldValue, int value);
|
||||
|
||||
void triggerTMR0(boolean manual);
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
import fabrik.simulator.pic16f84.PICComponents;
|
||||
|
||||
public interface PICComponentInterface {
|
||||
void initialize(PICComponents picComponents);
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
public interface PreScalerInterface extends PICComponentInterface{
|
||||
boolean isPrescalerOnTimer();
|
||||
|
||||
int getScaler();
|
||||
|
||||
int getFactor();
|
||||
|
||||
void reset();
|
||||
|
||||
void resetFromRegister();
|
||||
|
||||
void decrement(boolean manual);
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface ProgramStackInterface extends PICComponentInterface {
|
||||
int pop();
|
||||
|
||||
void push(int i);
|
||||
|
||||
void reset();
|
||||
|
||||
int getStackPointer();
|
||||
|
||||
List<Integer> getStack();
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
import javafx.scene.layout.VBox;
|
||||
|
||||
public interface TableInterface extends PICComponentInterface {
|
||||
VBox refresh();
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
public interface TimerInterface extends PICComponentInterface {
|
||||
void cycles(int i);
|
||||
|
||||
void incrementFromPin(int directRegister);
|
||||
|
||||
void increment(boolean manual);
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
import com.gluonhq.charm.glisten.control.ToggleButtonGroup;
|
||||
|
||||
public interface ToggleButtonInterface extends PICComponentInterface {
|
||||
void addAlwaysOneSelectedSupport(ToggleButtonGroup allTRISButton);
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
public interface WatchdogTimerInterface extends PICComponentInterface {
|
||||
void reset();
|
||||
|
||||
void testAndTrigger();
|
||||
|
||||
void enable();
|
||||
|
||||
void disable();
|
||||
|
||||
long get();
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package fabrik.simulator.pic16f84.interfaces;
|
||||
|
||||
public interface WindowManagement extends PICComponentInterface {
|
||||
void refreshTable();
|
||||
}
|
||||
@ -12,4 +12,6 @@ module fabrik.simulator.pic16f84 {
|
||||
|
||||
opens fabrik.simulator.pic16f84 to javafx.fxml;
|
||||
exports fabrik.simulator.pic16f84;
|
||||
exports fabrik.simulator.pic16f84.interfaces;
|
||||
opens fabrik.simulator.pic16f84.interfaces to javafx.fxml;
|
||||
}
|
||||
@ -11,7 +11,7 @@
|
||||
<?import javafx.scene.shape.*?>
|
||||
<?import javafx.scene.text.*?>
|
||||
|
||||
<AnchorPane stylesheets="@styles.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fabrik.simulator.pic16f84.Controller_Frontend">
|
||||
<AnchorPane stylesheets="@styles.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1">
|
||||
|
||||
<children>
|
||||
<ListView fx:id="lstContentListView" layoutY="31.0" prefHeight="645.0" prefWidth="600.0">
|
||||
|
||||
Reference in New Issue
Block a user