Compare commits

...

3 Commits

Author SHA1 Message Date
Darkress
91807e7983 implemented bsf Instruction 2023-06-07 21:18:49 +02:00
darkress
fa89faa979 implemented bcfInstruction (#25)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#25
2023-06-07 20:50:48 +02:00
darkress
b10ad35ae8 Added Xorwf Instruction (#24)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#24
2023-06-07 20:21:28 +02:00
6 changed files with 94 additions and 7 deletions

View File

@@ -14,7 +14,7 @@ class Main
ArrayList<Command> program = new ArrayList<>(); ArrayList<Command> program = new ArrayList<>();
Memory.workingRegister = 0x01; Memory.workingRegister = 0x01;
Memory.setRegister(0x14, 0xA5); //240 << 224 Memory.setRegister(0x14, 0xA5); //240 << 224
program.add(CommandDecoder.decode(0x0E94)); program.add(CommandDecoder.decode(0x1594));
for(int i = 0; i < program.size(); i++) for(int i = 0; i < program.size(); i++)
{ {
program.get(ProgramCounter.getPc()).execute(); program.get(ProgramCounter.getPc()).execute();

View File

@@ -0,0 +1,26 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Bcf extends BitOrientedCommandUtils implements Command
{
private final int address;
private int bitPlacement;
public Bcf(int input)
{
address = input & 0x007F;
bitPlacement = checkBitPlacement(input);
}
@Override
public void execute()
{
int result = Memory.getRegister(address);
result &= ~(1 << bitPlacement); //Mask n-th bit with 0
Memory.setRegister(address, result);
ProgramCounter.incPC();
}
}

View File

@@ -0,0 +1,11 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
public class BitOrientedCommandUtils
{
protected int checkBitPlacement(int input)
{
return ((input & 0x0380) >>7);
}
}

View File

@@ -0,0 +1,26 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Bsf extends BitOrientedCommandUtils implements Command
{
private final int address;
private int bitPlacement;
public Bsf(int input)
{
address = input & 0x007F;
bitPlacement = checkBitPlacement(input);
}
@Override
public void execute()
{
int result = Memory.getRegister(address);
result |= (1 << bitPlacement);
Memory.setRegister(address, result);
ProgramCounter.incPC();
}
}

View File

@@ -0,0 +1,27 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Xorwf extends FileRegisterCommandUtils implements Command
{
private final int address;
private final boolean destinationBit;
public Xorwf(int input)
{
address = input & 0x007F;
destinationBit = checkDestinationBit(input);
}
@Override
public void execute()
{
int result = Memory.getRegister(address) ^ Memory.workingRegister;
checkZeroBit(result);
writeToDestination(destinationBit, address, result);
ProgramCounter.incPC();
}
}

View File

@@ -35,8 +35,7 @@ public class CommandDecoder
case 0xE00: case 0xE00:
return new Swapf(input); return new Swapf(input);
case 0x600: case 0x600:
//xorwf(); return new Xorwf(input);
break;
case 0x3900: case 0x3900:
return new Andlw(input); return new Andlw(input);
case 0x3800: case 0x3800:
@@ -58,11 +57,9 @@ public class CommandDecoder
switch(input & 0x3C00) switch(input & 0x3C00)
{ {
case 0x1000: case 0x1000:
//bcf(); return new Bcf(input);
break;
case 0x1400: case 0x1400:
//bsf(); return new Bsf(input);
break;
case 0x1800: case 0x1800:
//btfsc(); //btfsc();
break; break;