Compare commits
2 Commits
subwfInstr
...
swapfInstr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1c3ed8a1b2 | ||
|
|
d8ed3ab9b1 |
@@ -12,9 +12,9 @@ class Main
|
||||
public static void main(String[] args) {
|
||||
|
||||
ArrayList<Command> program = new ArrayList<>();
|
||||
Memory.clearCarryBit();
|
||||
Memory.setRegister(0x14, 0B00000001); //240 << 224
|
||||
program.add(CommandDecoder.decode(0x0C94));
|
||||
Memory.workingRegister = 0x01;
|
||||
Memory.setRegister(0x14, 0xA5); //240 << 224
|
||||
program.add(CommandDecoder.decode(0x0E94));
|
||||
for(int i = 0; i < program.size(); i++)
|
||||
{
|
||||
program.get(ProgramCounter.getPc()).execute();
|
||||
|
||||
@@ -26,7 +26,7 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
|
||||
if((result % 256) == 0)
|
||||
{
|
||||
Nop nop = new Nop();
|
||||
nop.execute();
|
||||
nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
|
||||
}
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
|
||||
if((result % 256) == 0)
|
||||
{
|
||||
Nop nop = new Nop();
|
||||
nop.execute();
|
||||
nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution?
|
||||
}
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
|
||||
49
de/darkress/pic16f84sim/commands/Subwf.java
Normal file
49
de/darkress/pic16f84sim/commands/Subwf.java
Normal file
@@ -0,0 +1,49 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Subwf extends FileRegisterCommandUtils implements Command
|
||||
{
|
||||
private final int address;
|
||||
private final boolean destinationBit;
|
||||
|
||||
public Subwf(int input)
|
||||
{
|
||||
address = input & 0x007F;
|
||||
destinationBit = checkDestinationBit(input);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void checkCarryBit(int result)
|
||||
{
|
||||
if(result <= 255){
|
||||
Memory.clearCarryBit();
|
||||
} else{
|
||||
Memory.setCarryBit();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void checkDigitCarryBit(int literal)
|
||||
{
|
||||
if(((literal & 0x0F) - (Memory.workingRegister & 0x0F)) < 0){
|
||||
Memory.clearDigitCarryBit();
|
||||
} else{
|
||||
Memory.setDigitCarryBit();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
int result = Memory.getRegister(address) - Memory.workingRegister + 256;
|
||||
|
||||
checkZeroBit(result);
|
||||
checkCarryBit(result);
|
||||
checkDigitCarryBit(Memory.getRegister(address));
|
||||
|
||||
writeToDestination(destinationBit, address, result % 256);
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
27
de/darkress/pic16f84sim/commands/Swapf.java
Normal file
27
de/darkress/pic16f84sim/commands/Swapf.java
Normal file
@@ -0,0 +1,27 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Swapf extends FileRegisterCommandUtils implements Command
|
||||
{
|
||||
private final int address;
|
||||
private final boolean destinationBit;
|
||||
|
||||
public Swapf(int input)
|
||||
{
|
||||
address = input & 0x007F;
|
||||
destinationBit = checkDestinationBit(input);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
int result = (Memory.getRegister(address) <<4) & 0xF0;
|
||||
int tmp = Memory.getRegister(address) >>4;
|
||||
result += tmp;
|
||||
|
||||
writeToDestination(destinationBit, address, result);
|
||||
ProgramCounter.incPC();
|
||||
}
|
||||
}
|
||||
@@ -31,11 +31,9 @@ public class CommandDecoder
|
||||
case 0xC00:
|
||||
return new Rrf(input);
|
||||
case 0x200:
|
||||
//subwf();
|
||||
break;
|
||||
return new Subwf(input);
|
||||
case 0xE00:
|
||||
//swapf();
|
||||
break;
|
||||
return new Swapf(input);
|
||||
case 0x600:
|
||||
//xorwf();
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user