preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Simplify symbol map filename build.

Browse Source
This commit is contained in:
Unknown W. Brackets
2021-05-14 22:48:32 -07:00
parent d376e67f87
commit c03e68c996
3 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Qt/QtHost.cpp
+1 -5
View File
@@ -19,9 +19,5 @@
#include "Qt/QtHost.h"
Path QtHost::SymbolMapFilename(Path currentFilename) {
std::string ext = currentFilename.GetFileExtension();
if (ext == "")
return currentFilename.WithExtraExtension("map");
else
return currentFilename.WithReplacedExtension(ext, "map");
return currentFilename.WithReplacedExtension(".map");
}
UWP/UWPHost.cpp
+8 -17
View File
@@ -121,36 +121,27 @@ void UWPHost::BootDone() {
Core_EnableStepping(false);
}
static Path SymbolMapFilename(const char *currentFilename, const char *ext) {
static Path SymbolMapFilename(const Path &currentFilename, const char *ext) {
File::FileInfo info;
std::string result = currentFilename;
// can't fail, definitely exists if it gets this far
File::GetFileInfo(Path(currentFilename), &info);
File::GetFileInfo(currentFilename, &info);
if (info.isDirectory) {
return Path(result) / (std::string(".ppsspp-symbols") + ext);
} else {
size_t dot = result.rfind('.');
if (dot == result.npos)
return Path(result + ext);
result.replace(dot, result.npos, ext);
return Path(result);
return currentFilename / (std::string(".ppsspp-symbols") + ext);
}
return currentFilename.WithReplacedExtension(ext);
}
bool UWPHost::AttemptLoadSymbolMap() {
bool result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".ppmap"));
bool result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap"));
// Load the old-style map file.
if (!result1)
result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".map"));
bool result2 = g_symbolMap->LoadNocashSym(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".sym"));
result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".map"));
bool result2 = g_symbolMap->LoadNocashSym(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".sym"));
return result1 || result2;
}
void UWPHost::SaveSymbolMap() {
g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".ppmap"));
g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap"));
}
void UWPHost::NotifySymbolMapUpdated() {
Windows/WindowsHost.cpp
+8 -17
View File
@@ -268,39 +268,30 @@ void WindowsHost::BootDone() {
SetDebugMode(!g_Config.bAutoRun);
}
static Path SymbolMapFilename(const char *currentFilename, const char* ext) {
static Path SymbolMapFilename(const Path &currentFilename, const char *ext) {
File::FileInfo info;
std::string result = currentFilename;
// can't fail, definitely exists if it gets this far
File::GetFileInfo(Path(currentFilename), &info);
File::GetFileInfo(currentFilename, &info);
if (info.isDirectory) {
return Path(result) / (std::string(".ppsspp-symbols") + ext);
} else {
const size_t dot = result.rfind('.');
if (dot == result.npos)
return Path(result + ext);
result.replace(dot, result.npos, ext);
return Path(result);
return currentFilename / (std::string(".ppsspp-symbols") + ext);
}
return currentFilename.WithReplacedExtension(ext);
}
bool WindowsHost::AttemptLoadSymbolMap() {
if (!g_symbolMap)
return false;
bool result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".ppmap"));
bool result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap"));
// Load the old-style map file.
if (!result1)
result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".map"));
bool result2 = g_symbolMap->LoadNocashSym(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(), ".sym"));
result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".map"));
bool result2 = g_symbolMap->LoadNocashSym(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".sym"));
return result1 || result2;
}
void WindowsHost::SaveSymbolMap() {
if (g_symbolMap)
g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(),".ppmap"));
g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart, ".ppmap"));
}
void WindowsHost::NotifySymbolMapUpdated() {