summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-09-22 21:31:30 -0400
committerLioncash <mathew1800@gmail.com>2014-09-22 21:31:30 -0400
commit5271982f856e7b3d5ef1bb29b888692bfdcd237e (patch)
tree10e560b37d97ea94a1388f0a3395b0ca84e6bcb9 /Source
parent7f1185b941b540d9c6e641c39e50057fb2ad01da (diff)
parent88f2fbe1a4be95dc1ab869ab597ca8c133671cf5 (diff)
Merge pull request #1152 from FioraAeterna/fixmergedbclr
JIT: fix merged bclr with comex's BLR optimizations
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
index 79a7c5d76d..8bfcd08762 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
@@ -328,7 +328,7 @@ void Jit64::DoMergedBranch()
AND(32, R(RSCRATCH), Imm32(0xFFFFFFFC));
if (js.next_inst.LK)
MOV(32, M(&LR), Imm32(js.next_compilerPC + 4));
- WriteExitDestInRSCRATCH(js.next_inst.LK, js.next_compilerPC + 4);
+ WriteBLRExit();
}
else
{