From 5f1ba4e9e69b371c5f477da2378ebda5d6d46e2b Mon Sep 17 00:00:00 2001 From: Darkress <30271678+DarkressX@users.noreply.github.com> Date: Wed, 7 Jun 2023 21:34:01 +0200 Subject: [PATCH] implemented btfss Instruction --- de/darkress/pic16f84sim/Main.java | 4 +-- de/darkress/pic16f84sim/commands/Btfss.java | 29 +++++++++++++++++++ .../pic16f84sim/decoder/CommandDecoder.java | 5 +--- 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 de/darkress/pic16f84sim/commands/Btfss.java diff --git a/de/darkress/pic16f84sim/Main.java b/de/darkress/pic16f84sim/Main.java index 4a6bda6..229b7e7 100644 --- a/de/darkress/pic16f84sim/Main.java +++ b/de/darkress/pic16f84sim/Main.java @@ -13,8 +13,8 @@ class Main ArrayList program = new ArrayList<>(); Memory.workingRegister = 0x01; - Memory.setRegister(0x14, 0xA5); //240 << 224 - program.add(CommandDecoder.decode(0x1894)); + Memory.setRegister(0x14, 0xA7); //240 << 224 + program.add(CommandDecoder.decode(0x1C94)); for(int i = 0; i < program.size(); i++) { program.get(ProgramCounter.getPc()).execute(); diff --git a/de/darkress/pic16f84sim/commands/Btfss.java b/de/darkress/pic16f84sim/commands/Btfss.java new file mode 100644 index 0000000..ded0986 --- /dev/null +++ b/de/darkress/pic16f84sim/commands/Btfss.java @@ -0,0 +1,29 @@ +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(); + } +} diff --git a/de/darkress/pic16f84sim/decoder/CommandDecoder.java b/de/darkress/pic16f84sim/decoder/CommandDecoder.java index 816df2e..10eea94 100644 --- a/de/darkress/pic16f84sim/decoder/CommandDecoder.java +++ b/de/darkress/pic16f84sim/decoder/CommandDecoder.java @@ -63,16 +63,13 @@ public class CommandDecoder case 0x1800: return new Btfsc(input); case 0x1C00: - //btfss(); - break; + return new Btfss(input); } switch(input & 0x3E00) { case 0x3E00: - //addlw(); return new Addlw(input); - //break; case 0x3C00: return new Sublw(input); }