From 5cf5e82bd1e0305d3438a46bf17fa08b99e7ddda Mon Sep 17 00:00:00 2001 From: Darkress <30271678+DarkressX@users.noreply.github.com> Date: Wed, 31 May 2023 22:19:36 +0200 Subject: [PATCH] implemented Incfsz Instruction --- de/darkress/pic16f84sim/Main.java | 6 ++-- de/darkress/pic16f84sim/commands/Incfsz.java | 33 +++++++++++++++++++ .../pic16f84sim/decoder/CommandDecoder.java | 3 +- 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 de/darkress/pic16f84sim/commands/Incfsz.java diff --git a/de/darkress/pic16f84sim/Main.java b/de/darkress/pic16f84sim/Main.java index 3da805b..4c38488 100644 --- a/de/darkress/pic16f84sim/Main.java +++ b/de/darkress/pic16f84sim/Main.java @@ -14,8 +14,10 @@ class Main ArrayList program = new ArrayList<>(); int input1 = 0x27FF; program.add(CommandDecoder.decode(0x3011)); //Write 0x11 to W - Memory.setRegister(0x14, 0x01); - program.add(CommandDecoder.decode(0x0A94)); //Write 0x11 to W + Memory.setRegister(0x14, 0xFE); + program.add(CommandDecoder.decode(0x0F94)); //Write 0x11 to W + program.add(CommandDecoder.decode(0x0F94)); //Write 0x11 to W + program.add(CommandDecoder.decode(0x0F94)); //Write 0x11 to W for(int i = 0; i < program.size(); i++) { program.get(ProgramCounter.getPc()).execute(); diff --git a/de/darkress/pic16f84sim/commands/Incfsz.java b/de/darkress/pic16f84sim/commands/Incfsz.java new file mode 100644 index 0000000..3cbf1e5 --- /dev/null +++ b/de/darkress/pic16f84sim/commands/Incfsz.java @@ -0,0 +1,33 @@ +package de.darkress.pic16f84sim.commands; + +import de.darkress.pic16f84sim.microcontroller.Memory; +import de.darkress.pic16f84sim.microcontroller.ProgramCounter; + +public class Incfsz extends FileRegisterCommandUtils implements Command +{ + private final int address; + private final boolean destinationBit; + + public Incfsz(int input) + { + address = input & 0x007F; + destinationBit = checkDestinationBit(input); + } + + @Override + public void execute() + { + int result = Memory.getRegister(address) + 1; + + checkZeroBit(result); + + writeToDestination(destinationBit, address, result % 256); + + if((result % 256) == 0) + { + Nop nop = new Nop(); + nop.execute(); + } + ProgramCounter.incPC(); + } +} diff --git a/de/darkress/pic16f84sim/decoder/CommandDecoder.java b/de/darkress/pic16f84sim/decoder/CommandDecoder.java index 1030e96..1d259f9 100644 --- a/de/darkress/pic16f84sim/decoder/CommandDecoder.java +++ b/de/darkress/pic16f84sim/decoder/CommandDecoder.java @@ -21,8 +21,7 @@ public class CommandDecoder case 0xA00: return new Incf(input); case 0xF00: - //incfsz(); - break; + return new Incfsz(input); case 0x400: //iorwf(); break;