From 21ee79f6ef0d67b89fce521ea70dd7db00f02595 Mon Sep 17 00:00:00 2001 From: Darkress <30271678+DarkressX@users.noreply.github.com> Date: Wed, 7 Jun 2023 20:20:35 +0200 Subject: [PATCH] Added Xorwf Instruction --- de/darkress/pic16f84sim/Main.java | 2 +- de/darkress/pic16f84sim/commands/Xorwf.java | 27 +++++++++++++++++++ .../pic16f84sim/decoder/CommandDecoder.java | 3 +-- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 de/darkress/pic16f84sim/commands/Xorwf.java diff --git a/de/darkress/pic16f84sim/Main.java b/de/darkress/pic16f84sim/Main.java index 6f512c2..74f4780 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 = 0x01; Memory.setRegister(0x14, 0xA5); //240 << 224 - program.add(CommandDecoder.decode(0x0E94)); + program.add(CommandDecoder.decode(0x0694)); for(int i = 0; i < program.size(); i++) { program.get(ProgramCounter.getPc()).execute(); diff --git a/de/darkress/pic16f84sim/commands/Xorwf.java b/de/darkress/pic16f84sim/commands/Xorwf.java new file mode 100644 index 0000000..c18646d --- /dev/null +++ b/de/darkress/pic16f84sim/commands/Xorwf.java @@ -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(); + } +} diff --git a/de/darkress/pic16f84sim/decoder/CommandDecoder.java b/de/darkress/pic16f84sim/decoder/CommandDecoder.java index 5b4ef6c..9c2bf34 100644 --- a/de/darkress/pic16f84sim/decoder/CommandDecoder.java +++ b/de/darkress/pic16f84sim/decoder/CommandDecoder.java @@ -35,8 +35,7 @@ public class CommandDecoder case 0xE00: return new Swapf(input); case 0x600: - //xorwf(); - break; + return new Xorwf(input); case 0x3900: return new Andlw(input); case 0x3800: -- 2.49.1