3 files changed, 20 insertions, 28 deletions

diff --git a/src/ARMJIT_x64/ARMJIT_Branch.cpp b/src/ARMJIT_x64/ARMJIT_Branch.cpp
index c0a8f1f..cc7a3c4 100644
--- a/src/ARMJIT_x64/ARMJIT_Branch.cpp
+++ b/src/ARMJIT_x64/ARMJIT_Branch.cpp
@@ -271,15 +271,17 @@ void Compiler::T_Comp_BL_LONG_2()
     Comp_JumpTo(RSCRATCH);
 }
 
-void Compiler::T_Comp_BL_Merged(FetchedInstr part1)
+void Compiler::T_Comp_BL_Merged()
 {
-    assert(part1.Info.Kind == ARMInstrInfo::tk_BL_LONG_1);
     Comp_AddCycles_C();
 
-    u32 target = (R15 - 2) + ((s32)((part1.Instr & 0x7FF) << 21) >> 9);
-    target += (CurInstr.Instr & 0x7FF) << 1;
+    R15 += 2;
 
-    if (Num == 1 || CurInstr.Instr & (1 << 12))
+    u32 upperPart = CurInstr.Instr >> 16;
+    u32 target = (R15 - 2) + ((s32)((CurInstr.Instr & 0x7FF) << 21) >> 9);
+    target += (upperPart & 0x7FF) << 1;
+
+    if (Num == 1 || upperPart & (1 << 12))
         target |= 1;
 
     MOV(32, MapReg(14), Imm32((R15 - 2) | 1));
diff --git a/src/ARMJIT_x64/ARMJIT_Compiler.cpp b/src/ARMJIT_x64/ARMJIT_Compiler.cpp
index d585f39..d8ce1aa 100644
--- a/src/ARMJIT_x64/ARMJIT_Compiler.cpp
+++ b/src/ARMJIT_x64/ARMJIT_Compiler.cpp
@@ -338,7 +338,8 @@ const Compiler::CompileFunc T_Comp[ARMInstrInfo::tk_Count] = {
     // Branch
     F(T_Comp_BCOND), F(T_Comp_BranchXchangeReg), F(T_Comp_BranchXchangeReg), F(T_Comp_B), F(T_Comp_BL_LONG_1), F(T_Comp_BL_LONG_2), 
     // Unk, SVC
-    NULL, NULL
+    NULL, NULL,
+    F(T_Comp_BL_Merged)
 };
 #undef F
 
@@ -361,21 +362,18 @@ CompiledBlock Compiler::CompileBlock(ARM* cpu, FetchedInstr instrs[], int instrs
     ConstantCycles = 0;
     Thumb = cpu->CPSR & 0x20;
     Num = cpu->Num;
-    R15 = cpu->R[15];
     CodeRegion = cpu->CodeRegion;
     CurCPU = cpu;
 
     CompiledBlock res = (CompiledBlock)GetWritableCodePtr();
 
     if (!(Num == 0 
-        ? IsMapped<0>(R15 - (Thumb ? 2 : 4)) 
-        : IsMapped<1>(R15 - (Thumb ? 2 : 4))))
+        ? IsMapped<0>(instrs[0].Addr - (Thumb ? 2 : 4)) 
+        : IsMapped<1>(instrs[0].Addr - (Thumb ? 2 : 4))))
     {
         printf("Trying to compile a block in unmapped memory\n");
     }
 
-    bool mergedThumbBL = false;
-
     ABI_PushRegistersAndAdjustStack(BitSet32(ABI_ALL_CALLEE_SAVED & ABI_ALL_GPRS & ~BitSet32({RSP})), 8);
 
     MOV(64, R(RCPU), ImmPtr(cpu));
@@ -387,8 +385,8 @@ CompiledBlock Compiler::CompileBlock(ARM* cpu, FetchedInstr instrs[], int instrs
 
     for (int i = 0; i < instrsCount; i++)
     {
-        R15 += Thumb ? 2 : 4;
         CurInstr = instrs[i];
+        R15 = CurInstr.Addr + (Thumb ? 4 : 8);
 
         CompileFunc comp = Thumb
             ? T_Comp[CurInstr.Info.Kind]
@@ -406,29 +404,21 @@ CompiledBlock Compiler::CompileBlock(ARM* cpu, FetchedInstr instrs[], int instrs
         }
         
         if (comp != NULL)
-            RegCache.Prepare(i);
+            RegCache.Prepare(Thumb, i);
         else
             RegCache.Flush();
 
         if (Thumb)
         {
-            if (i < instrsCount - 1 && CurInstr.Info.Kind == ARMInstrInfo::tk_BL_LONG_1
-                && instrs[i + 1].Info.Kind == ARMInstrInfo::tk_BL_LONG_2)
-                mergedThumbBL = true;
-            else
+            u32 icode = (CurInstr.Instr >> 6) & 0x3FF;
+            if (comp == NULL)
             {
-                u32 icode = (CurInstr.Instr >> 6) & 0x3FF;
-                if (comp == NULL)
-                {
-                    MOV(64, R(ABI_PARAM1), R(RCPU));
+                MOV(64, R(ABI_PARAM1), R(RCPU));
 
-                    ABI_CallFunction(ARMInterpreter::THUMBInstrTable[icode]);
-                }
-                else if (mergedThumbBL)
-                    T_Comp_BL_Merged(instrs[i - 1]);
-                else
-                    (this->*comp)();
+                ABI_CallFunction(ARMInterpreter::THUMBInstrTable[icode]);
             }
+            else
+                (this->*comp)();
         }
         else
         {
diff --git a/src/ARMJIT_x64/ARMJIT_Compiler.h b/src/ARMJIT_x64/ARMJIT_Compiler.h
index a62f043..fcb2380 100644
--- a/src/ARMJIT_x64/ARMJIT_Compiler.h
+++ b/src/ARMJIT_x64/ARMJIT_Compiler.h
@@ -90,7 +90,7 @@ public:
     void T_Comp_BranchXchangeReg();
     void T_Comp_BL_LONG_1();
     void T_Comp_BL_LONG_2();
-    void T_Comp_BL_Merged(FetchedInstr prefix);
+    void T_Comp_BL_Merged();
 
     void Comp_MemAccess(Gen::OpArg rd, bool signExtend, bool store, int size);
     s32 Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc, bool decrement, bool usermode);