From 7f3c31d78de929244baadfb8719f1bf37b85296e Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 27 Jan 2018 18:12:54 +1000 Subject: [PATCH] Jit64: Set correct PC when emitting slowmem trampoline --- Source/Core/Core/PowerPC/Jit64Common/Jit64Base.cpp | 1 + Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/Core/PowerPC/Jit64Common/Jit64Base.cpp b/Source/Core/Core/PowerPC/Jit64Common/Jit64Base.cpp index 334fe8f7e1..118b6e553a 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/Jit64Base.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/Jit64Base.cpp @@ -70,6 +70,7 @@ bool Jitx86Base::BackPatch(u32 emAddress, SContext* ctx) js.generatingTrampoline = true; js.trampolineExceptionHandler = exceptionHandler; + js.compilerPC = info.pc; // Generate the trampoline. const u8* trampoline = trampolines.GenerateTrampoline(info); diff --git a/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp b/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp index bb9405daca..06cb42d881 100644 --- a/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp +++ b/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp @@ -63,9 +63,6 @@ const u8* TrampolineCache::GenerateWriteTrampoline(const TrampolineInfo& info) // Don't treat FIFO writes specially for now because they require a burst // check anyway. - // PC is used by memory watchpoints (if enabled) or to print accurate PC locations in debug logs - MOV(32, PPCSTATE(pc), Imm32(info.pc)); - SafeWriteRegToReg(info.op_arg, info.op_reg, info.accessSize << 3, info.offset, info.registersInUse, info.flags | SAFE_LOADSTORE_FORCE_SLOWMEM);