From 4686ce71274ad662fd62e03e3fb7e99aafad0ad9 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Tue, 22 Nov 2016 17:53:10 +1100
Subject: [PATCH] [Project64] Add LoadArmRegPointerByteToArmReg

---
 .../N64System/Recompiler/Arm/ArmOps.cpp       | 32 +++++++++++++++++++
 .../N64System/Recompiler/Arm/ArmOps.h         |  1 +
 2 files changed, 33 insertions(+)

diff --git a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp
index 1d5fb60dc..35486a22a 100644
--- a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp
+++ b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp
@@ -416,6 +416,38 @@ void CArmOps::IfBlock(ArmItMask mask, ArmCompareType CompareType)
     AddCode16(op.Hex);
 }
 
+void CArmOps::LoadArmRegPointerByteToArmReg(ArmReg DestReg, ArmReg RegPointer, uint16_t offset)
+{
+    if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); }
+
+    if ((DestReg > 0x7 || RegPointer > 0x7 || (offset & ~0x1f) != 0))
+    {
+        if ((offset & (~0xFFF)) != 0)
+        {
+            CPU_Message("      RegPointer: %d Reg: %d Offset: 0x%X", RegPointer, DestReg, offset);
+            g_Notify->BreakPoint(__FILE__, __LINE__);
+            return;
+        }
+        CPU_Message("      ldrb.w\t%s, [%s, #%d]", ArmRegName(DestReg), ArmRegName(RegPointer), (uint32_t)offset);
+        Arm32Opcode op = { 0 };
+        op.imm12.rt = DestReg;
+        op.imm12.rn = RegPointer;
+        op.imm12.imm = offset;
+        op.imm12.opcode = 0xF89;
+        AddCode32(op.Hex);
+    }
+    else
+    {
+        CPU_Message("      ldrb\t%s, [%s%s%s]", ArmRegName(DestReg), ArmRegName(RegPointer), offset == 0 ? "" : ",", offset == 0 ? "" : stdstr_f("#%d",offset).c_str());
+        ArmThumbOpcode op = {0};
+        op.Imm5.rt = DestReg;
+        op.Imm5.rn = RegPointer;
+        op.Imm5.imm5 = offset;
+        op.Imm5.opcode = 0xF;
+        AddCode16(op.Hex);
+    }
+}
+
 void CArmOps::LoadArmRegPointerByteToArmReg(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift)
 {
     if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); }
diff --git a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h
index 2da50ee5e..72bd39d8a 100644
--- a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h
+++ b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h
@@ -168,6 +168,7 @@ protected:
     static void CompareArmRegToConst(ArmReg Reg, uint32_t value);
     static void CompareArmRegToArmReg(ArmReg Reg1, ArmReg Reg2);
     static void IfBlock(ArmItMask mask, ArmCompareType CompareType);
+    static void LoadArmRegPointerByteToArmReg(ArmReg DestReg, ArmReg RegPointer, uint16_t offset);
     static void LoadArmRegPointerByteToArmReg(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift);
     static void LoadArmRegPointerToArmReg(ArmReg DestReg, ArmReg RegPointer, uint8_t Offset);
     static void LoadArmRegPointerToArmReg(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift);