Compare commits

..

1 Commits

Author SHA1 Message Date
Darkress
eda63f0073 implemented subwf Instruction 2023-06-06 07:34:26 +02:00
9 changed files with 12 additions and 125 deletions

View File

@@ -13,8 +13,8 @@ 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, 0x01); //240 << 224
program.add(CommandDecoder.decode(0x1594)); program.add(CommandDecoder.decode(0x0294));
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

@@ -1,26 +0,0 @@
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

@@ -1,11 +0,0 @@
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

@@ -1,26 +0,0 @@
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

@@ -26,7 +26,7 @@ public class Decfsz extends FileRegisterCommandUtils implements Command
if((result % 256) == 0) if((result % 256) == 0)
{ {
Nop nop = new Nop(); Nop nop = new Nop();
nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution? nop.execute();
} }
ProgramCounter.incPC(); ProgramCounter.incPC();
} }

View File

@@ -26,7 +26,7 @@ public class Incfsz extends FileRegisterCommandUtils implements Command
if((result % 256) == 0) if((result % 256) == 0)
{ {
Nop nop = new Nop(); Nop nop = new Nop();
nop.execute(); // TODO: What happens if an interrupt gets triggered during the nop execution? nop.execute();
} }
ProgramCounter.incPC(); ProgramCounter.incPC();
} }

View File

@@ -1,27 +0,0 @@
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

@@ -1,27 +0,0 @@
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,9 +33,11 @@ public class CommandDecoder
case 0x200: case 0x200:
return new Subwf(input); return new Subwf(input);
case 0xE00: case 0xE00:
return new Swapf(input); //swapf();
break;
case 0x600: case 0x600:
return new Xorwf(input); //xorwf();
break;
case 0x3900: case 0x3900:
return new Andlw(input); return new Andlw(input);
case 0x3800: case 0x3800:
@@ -57,9 +59,11 @@ public class CommandDecoder
switch(input & 0x3C00) switch(input & 0x3C00)
{ {
case 0x1000: case 0x1000:
return new Bcf(input); //bcf();
break;
case 0x1400: case 0x1400:
return new Bsf(input); //bsf();
break;
case 0x1800: case 0x1800:
//btfsc(); //btfsc();
break; break;