Compare commits

..

1 Commits

Author SHA1 Message Date
Darkress
a58176dfef implemented bcfInstruction 2023-06-07 20:50:32 +02:00
11 changed files with 14 additions and 99 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, 0xA7); //240 << 224 Memory.setRegister(0x14, 0xA5); //240 << 224
program.add(CommandDecoder.decode(0x1C94)); program.add(CommandDecoder.decode(0x1114));
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,7 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Andlw extends LiteralCommandUtils implements Command public class Andlw extends LiteralCommandUtils implements Command
{ {
@@ -19,6 +18,5 @@ public class Andlw extends LiteralCommandUtils implements Command
checkZeroBit(result); checkZeroBit(result);
Memory.workingRegister = result % 256; Memory.workingRegister = result % 256;
ProgramCounter.incPC();
} }
} }

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

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

@@ -1,29 +0,0 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Btfss extends BitOrientedCommandUtils implements Command
{
private final int address;
private int bitPlacement;
public Btfss(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 set
{
ProgramCounter.incPC();
}
ProgramCounter.incPC();
}
}

View File

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

View File

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

View File

@@ -1,7 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Iorlw extends LiteralCommandUtils implements Command public class Iorlw extends LiteralCommandUtils implements Command
{ {
@@ -19,6 +18,5 @@ public class Iorlw extends LiteralCommandUtils implements Command
checkZeroBit(result); checkZeroBit(result);
Memory.workingRegister = result % 256; Memory.workingRegister = result % 256;
ProgramCounter.incPC();
} }
} }

View File

@@ -1,7 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Sublw extends LiteralCommandUtils implements Command public class Sublw extends LiteralCommandUtils implements Command
{ {
@@ -42,6 +41,5 @@ public class Sublw extends LiteralCommandUtils implements Command
checkDigitCarryBit(literal); checkDigitCarryBit(literal);
Memory.workingRegister = result % 256; Memory.workingRegister = result % 256;
ProgramCounter.incPC();
} }
} }

View File

@@ -1,7 +1,6 @@
package de.darkress.pic16f84sim.commands; package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory; import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Xorlw extends LiteralCommandUtils implements Command public class Xorlw extends LiteralCommandUtils implements Command
{ {
@@ -19,6 +18,5 @@ public class Xorlw extends LiteralCommandUtils implements Command
checkZeroBit(result); checkZeroBit(result);
Memory.workingRegister = result % 256; Memory.workingRegister = result % 256;
ProgramCounter.incPC();
} }
} }

View File

@@ -59,17 +59,22 @@ public class CommandDecoder
case 0x1000: case 0x1000:
return new Bcf(input); return new Bcf(input);
case 0x1400: case 0x1400:
return new Bsf(input); //bsf();
break;
case 0x1800: case 0x1800:
return new Btfsc(input); //btfsc();
break;
case 0x1C00: case 0x1C00:
return new Btfss(input); //btfss();
break;
} }
switch(input & 0x3E00) switch(input & 0x3E00)
{ {
case 0x3E00: case 0x3E00:
//addlw();
return new Addlw(input); return new Addlw(input);
//break;
case 0x3C00: case 0x3C00:
return new Sublw(input); return new Sublw(input);
} }