From c92a4acb40afe99e6e3ddeac6cc3cebf6d565b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 21 Mar 2023 11:28:50 +0100 Subject: [PATCH] Move NotifySymbolMapUpdated to System_Notify --- Core/HLE/sceKernelModule.cpp | 4 +++- Core/Host.h | 1 - Qt/QtHost.h | 3 --- Qt/QtMain.cpp | 5 +++++ UI/HostTypes.h | 1 - UWP/UWPHost.cpp | 4 ---- UWP/UWPHost.h | 1 - Windows/WindowsHost.cpp | 6 ------ Windows/WindowsHost.h | 1 - Windows/main.cpp | 6 ++++++ headless/StubHost.h | 1 - 11 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index dc4b53032d..7ea2fbf0ab 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -26,6 +26,8 @@ #include "Common/Serialize/SerializeSet.h" #include "Common/File/FileUtil.h" #include "Common/StringUtils.h" +#include "Common/System/System.h" + #include "Core/Config.h" #include "Core/Core.h" #include "Core/HLE/HLE.h" @@ -1829,7 +1831,7 @@ bool __KernelLoadExec(const char *filename, u32 paramPtr, std::string *error_str return false; } - host->NotifySymbolMapUpdated(); + System_Notify(SystemNotification::SYMBOL_MAP_UPDATED); char moduleName[29] = { 0 }; int moduleVersion = module->nm.version[0] | (module->nm.version[1] << 8); diff --git a/Core/Host.h b/Core/Host.h index 5fc61c220e..2e9bd64e99 100644 --- a/Core/Host.h +++ b/Core/Host.h @@ -27,7 +27,6 @@ class Host { public: virtual ~Host() {} - virtual void NotifySymbolMapUpdated() {} virtual void SetDebugMode(bool mode) { } virtual void NotifySwitchUMDUpdated() {} diff --git a/Qt/QtHost.h b/Qt/QtHost.h index a9816f7be4..00c8af3ac4 100644 --- a/Qt/QtHost.h +++ b/Qt/QtHost.h @@ -20,7 +20,6 @@ #include "Core/Host.h" #include "UI/OnScreenDisplay.h" -#include "Core/Debugger/SymbolMap.h" #include "Qt/mainwindow.h" class QtHost : public Host { @@ -44,8 +43,6 @@ public: return g_symbolMap->LoadSymbolMap(fn); } - void NotifySymbolMapUpdated() override { g_symbolMap->SortSymbols(); } - void PrepareShutdown() { auto fn = SymbolMapFilename(PSP_CoreParameter().fileToStart); g_symbolMap->SaveSymbolMap(fn); diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index 1305137ccc..8228e33411 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -47,6 +47,7 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/HW/Camera.h" +#include "Core/Debugger/SymbolMap.h" #include #include @@ -260,6 +261,10 @@ void System_Notify(SystemNotification notification) { g_symbolMap->SortSymbols(); mainWindow->Notify(MainWindowMsg::BOOT_DONE); break; + case SystemNotification::SYMBOL_MAP_UPDATED: + if (g_symbolMap) + g_symbolMap->SortSymbols(); + break; default: break; } diff --git a/UI/HostTypes.h b/UI/HostTypes.h index de5b35fdee..9a46df48e1 100644 --- a/UI/HostTypes.h +++ b/UI/HostTypes.h @@ -34,7 +34,6 @@ public: void ShutdownSound() override; bool AttemptLoadSymbolMap() override {return false;} - void NotifySymbolMapUpdated() override {} void SetWindowTitle(const char *message) override {} void NotifyUserMessage(const std::string &message, float duration = 1.0f, u32 color = 0x00FFFFFF, const char *id = nullptr) override { diff --git a/UWP/UWPHost.cpp b/UWP/UWPHost.cpp index 58c30f704d..e87c9e970f 100644 --- a/UWP/UWPHost.cpp +++ b/UWP/UWPHost.cpp @@ -126,10 +126,6 @@ void UWPHost::SaveSymbolMap() { g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap")); } -void UWPHost::NotifySymbolMapUpdated() { - g_symbolMap->SortSymbols(); -} - void UWPHost::ToggleDebugConsoleVisibility() { // N/A } diff --git a/UWP/UWPHost.h b/UWP/UWPHost.h index 038bf9becb..ba63ce224e 100644 --- a/UWP/UWPHost.h +++ b/UWP/UWPHost.h @@ -25,7 +25,6 @@ public: bool AttemptLoadSymbolMap() override; void SaveSymbolMap() override; - void NotifySymbolMapUpdated() override; void SetWindowTitle(const char *message) override; void ToggleDebugConsoleVisibility() override; diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index f270d79c02..8a9470d99c 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -270,12 +270,6 @@ void WindowsHost::SaveSymbolMap() { g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap")); } -void WindowsHost::NotifySymbolMapUpdated() { - if (g_symbolMap) - g_symbolMap->SortSymbols(); - PostMessage(mainWindow_, WM_USER + 1, 0, 0); -} - // http://msdn.microsoft.com/en-us/library/aa969393.aspx HRESULT CreateLink(LPCWSTR lpszPathObj, LPCWSTR lpszArguments, LPCWSTR lpszPathLink, LPCWSTR lpszDesc) { HRESULT hres; diff --git a/Windows/WindowsHost.h b/Windows/WindowsHost.h index 42e7e62094..23777953c8 100644 --- a/Windows/WindowsHost.h +++ b/Windows/WindowsHost.h @@ -47,7 +47,6 @@ public: bool AttemptLoadSymbolMap() override; void SaveSymbolMap() override; - void NotifySymbolMapUpdated() override; void SetWindowTitle(const char *message) override; void ToggleDebugConsoleVisibility() override; diff --git a/Windows/main.cpp b/Windows/main.cpp index b10e10321e..3622469976 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -411,6 +411,12 @@ void System_Notify(SystemNotification notification) { if (disasmWindow) PostDialogMessage(disasmWindow, WM_DEB_UPDATE); break; + + case SystemNotification::SYMBOL_MAP_UPDATED: + if (g_symbolMap) + g_symbolMap->SortSymbols(); + PostMessage(MainWindow::GetHWND(), WM_USER + 1, 0, 0); + break; } } diff --git a/headless/StubHost.h b/headless/StubHost.h index d952802e73..0a5ebf23f1 100644 --- a/headless/StubHost.h +++ b/headless/StubHost.h @@ -37,7 +37,6 @@ public: void ShutdownSound() override {} bool AttemptLoadSymbolMap() override { g_symbolMap->Clear(); return false; } - void NotifySymbolMapUpdated() override {} bool ShouldSkipUI() override { return true; }