mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Correct when we process the stepping queue. Also, the jitLock mutex is no longer needed.
This commit is contained in:
1 parent
1848262bea
commit
a49f4523cb
13 files changed
+24
-48
No files matched your search
@@ -102,7 +102,6 @@ INT_PTR CALLBACK DumpMemoryWindow::dlgFunc(HWND hwnd, UINT iMsg, WPARAM wParam,
|
||||
fwrite(Memory::GetPointerOrException(bp->start), 1, bp->size, output);
|
||||
} else {
|
||||
auto savedReplacements = SaveAndClearReplacements();
|
||||
std::lock_guard<std::recursive_mutex> guard(MIPSComp::jitLock);
|
||||
if (MIPSComp::jit) {
|
||||
auto savedBlocks = MIPSComp::jit->SaveAndClearEmuHackOps();
|
||||
fwrite(Memory::GetPointerOrException(bp->start), 1, bp->size, output);
|
||||
|
||||
@@ -1017,22 +1017,25 @@ namespace MainWindow {
|
||||
return TRUE;
|
||||
|
||||
case VERYSLEEPY_WPARAM_GETADDRINFO:
|
||||
{
|
||||
{
|
||||
Core_RunOnCPUThread([lParam]() {
|
||||
// This is called from VerySleepy, which is on a different thread than the CPU thread.
|
||||
// We need to run this on the CPU thread to avoid race conditions.
|
||||
VerySleepy_AddrInfo *info = (VerySleepy_AddrInfo *)lParam;
|
||||
const u8 *ptr = (const u8 *)info->addr;
|
||||
std::string name;
|
||||
|
||||
std::lock_guard<std::recursive_mutex> guard(MIPSComp::jitLock);
|
||||
if (MIPSComp::jit && MIPSComp::jit->DescribeCodePtr(ptr, name)) {
|
||||
swprintf_s(info->name, L"Jit::%S", name.c_str());
|
||||
return TRUE;
|
||||
return;
|
||||
}
|
||||
if (gpu && gpu->DescribeCodePtr(ptr, name)) {
|
||||
swprintf_s(info->name, L"GPU::%S", name.c_str());
|
||||
return TRUE;
|
||||
return;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
});
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
default:
|
||||
return FALSE;
|
||||
|
||||
Reference in new issue
Block a user