diff --git a/de/darkress/pic16f84sim/Main.java b/de/darkress/pic16f84sim/Main.java index 3b55cdc..4265458 100644 --- a/de/darkress/pic16f84sim/Main.java +++ b/de/darkress/pic16f84sim/Main.java @@ -12,9 +12,9 @@ class Main public static void main(String[] args) { ArrayList program = new ArrayList<>(); - Memory.workingRegister = 0B11001100; - Memory.setRegister(0x14, 0B11110000); - program.add(CommandDecoder.decode(0x0414)); + Memory.workingRegister = 0x1A; + Memory.setRegister(0x14, 0x1B); + program.add(CommandDecoder.decode(0x0894)); for(int i = 0; i < program.size(); i++) { program.get(ProgramCounter.getPc()).execute(); diff --git a/de/darkress/pic16f84sim/commands/Movf.java b/de/darkress/pic16f84sim/commands/Movf.java new file mode 100644 index 0000000..be77823 --- /dev/null +++ b/de/darkress/pic16f84sim/commands/Movf.java @@ -0,0 +1,27 @@ +package de.darkress.pic16f84sim.commands; + +import de.darkress.pic16f84sim.microcontroller.Memory; +import de.darkress.pic16f84sim.microcontroller.ProgramCounter; + +public class Movf extends FileRegisterCommandUtils implements Command +{ + private final int address; + private final boolean destinationBit; + + public Movf(int input) + { + address = input & 0x007F; + destinationBit = checkDestinationBit(input); + } + + @Override + public void execute() + { + int result = Memory.getRegister(address); + + checkZeroBit(result); + + writeToDestination(destinationBit, address, result); + ProgramCounter.incPC(); + } +} diff --git a/de/darkress/pic16f84sim/decoder/CommandDecoder.java b/de/darkress/pic16f84sim/decoder/CommandDecoder.java index 1a77627..751c86d 100644 --- a/de/darkress/pic16f84sim/decoder/CommandDecoder.java +++ b/de/darkress/pic16f84sim/decoder/CommandDecoder.java @@ -25,8 +25,7 @@ public class CommandDecoder case 0x400: return new Iorwf(input); case 0x800: - //movf(); - break; + return new Movf(input); case 0xD00: //rlf(); break;