Move NotifySymbolMapUpdated to System_Notify

This commit is contained in:
Henrik Rydgård 2023-03-21 11:28:50 +01:00
parent dda8635c89
commit c92a4acb40
11 changed files with 14 additions and 19 deletions

View file

@ -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);

View file

@ -27,7 +27,6 @@ class Host {
public:
virtual ~Host() {}
virtual void NotifySymbolMapUpdated() {}
virtual void SetDebugMode(bool mode) { }
virtual void NotifySwitchUMDUpdated() {}

View file

@ -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);

View file

@ -47,6 +47,7 @@
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/HW/Camera.h"
#include "Core/Debugger/SymbolMap.h"
#include <signal.h>
#include <string.h>
@ -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;
}

View file

@ -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 {

View file

@ -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
}

View file

@ -25,7 +25,6 @@ public:
bool AttemptLoadSymbolMap() override;
void SaveSymbolMap() override;
void NotifySymbolMapUpdated() override;
void SetWindowTitle(const char *message) override;
void ToggleDebugConsoleVisibility() override;

View file

@ -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;

View file

@ -47,7 +47,6 @@ public:
bool AttemptLoadSymbolMap() override;
void SaveSymbolMap() override;
void NotifySymbolMapUpdated() override;
void SetWindowTitle(const char *message) override;
void ToggleDebugConsoleVisibility() override;

View file

@ -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;
}
}

View file

@ -37,7 +37,6 @@ public:
void ShutdownSound() override {}
bool AttemptLoadSymbolMap() override { g_symbolMap->Clear(); return false; }
void NotifySymbolMapUpdated() override {}
bool ShouldSkipUI() override { return true; }