Compare commits

...

5 Commits

Author SHA1 Message Date
Darkress
c6b5e3989e implemented btfsc Instruction 2023-06-07 21:30:49 +02:00
darkress
d11f1b06f6 implemented bsf Instruction (#26)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#26
2023-06-07 21:19:12 +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
darkress
b298b97652 Added swapf Instruction (#23)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#23
2023-06-07 20:17:31 +02:00
10 changed files with 155 additions and 14 deletions

View File

@@ -13,8 +13,8 @@ class Main
ArrayList<Command> program = new ArrayList<>();
Memory.workingRegister = 0x01;
Memory.setRegister(0x14, 0x01); //240 << 224
program.add(CommandDecoder.decode(0x0294));
Memory.setRegister(0x14, 0xA5); //240 << 224
program.add(CommandDecoder.decode(0x1894));
for(int i = 0; i < program.size(); i++)
{
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,29 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Btfsc extends BitOrientedCommandUtils implements Command
{
private final int address;
private int bitPlacement;
public Btfsc(int input)
{
address = input & 0x007F;
bitPlacement = checkBitPlacement(input);
}
@Override
public void execute()
{
int result = Memory.getRegister(address);
if((result & (1 << bitPlacement)) == 0) //Test if bit is clear
{
ProgramCounter.incPC();
}
ProgramCounter.incPC();
}
}

View File

@@ -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();
}

View File

@@ -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();
}

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 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();
}
}

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

@@ -33,11 +33,9 @@ public class CommandDecoder
case 0x200:
return new Subwf(input);
case 0xE00:
//swapf();
break;
return new Swapf(input);
case 0x600:
//xorwf();
break;
return new Xorwf(input);
case 0x3900:
return new Andlw(input);
case 0x3800:
@@ -59,14 +57,11 @@ public class CommandDecoder
switch(input & 0x3C00)
{
case 0x1000:
//bcf();
break;
return new Bcf(input);
case 0x1400:
//bsf();
break;
return new Bsf(input);
case 0x1800:
//btfsc();
break;
return new Btfsc(input);
case 0x1C00:
//btfss();
break;