Dependency inversions
This commit is contained in:
@ -1,37 +1,50 @@
|
||||
package fabrik.simulator.pic16f84;
|
||||
import fabrik.simulator.pic16f84.interfaces.*;
|
||||
|
||||
public class Commands {
|
||||
private static int wRegister = 0;
|
||||
public class Commands implements CommandInterface {
|
||||
private int wRegister;
|
||||
private long totalExecutionTime;
|
||||
|
||||
static long totalExecutionTime = 0;
|
||||
private final TimerInterface timer;
|
||||
private final EEPROMInterface eeprom;
|
||||
private final WatchdogTimerInterface watchdogTimer;
|
||||
private final ProgramStackInterface programStack;
|
||||
private final DataRegisterInterface dataRegister;
|
||||
private final FrontendControllerInterface frontendController;
|
||||
|
||||
|
||||
public Commands(TimerInterface timer, EEPROMInterface eeprom, WatchdogTimerInterface watchdogTimer,
|
||||
ProgramStackInterface programStack, DataRegisterInterface dataRegister, FrontendControllerInterface frontendController) {
|
||||
wRegister = 0;
|
||||
totalExecutionTime = 0;
|
||||
this.timer = timer;
|
||||
this.eeprom = eeprom;
|
||||
this.watchdogTimer = watchdogTimer;
|
||||
this.programStack = programStack;
|
||||
this.dataRegister = dataRegister;
|
||||
this.frontendController = frontendController;
|
||||
}
|
||||
|
||||
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 +75,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 +236,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 +245,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,308 +266,308 @@ 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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user