From 2f8adb70c4f55a0a4a0662575588489bdaa705c6 Mon Sep 17 00:00:00 2001
From: Darkress <30271678+DarkressX@users.noreply.github.com>
Date: Tue, 6 Jun 2023 01:09:16 +0200
Subject: [PATCH] implemented Rlf Instruction

---
 de/darkress/pic16f84sim/Main.java             |  6 ++--
 de/darkress/pic16f84sim/commands/Rlf.java     | 36 +++++++++++++++++++
 .../pic16f84sim/decoder/CommandDecoder.java   |  3 +-
 .../pic16f84sim/microcontroller/Memory.java   |  8 +++--
 4 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 de/darkress/pic16f84sim/commands/Rlf.java

diff --git a/de/darkress/pic16f84sim/Main.java b/de/darkress/pic16f84sim/Main.java
index 40a7528..46cf67d 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<Command> program = new ArrayList<>();
-        Memory.workingRegister = 0x1A;
-        Memory.setRegister(0x14, 0x1B);
-        program.add(CommandDecoder.decode(0x0094));
+        Memory.clearCarryBit();
+        Memory.setRegister(0x14, 0B11110000); //240 << 224
+        program.add(CommandDecoder.decode(0x0D94));
         for(int i = 0; i < program.size(); i++)
         {
             program.get(ProgramCounter.getPc()).execute();
diff --git a/de/darkress/pic16f84sim/commands/Rlf.java b/de/darkress/pic16f84sim/commands/Rlf.java
new file mode 100644
index 0000000..83a80bc
--- /dev/null
+++ b/de/darkress/pic16f84sim/commands/Rlf.java
@@ -0,0 +1,36 @@
+package de.darkress.pic16f84sim.commands;
+
+import de.darkress.pic16f84sim.microcontroller.Memory;
+import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
+
+public class Rlf extends FileRegisterCommandUtils implements Command
+{
+    private final int address;
+    private final boolean destinationBit;
+
+    public Rlf(int input)
+    {
+        address = input & 0x007F;
+        destinationBit = checkDestinationBit(input);
+    }
+
+    @Override
+    public void execute()
+    {
+        int register = Memory.getRegister(address);
+        int carry = Memory.getCarryBit();
+        int tmp = carry;
+        carry = register >>7;
+        register = ((register <<1) + tmp) & 0xFF;
+
+        if(carry == 1)
+        {
+            Memory.setCarryBit();
+        } else if(carry == 0){
+            Memory.clearCarryBit();
+        }
+
+        writeToDestination(destinationBit, address, register);
+        ProgramCounter.incPC();
+    }
+}
diff --git a/de/darkress/pic16f84sim/decoder/CommandDecoder.java b/de/darkress/pic16f84sim/decoder/CommandDecoder.java
index e13eaa0..b233a97 100644
--- a/de/darkress/pic16f84sim/decoder/CommandDecoder.java
+++ b/de/darkress/pic16f84sim/decoder/CommandDecoder.java
@@ -27,8 +27,7 @@ public class CommandDecoder
             case 0x800:
                 return new Movf(input);
             case 0xD00:
-                //rlf();
-                break;
+                return new Rlf(input);
             case 0xC00:
                 //rrf();
                 break;
diff --git a/de/darkress/pic16f84sim/microcontroller/Memory.java b/de/darkress/pic16f84sim/microcontroller/Memory.java
index d701a15..4a4033b 100644
--- a/de/darkress/pic16f84sim/microcontroller/Memory.java
+++ b/de/darkress/pic16f84sim/microcontroller/Memory.java
@@ -153,9 +153,13 @@ public class Memory
         memory[0x03] &= 0xFD;
     }
 
-    public static boolean getCarryBit()
+    public static int getCarryBit()
     {
-        return (memory[0x03] & 0x01) == 0x01;
+        if((memory[0x03] & 0x01) == 0x01)
+        {
+            return 1;
+        }
+        else return 0;
     }
 
     public static void setCarryBit()
-- 
2.49.1