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

Merge branch 'refs/heads/paul-zwischenstand'

Browse Source
This commit is contained in:
Paul Martin
2024-05-02 00:30:01 +02:00
parent 842f26c912 f932a141ce
commit f1fe3ecd22
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/fabrik/simulator/pic16f84/DataRegister.java
View File

@ -78,7 +78,7 @@ public class DataRegister {
public static void setRegister(int fileAddress, int content){ public static void setRegister(int fileAddress, int content){
int address = determineIndirectAndChange (fileAddress); int address = determineIndirectAndChange (fileAddress);
if (Arrays.stream(ioRegisters).anyMatch(i -> i == address)){ if (Arrays.stream(ioRegisters).anyMatch(i -> i == address)){
IOPorts.setRegister(address, content); IOPorts.setRegister(bank() + address, content);
return; return;
} }
if (fileAddress == PCL || fileAddress == 0x80 + PCL){ if (fileAddress == PCL || fileAddress == 0x80 + PCL){
@ -104,7 +104,7 @@ public class DataRegister {
public static void clearBit(int fileAddress, int bit) { public static void clearBit(int fileAddress, int bit) {
int address = determineIndirectAndChange (fileAddress); int address = determineIndirectAndChange (fileAddress);
if (Arrays.stream(ioRegisters).anyMatch(i -> i == address)){ if (Arrays.stream(ioRegisters).anyMatch(i -> i == address)){
IOPorts.clearBit(address, bit); IOPorts.clearBit(bank() + address, bit);
return; return;
} }
if (!isSyncedRegister(address)) { if (!isSyncedRegister(address)) {
@ -123,7 +123,7 @@ public class DataRegister {
public static void setBit(int fileAddress, int bit) { public static void setBit(int fileAddress, int bit) {
int address = determineIndirectAndChange (fileAddress); int address = determineIndirectAndChange (fileAddress);
if (Arrays.stream(ioRegisters).anyMatch(i -> i == address)){ if (Arrays.stream(ioRegisters).anyMatch(i -> i == address)){
IOPorts.setBit(address, bit); IOPorts.setBit(bank() + address, bit);
return; return;
} }
if (!isSyncedRegister(address)) { if (!isSyncedRegister(address)) {

20
src/main/java/fabrik/simulator/pic16f84/IOPorts.java
View File

@ -13,25 +13,23 @@ public class IOPorts {
public static void setBit (int address, int bit){ public static void setBit (int address, int bit){
if (address < 7) { if (address < 7) {
dataLatch[address - 5] |= (1 << bit); dataLatch[address - PORTA] |= (1 << bit);
} }
else{ else{
trisLatch[address - 0x85] |= (1 << bit); trisLatch[address - TRISA] |= (1 << bit);
} }
refreshPorts(); refreshPorts();
} }
public static void clearBit(int address, int bit) { public static void clearBit(int address, int bit) {
if (address < 7) { if (address < 7) {
if (DataRegister.getDirectBit(address, bit) == 1) { if (((dataLatch[address-PORTA] >> bit)&1) == 1){
int register = DataRegister.getDirectRegister(address); dataLatch[address-PORTA] -= (int) Math.pow(2, bit);
dataLatch[address-A] = register - (int) Math.pow(2, bit);
} }
} }
else{ else{
if (DataRegister.getDirectBit(address, bit) == 1) { if (DataRegister.getDirectBit(address, bit) == 1) {
int register = DataRegister.getDirectRegister(address); trisLatch[address-TRISA] -= (int) Math.pow(2, bit);
trisLatch[address-A] = register - (int) Math.pow(2, bit);
} }
} }
refreshPorts(); refreshPorts();
@ -39,16 +37,16 @@ public class IOPorts {
public static void setRegister(int address, int content) { public static void setRegister(int address, int content) {
if (address < 7) { if (address < 7) {
dataLatch[address - 5] = content; dataLatch[address - PORTA] = content;
} }
else{ else{
trisLatch[address - 0x85] = content; trisLatch[address - TRISA] = content;
} }
refreshPorts(); refreshPorts();
} }
private static void refreshPorts() { private static void refreshPorts() {
DataRegister.setDirectRegister(PORTA, (~((~dataLatch[A])&0xFF | trisLatch[A])) & 0x1F); System.out.println("PORTA: " + DataRegister.getDirectRegister(PORTA) + "; DATALATCHA: " + dataLatch[A] + "; TRISA: " + trisLatch[A]);
DataRegister.setDirectRegister(PORTB, (~((~dataLatch[B])&0xFF | trisLatch[B])) & 0xFF); System.out.println("PORTB: " + DataRegister.getDirectRegister(PORTB) + "; DATALATCHB: " + dataLatch[B] + "; TRISB: " + trisLatch[B]);
} }
} }

2
src/main/java/fabrik/simulator/pic16f84/ProgramStack.java
View File

@ -17,7 +17,7 @@ public class ProgramStack {
} }
public static void push(int value) { public static void push(int value) {
if (returnStack.size() != 8) { if ((returnStack.size() != 8 ) && (returnStack.size() <= stackIndex)){
returnStack.add(value); returnStack.add(value);
incIndex(); incIndex();
} }