diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index 6f500e9aad..2da852a2cd 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -547,13 +547,9 @@ Module *__KernelLoadELFFromPtr(const u8 *ptr, u32 loadAddress, std::string *erro u32 textStart = reader.GetSectionAddr(textSection); u32 textSize = reader.GetSectionSize(textSection); - host->AttemptLoadSymbolMap(); - if (!reader.LoadSymbols()) MIPSAnalyst::ScanForFunctions(textStart, textStart+textSize); } - else - host->AttemptLoadSymbolMap(); INFO_LOG(LOADER,"Module %s: %08x %08x %08x", modinfo->name, modinfo->gp, modinfo->libent,modinfo->libstub); diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index 52d11254fa..77dd9d8760 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -168,16 +168,12 @@ static std::string SymbolMapFilename(const char *currentFilename) bool WindowsHost::AttemptLoadSymbolMap() { - if (loadedSymbolMap_) - return true; - loadedSymbolMap_ = symbolMap.LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str()).c_str()); - return loadedSymbolMap_; + return symbolMap.LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str()).c_str()); } void WindowsHost::SaveSymbolMap() { symbolMap.SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str()).c_str()); - loadedSymbolMap_ = false; } void WindowsHost::AddSymbol(std::string name, u32 addr, u32 size, int type=0) diff --git a/Windows/WindowsHost.h b/Windows/WindowsHost.h index 91b11745ea..a4428693d7 100644 --- a/Windows/WindowsHost.h +++ b/Windows/WindowsHost.h @@ -28,7 +28,6 @@ public: mainWindow_ = mainWindow; displayWindow_ = displayWindow; input = getInputDevices(); - loadedSymbolMap_ = false; SetConsolePosition(); } ~WindowsHost() @@ -64,5 +63,4 @@ private: HWND displayWindow_; HWND mainWindow_; std::list> input; - bool loadedSymbolMap_; }; \ No newline at end of file