paul/PIC-Simu
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flags

Browse Source
This commit is contained in:
Paul Martin
2024-04-23 10:09:01 +02:00
parent 59c77f8b8a
commit dcfc8c8012
3 changed files with 234 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/main/java/fabrik/simulator/pic16f84/Commands.java
View File

@ -8,11 +8,11 @@ public class Commands {
}
public static void decode(int instruction){
int jumpaddr = 0x7FF;
int fileregaddr = 0x7F;
int constant = 0xFF;
int bitaddr = 0x380;
int destinationbit = 0x80;
final int jumpaddr = 0x7FF;
final int fileregaddr = 0x7F;
final int constant = 0xFF;
final int bitaddr = 0x380;
final int destinationbit = 0x80;
int d = (instruction & destinationbit) >> 7;
int f = instruction & fileregaddr;
@ -116,6 +116,10 @@ public class Commands {
System.out.println("RLF: " + f + " " + d);
RLF (f, d);
return;
case 0b00110000000000:
System.out.println("RRF: " + f + " " + d);
RRF (f, d);
return;
case 0b00001000000000:
System.out.println("SUBWF: " + f + " " + d);
SUBWF (f, d);
@ -206,27 +210,27 @@ public class Commands {
public static void CLRW() {
wRegister = 0;
//TODO: Zeroflag
DataRegister.determineZeroFlag(wRegister);
}
public static void CLRF(int file) {
DataRegister.setRegister(file, 0);
//TODO: Zeroflag
DataRegister.determineZeroFlag(DataRegister.getRegister(file));
}
public static void IORLW(int literal) {
wRegister |= literal;
//TODO: Zeroflag
DataRegister.determineZeroFlag(wRegister);
}
public static void XORLW(int literal) {
wRegister ^= literal;
//TODO: Zeroflag
DataRegister.determineZeroFlag(wRegister);
}
public static void ANDLW(int literal) {
wRegister &= literal;
//TODO: Zeroflag
DataRegister.determineZeroFlag(wRegister);
}
public static void XORWF(int file, int destination) {
@ -237,7 +241,7 @@ public class Commands {
else {
DataRegister.setRegister(file, result);
}
//TODO: Zeroflag
DataRegister.determineZeroFlag(result);
}
public static void SWAPF(int file, int destination) {
@ -252,18 +256,49 @@ public class Commands {
}
public static void SUBWF(int file, int destination) {
int result = (DataRegister.getRegister(file) - wRegister) & 0xFF;
if (destination == 0){
wRegister = result;
int result = (DataRegister.getRegister(file) - wRegister) ;
if (wRegister == 0 || result >= 0){
DataRegister.setCarryFlag(1);
DataRegister.setDigitCarryFlag(1);
}
else {
DataRegister.setRegister(file, result);
DataRegister.setCarryFlag(0);
DataRegister.setDigitCarryFlag(0);
}
// TODO Zeroflag, Carry, DigitCarry
if (destination == 0){
wRegister = result & 0xFF;
}
else {
DataRegister.setRegister(file, result & 0xFF);
}
DataRegister.determineZeroFlag(result);
}
public static void RLF(int file, int destination) {
// TODO
int fcontent = DataRegister.getRegister(file);
int carry = DataRegister.getCarryFlag();
int result = (fcontent << 1) | carry;
DataRegister.determineCarryFlag(result);
if (destination == 0){
wRegister = result & 0xFF;
}
else {
DataRegister.setRegister(file, result & 0xFF);
}
}
public static 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);
if (destination == 0){
wRegister = result & 0xFF;
}
else {
DataRegister.setRegister(file, result & 0xFF);
}
}
public static void MOVF(int file, int destination) {
@ -274,7 +309,7 @@ public class Commands {
else {
DataRegister.setRegister(file, content);
}
// TODO: Zeroflag
DataRegister.determineZeroFlag(content);
}
public static void IORWF(int file, int destination) {
@ -285,7 +320,7 @@ public class Commands {
else {
DataRegister.setRegister(file, result);
}
// TODO: Zeroflag
DataRegister.determineZeroFlag(result);
}
public static void INCFSZ(int file, int destination) {
@ -309,7 +344,7 @@ public class Commands {
else {
DataRegister.setRegister(file, result);
}
//TODO: Zeroflag
DataRegister.determineZeroFlag(result);
}
public static void DECFSZ(int file, int destination) {
@ -333,7 +368,7 @@ public class Commands {
else {
DataRegister.setRegister(file, result);
}
// TODO: Zeroflag
DataRegister.determineZeroFlag(result);
}
private static void COMF(int file, int destination) {
@ -344,39 +379,62 @@ public class Commands {
else {
DataRegister.setRegister(file, result);
}
// TODO: Zeroflag
DataRegister.determineZeroFlag(result);
}
public static void ANDWF(int file, int destination) {
int result = wRegister & DataRegister.getRegister(file);
if (destination == 0){
wRegister = result;
wRegister = result & 0xFF;
}
else {
DataRegister.setRegister(file, result);
DataRegister.setRegister(file, result & 0xFF);
}
// TODO: Zeroflag, Carry, DigitCarry
DataRegister.determineZeroFlag(result);
DataRegister.determineCarryFlag(result);
DataRegister.determineDigitCarryFlag(result);
}
public static void ADDWF(int file, int destination) {
int result = wRegister + DataRegister.getRegister(file);
if (destination == 0) {
wRegister = result;
if (wRegister == 0 || DataRegister.getRegister(file) == 0){
DataRegister.setCarryFlag(0);
DataRegister.setDigitCarryFlag(0);
}
else {
DataRegister.setRegister(file, result);
DataRegister.determineCarryFlag(result);
DataRegister.determineDigitCarryFlag(result);
}
// TODO: Zeroflag, Carry, DigitCarry
if (destination == 0) {
wRegister = result & 0xFF;
}
else {
DataRegister.setRegister(file, result & 0xFF);
}
DataRegister.determineZeroFlag(result);
}
public static void SUBLW(int literal) {
wRegister = literal - wRegister;
// TODO: Zeroflag, Carry, DigitCarry
int result = literal - wRegister;
if (wRegister == 0 || result >= 0){
DataRegister.setCarryFlag(1);
DataRegister.setDigitCarryFlag(1);
}
else {
DataRegister.setCarryFlag(0);
DataRegister.setDigitCarryFlag(0);
}
wRegister = result & 0xFF;
DataRegister.determineZeroFlag(result);
}
public static void ADDLW(int literal) {
wRegister += literal;
// TODO: Zeroflag, Carry, DigitCarry
int result = wRegister + literal;
wRegister = result & 0xFF;
DataRegister.determineZeroFlag(result);
DataRegister.determineCarryFlag(result);
DataRegister.determineDigitCarryFlag(result);
}
public static void RETLW(int literal) {