mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Move NotifySymbolMapUpdated to System_Notify
This commit is contained in:
parent
dda8635c89
commit
c92a4acb40
11 changed files with 14 additions and 19 deletions
|
@ -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);
|
||||
|
|
|
@ -27,7 +27,6 @@ class Host {
|
|||
public:
|
||||
virtual ~Host() {}
|
||||
|
||||
virtual void NotifySymbolMapUpdated() {}
|
||||
virtual void SetDebugMode(bool mode) { }
|
||||
virtual void NotifySwitchUMDUpdated() {}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -25,7 +25,6 @@ public:
|
|||
|
||||
bool AttemptLoadSymbolMap() override;
|
||||
void SaveSymbolMap() override;
|
||||
void NotifySymbolMapUpdated() override;
|
||||
void SetWindowTitle(const char *message) override;
|
||||
|
||||
void ToggleDebugConsoleVisibility() override;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -47,7 +47,6 @@ public:
|
|||
|
||||
bool AttemptLoadSymbolMap() override;
|
||||
void SaveSymbolMap() override;
|
||||
void NotifySymbolMapUpdated() override;
|
||||
void SetWindowTitle(const char *message) override;
|
||||
|
||||
void ToggleDebugConsoleVisibility() override;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -37,7 +37,6 @@ public:
|
|||
void ShutdownSound() override {}
|
||||
|
||||
bool AttemptLoadSymbolMap() override { g_symbolMap->Clear(); return false; }
|
||||
void NotifySymbolMapUpdated() override {}
|
||||
|
||||
bool ShouldSkipUI() override { return true; }
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue