archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8064 from JosJuice/notify-host-symbols-clear

Browse source 
Call Host_NotifyMapLoaded when clearing g_symbolDB
This commit is contained in:
Léo Lam 2019-05-03 11:47:26 +02:00 committed by GitHub
commit 6c7aeb3ffb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/Common/SymbolDB.cpp
View file

@ -42,6 +42,11 @@ void SymbolDB::List()
INFO_LOG(OSHLE, "%zu functions known in this program above.", m_functions.size());
}
bool SymbolDB::IsEmpty() const
{
return m_functions.empty();
}
void SymbolDB::Clear(const char* prefix)
{
// TODO: honor prefix

1
Source/Core/Common/SymbolDB.h
View file

@ -78,6 +78,7 @@ public:
const XFuncMap& Symbols() const { return m_functions; }
XFuncMap& AccessSymbols() { return m_functions; }
bool IsEmpty() const;
void Clear(const char* prefix = "");
void List();
void Index();

6
Source/Core/Core/Boot/Boot.cpp
View file

@ -383,7 +383,11 @@ bool CBoot::BootUp(std::unique_ptr<BootParameters> boot)
{
SConfig& config = SConfig::GetInstance();
g_symbolDB.Clear();
if (!g_symbolDB.IsEmpty())
{
g_symbolDB.Clear();
UpdateDebugger_MapLoaded();
}
// PAL Wii uses NTSC framerate and linecount in 60Hz modes
VideoInterface::Preset(DiscIO::IsNTSC(config.m_region) ||

7
Source/Core/Core/ConfigManager.cpp
View file

@ -35,6 +35,7 @@
#include "Core/HLE/HLE.h"
#include "Core/HW/DVD/DVDInterface.h"
#include "Core/HW/SI/SI.h"
#include "Core/Host.h"
#include "Core/IOS/ES/ES.h"
#include "Core/IOS/ES/Formats.h"
#include "Core/PatchEngine.h"
@ -731,7 +732,11 @@ void SConfig::SetRunningGameMetadata(const std::string& game_id, const std::stri
if (Core::IsRunning())
{
// TODO: have a callback mechanism for title changes?
g_symbolDB.Clear();
if (!g_symbolDB.IsEmpty())
{
g_symbolDB.Clear();
Host_NotifyMapLoaded();
}
CBoot::LoadMapFromFilename();
HLE::Reload();
PatchEngine::Reload();

8
Source/Core/Core/IOS/MIOS.cpp
View file

@ -20,6 +20,7 @@
#include "Core/HW/DVD/DVDInterface.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/SystemTimers.h"
#include "Core/Host.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/PowerPC.h"
@ -52,11 +53,16 @@ bool Load()
NOTICE_LOG(IOS, "Reinitialised hardware.");
// Load symbols for the IPL if they exist.
g_symbolDB.Clear();
if (!g_symbolDB.IsEmpty())
{
g_symbolDB.Clear();
Host_NotifyMapLoaded();
}
if (g_symbolDB.LoadMap(File::GetUserPath(D_MAPS_IDX) + "mios-ipl.map"))
{
::HLE::Clear();
::HLE::PatchFunctions();
Host_NotifyMapLoaded();
}
const PowerPC::CoreMode core_mode = PowerPC::GetMode();