From 40b7a4a478ea371bd853614eaee942b878feb0c1 Mon Sep 17 00:00:00 2001 From: darkress <30271678+darkressx@users.noreply.github.com> Date: Tue, 6 Jun 2023 00:00:58 +0200 Subject: [PATCH] implemented Movwf instruction (#19) Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com> Reviewed-on: https://git.darkress.xyz/darkress/pic16f84-sim/pulls/19 --- de/darkress/pic16f84sim/Main.java | 2 +- de/darkress/pic16f84sim/commands/Movwf.java | 25 +++++++++++++++++++ .../pic16f84sim/decoder/CommandDecoder.java | 3 +-- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 de/darkress/pic16f84sim/commands/Movwf.java diff --git a/de/darkress/pic16f84sim/Main.java b/de/darkress/pic16f84sim/Main.java index 4265458..40a7528 100644 --- a/de/darkress/pic16f84sim/Main.java +++ b/de/darkress/pic16f84sim/Main.java @@ -14,7 +14,7 @@ class Main ArrayList program = new ArrayList<>(); Memory.workingRegister = 0x1A; Memory.setRegister(0x14, 0x1B); - program.add(CommandDecoder.decode(0x0894)); + program.add(CommandDecoder.decode(0x0094)); for(int i = 0; i < program.size(); i++) { program.get(ProgramCounter.getPc()).execute(); diff --git a/de/darkress/pic16f84sim/commands/Movwf.java b/de/darkress/pic16f84sim/commands/Movwf.java new file mode 100644 index 0000000..3b19b2b --- /dev/null +++ b/de/darkress/pic16f84sim/commands/Movwf.java @@ -0,0 +1,25 @@ +package de.darkress.pic16f84sim.commands; + +import de.darkress.pic16f84sim.microcontroller.Memory; +import de.darkress.pic16f84sim.microcontroller.ProgramCounter; + +public class Movwf extends FileRegisterCommandUtils implements Command +{ + private final int address; + private final boolean destinationBit; + + public Movwf(int input) + { + address = input & 0x007F; + destinationBit = true; + } + + @Override + public void execute() + { + int result = Memory.workingRegister; + + writeToDestination(destinationBit, address, result); + ProgramCounter.incPC(); + } +} diff --git a/de/darkress/pic16f84sim/decoder/CommandDecoder.java b/de/darkress/pic16f84sim/decoder/CommandDecoder.java index 751c86d..e13eaa0 100644 --- a/de/darkress/pic16f84sim/decoder/CommandDecoder.java +++ b/de/darkress/pic16f84sim/decoder/CommandDecoder.java @@ -56,8 +56,7 @@ public class CommandDecoder case 0x100: return new Clrw(); case 0x80: - //movwf(); - break; + return new Movwf(input); } switch(input & 0x3C00)