Update symbol list of disassembly window when loadexec.

hrydgard · Sep 12, 2020 · fbea8f4 · fbea8f4
1 parent 6c9b9b5
commit fbea8f4
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 0 deletions.
diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp
@@ -1743,6 +1743,8 @@ bool __KernelLoadExec(const char *filename, u32 paramPtr, std::string *error_str
 		return false;
 	}
 
+	host->NotifySymbolMapUpdated();
+
 	mipsr4k.pc = module->nm.entry_addr;
 
 	INFO_LOG(LOADER, "Module entry: %08x", mipsr4k.pc);

diff --git a/Core/Host.h b/Core/Host.h
@@ -48,6 +48,7 @@ class Host {
 	virtual bool IsDebuggingEnabled() {return true;}
 	virtual bool AttemptLoadSymbolMap();
 	virtual void SaveSymbolMap() {}
+	virtual void NotifySymbolMapUpdated() {}
 	virtual void SetWindowTitle(const char *message) {}
 
 	virtual bool CanCreateShortcut() {return false;}

diff --git a/Qt/QtHost.h b/Qt/QtHost.h
@@ -67,6 +67,9 @@ class QtHost : public Host {
 		auto fn = SymbolMapFilename(PSP_CoreParameter().fileToStart);
 		return g_symbolMap->LoadSymbolMap(fn.c_str());
 	}
+
+	virtual void NotifySymbolMapUpdated() override { g_symbolMap->SortSymbols(); }
+
 	void PrepareShutdown() {
 		auto fn = SymbolMapFilename(PSP_CoreParameter().fileToStart);
 		g_symbolMap->SaveSymbolMap(fn.c_str());

diff --git a/UI/HostTypes.h b/UI/HostTypes.h
@@ -43,6 +43,7 @@ class NativeHost : public Host {
 
 	bool IsDebuggingEnabled() override {return false;}
 	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
@@ -158,6 +158,10 @@ void UWPHost::SaveSymbolMap() {
 	g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".ppmap").c_str());
 }
 
+void UWPHost::NotifySymbolMapUpdated() {
+	g_symbolMap->SortSymbols();
+}
+
 bool UWPHost::IsDebuggingEnabled() {
 	return false;
 }

diff --git a/UWP/UWPHost.h b/UWP/UWPHost.h
@@ -30,6 +30,7 @@ class UWPHost : public Host {
 	void BootDone() override;
 	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
@@ -312,6 +312,11 @@ void WindowsHost::SaveSymbolMap() {
 	g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(),".ppmap").c_str());
 }
 
+void WindowsHost::NotifySymbolMapUpdated() {
+	g_symbolMap->SortSymbols();
+	PostMessage(mainWindow_, WM_USER + 1, 0, 0);
+}
+
 bool WindowsHost::IsDebuggingEnabled() {
 #ifdef _DEBUG
 	return true;

diff --git a/Windows/WindowsHost.h b/Windows/WindowsHost.h
@@ -52,6 +52,7 @@ class WindowsHost : public Host {
 	void BootDone() override;
 	bool AttemptLoadSymbolMap() override;
 	void SaveSymbolMap() override;
+	void NotifySymbolMapUpdated() override;
 	void SetWindowTitle(const char *message) override;
 
 	void ToggleDebugConsoleVisibility() override;

diff --git a/headless/StubHost.h b/headless/StubHost.h
@@ -44,6 +44,7 @@ class HeadlessHost : public Host {
 
 	bool IsDebuggingEnabled() override { return false; }
 	bool AttemptLoadSymbolMap() override { g_symbolMap->Clear(); return false; }
+	void NotifySymbolMapUpdated() override {}
 
 	bool ShouldSkipUI() override { return true; }