ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SymbolDB: GetSymbolsFromHash added

This commit is contained in:
Sepalani 2016-10-05 15:51:12 +01:00
parent d778b8a820
commit 7e974f1064
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Common/SymbolDB.cpp
View File

@ -61,6 +61,26 @@ std::vector<Symbol*> SymbolDB::GetSymbolsFromName(const std::string& name)
return symbols;
}
Symbol* SymbolDB::GetSymbolFromHash(u32 hash)
{
XFuncPtrMap::iterator iter = checksumToFunction.find(hash);
if (iter != checksumToFunction.end())
return iter->second;
else
return nullptr;
}
std::vector<Symbol*> SymbolDB::GetSymbolsFromHash(u32 hash)
{
std::vector<Symbol*> symbols;
for (const auto& iter : checksumToFunction)
if (iter.first == hash)
symbols.push_back(iter.second);
return symbols;
}
void SymbolDB::AddCompleteSymbol(const Symbol& symbol)
{
functions.emplace(symbol.address, symbol);

10
Source/Core/Common/SymbolDB.h
View File

@ -72,14 +72,8 @@ public:
Symbol* GetSymbolFromName(const std::string& name);
std::vector<Symbol*> GetSymbolsFromName(const std::string& name);
Symbol* GetSymbolFromHash(u32 hash)
{
XFuncPtrMap::iterator iter = checksumToFunction.find(hash);
if (iter != checksumToFunction.end())
return iter->second;
else
return nullptr;
}
Symbol* GetSymbolFromHash(u32 hash);
std::vector<Symbol*> GetSymbolsFromHash(u32 hash);
const XFuncMap& Symbols() const { return functions; }
XFuncMap& AccessSymbols() { return functions; }

6
Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp
View File

@ -72,12 +72,10 @@ void SignatureDB::Apply(PPCSymbolDB* symbol_db)
{
for (const auto& entry : m_database)
{
u32 hash = entry.first;
Symbol* function = symbol_db->GetSymbolFromHash(hash);
if (function)
for (const auto& function : symbol_db->GetSymbolsFromHash(entry.first))
{
// Found the function. Let's rename it according to the symbol file.
if (entry.second.size == (unsigned int)function->size)
if (entry.second.size == static_cast<unsigned int>(function->size))
{
function->name = entry.second.name;
INFO_LOG(OSHLE, "Found %s at %08x (size: %08x)!", entry.second.name.c_str(),