Darkress/pic16f84-sim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored incCycle command

Browse Source
This commit is contained in:
Darkress
2023-06-16 20:04:50 +02:00
parent bf182815d2
commit 324912080d
32 changed files with 71 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
de/darkress/pic16f84sim/commands/Addlw.java
View File

@@ -16,6 +16,8 @@ public class Addlw extends LiteralCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = literal + Memory.workingRegister;
checkZeroBit(result);
@@ -23,7 +25,5 @@ public class Addlw extends LiteralCommandUtils implements Command
checkDigitCarryBit(literal);
Memory.workingRegister = result % 256;
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Addwf.java
View File

@@ -18,6 +18,8 @@ public class Addwf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address) + Memory.workingRegister;
checkZeroBit(result);
@@ -25,7 +27,5 @@ public class Addwf extends FileRegisterCommandUtils implements Command
checkDigitCarryBit(address);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Andlw.java
View File

@@ -15,12 +15,12 @@ public class Andlw extends LiteralCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = literal & Memory.workingRegister;
checkZeroBit(result);
Memory.workingRegister = result % 256;
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Andwf.java
View File

@@ -18,12 +18,12 @@ public class Andwf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address) & Memory.workingRegister;
checkZeroBit(result);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Bcf.java
View File

@@ -18,11 +18,11 @@ public class Bcf extends BitOrientedCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address);
result &= ~(1 << bitPlacement); //Mask n-th bit with 0
Memory.setRegister(address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Bsf.java
View File

@@ -18,11 +18,11 @@ public class Bsf extends BitOrientedCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address);
result |= (1 << bitPlacement);
Memory.setRegister(address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

11
de/darkress/pic16f84sim/commands/Btfsc.java
View File

@@ -18,15 +18,14 @@ public class Btfsc extends BitOrientedCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address);
if((result & (1 << bitPlacement)) == 0) //Test if bit is clear
{
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
ProgramCounter.incPC();
Cycles.addToCycles(1);
Nop nop = new Nop();
nop.execute();
}
}
}

11
de/darkress/pic16f84sim/commands/Btfss.java
View File

@@ -18,15 +18,14 @@ public class Btfss extends BitOrientedCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address);
if((result & (1 << bitPlacement)) > 0) //Test if bit is set
{
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
ProgramCounter.incPC();
Cycles.addToCycles(1);
Nop nop = new Nop();
nop.execute();
}
}
}

3
de/darkress/pic16f84sim/commands/Call.java
View File

@@ -16,8 +16,9 @@ public class Call extends LiteralCommandUtils implements Command
@Override
public void execute()
{
Cycles.incCycles();
Stack.push(ProgramCounter.getPc() + 1);
ProgramCounter.setPcFrom11BitLiteral(literal);
Cycles.addToCycles(2);
Cycles.incCycles(); //Simulate nop and 2-Cycle instruction
}
}

5
de/darkress/pic16f84sim/commands/Clrf.java
View File

@@ -1,7 +1,6 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Cycles;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Clrf extends FileRegisterCommandUtils implements Command
@@ -18,12 +17,12 @@ public class Clrf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
final int result = 0;
checkZeroBit(result);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Clrw.java
View File

@@ -9,12 +9,12 @@ public class Clrw extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
final int result = 0;
checkZeroBit(result);
Memory.workingRegister = result;
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Comf.java
View File

@@ -18,12 +18,12 @@ public class Comf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = 255 - Memory.getRegister(address); // Get inverse of 8Bit value
checkZeroBit(result);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Decf.java
View File

@@ -18,12 +18,12 @@ public class Decf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address) + 255; // Allow underflow
checkZeroBit(result);
writeToDestination(destinationBit, address, result % 256); // Catch underflow
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

10
de/darkress/pic16f84sim/commands/Decfsz.java
View File

@@ -18,6 +18,8 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address) + 255; // Allow underflow
checkZeroBit(result);
@@ -26,10 +28,8 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
if((result % 256) == 0)
{
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
ProgramCounter.incPC();
Cycles.addToCycles(1);
Nop nop = new Nop();
nop.execute();
}
}
}

3
de/darkress/pic16f84sim/commands/Goto.java
View File

@@ -15,7 +15,8 @@ public class Goto extends LiteralCommandUtils implements Command
@Override
public void execute()
{
Cycles.incCycles();
ProgramCounter.setPcFrom11BitLiteral(literal);
Cycles.addToCycles(2);
Cycles.incCycles();
}
}

4
de/darkress/pic16f84sim/commands/Incf.java
View File

@@ -18,12 +18,12 @@ public class Incf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address) + 1; // Allow underflow
checkZeroBit(result);
writeToDestination(destinationBit, address, result % 256); // Catch underflow
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

10
de/darkress/pic16f84sim/commands/Incfsz.java
View File

@@ -18,6 +18,8 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address) + 1;
checkZeroBit(result);
@@ -26,10 +28,8 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
if((result % 256) == 0)
{
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
ProgramCounter.incPC();
Cycles.addToCycles(1);
Nop nop = new Nop();
nop.execute();
}
}
}

4
de/darkress/pic16f84sim/commands/Iorlw.java
View File

@@ -15,12 +15,12 @@ public class Iorlw extends LiteralCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = literal | Memory.workingRegister;
checkZeroBit(result);
Memory.workingRegister = result % 256;
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Iorwf.java
View File

@@ -18,12 +18,12 @@ public class Iorwf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address) | Memory.workingRegister;
checkZeroBit(result);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Movf.java
View File

@@ -18,12 +18,12 @@ public class Movf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address);
checkZeroBit(result);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Movlw.java
View File

@@ -16,8 +16,8 @@ public class Movlw extends LiteralCommandUtils implements Command
@Override
public void execute()
{
Memory.workingRegister = literal;
ProgramCounter.incPC();
Cycles.addToCycles(1);
Cycles.incCycles();
Memory.workingRegister = literal;
}
}

4
de/darkress/pic16f84sim/commands/Movwf.java
View File

@@ -18,10 +18,10 @@ public class Movwf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.workingRegister;
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

2
de/darkress/pic16f84sim/commands/Nop.java
View File

@@ -11,6 +11,6 @@ public class Nop extends LiteralCommandUtils implements Command
{
// Do nothing, just increment the PC
ProgramCounter.incPC();
Cycles.addToCycles(1);
Cycles.incCycles();
}
}

3
de/darkress/pic16f84sim/commands/Retlw.java
View File

@@ -17,8 +17,9 @@ public class Retlw extends LiteralCommandUtils implements Command
@Override
public void execute()
{
Cycles.incCycles();
Memory.workingRegister = literal;
ProgramCounter.setPcFromStack(Stack.pop());
Cycles.addToCycles(2);
Cycles.incCycles(); // Simulate 2-Cycle Instruction
}
}

3
de/darkress/pic16f84sim/commands/Return.java
View File

@@ -9,7 +9,8 @@ public class Return extends LiteralCommandUtils implements Command
@Override
public void execute()
{
Cycles.incCycles();
ProgramCounter.setPcFromStack(Stack.pop());
Cycles.addToCycles(2);
Cycles.incCycles(); // Simulate 2-Cycle Instruction
}
}

4
de/darkress/pic16f84sim/commands/Rlf.java
View File

@@ -18,6 +18,8 @@ public class Rlf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int register = Memory.getRegister(address);
int newCarry = register >>7;
int oldCarry = Memory.getCarryBit();
@@ -31,7 +33,5 @@ public class Rlf extends FileRegisterCommandUtils implements Command
}
writeToDestination(destinationBit, address, register);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Rrf.java
View File

@@ -18,6 +18,8 @@ public class Rrf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int register = Memory.getRegister(address);
int newCarry = register & 0x01;
int oldCarry = Memory.getCarryBit();
@@ -31,7 +33,5 @@ public class Rrf extends FileRegisterCommandUtils implements Command
}
writeToDestination(destinationBit, address, register);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Sublw.java
View File

@@ -36,6 +36,8 @@ public class Sublw extends LiteralCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = literal - Memory.workingRegister + 256;
checkZeroBit(result);
@@ -43,7 +45,5 @@ public class Sublw extends LiteralCommandUtils implements Command
checkDigitCarryBit(literal);
Memory.workingRegister = result % 256;
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Subwf.java
View File

@@ -38,6 +38,8 @@ public class Subwf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address) - Memory.workingRegister + 256;
checkZeroBit(result);
@@ -45,7 +47,5 @@ public class Subwf extends FileRegisterCommandUtils implements Command
checkDigitCarryBit(Memory.getRegister(address));
writeToDestination(destinationBit, address, result % 256);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Swapf.java
View File

@@ -18,12 +18,12 @@ public class Swapf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = (Memory.getRegister(address) <<4) & 0xF0;
int tmp = Memory.getRegister(address) >>4;
result += tmp;
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Xorlw.java
View File

@@ -15,12 +15,12 @@ public class Xorlw extends LiteralCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = literal ^ Memory.workingRegister;
checkZeroBit(result);
Memory.workingRegister = result % 256;
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}

4
de/darkress/pic16f84sim/commands/Xorwf.java
View File

@@ -18,12 +18,12 @@ public class Xorwf extends FileRegisterCommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.incPC();
Cycles.incCycles();
int result = Memory.getRegister(address) ^ Memory.workingRegister;
checkZeroBit(result);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
Cycles.addToCycles(1);
}
}