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

PPCSymbolDB: Use emplace() where applicable 

Avoids default constructing an entry in the map that just gets
immediately overwritten. Also gets rid of some redundant map lookups.
This commit is contained in:
Lioncash 2023-05-02 15:41:01 -04:00
parent 0b9b09ad32
commit a14d8003f4
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/PowerPC/PPCSymbolDB.cpp
View File

@ -44,8 +44,8 @@ Common::Symbol* PPCSymbolDB::AddFunction(const Core::CPUThreadGuard& guard, u32
if (!PPCAnalyst::AnalyzeFunction(guard, start_addr, symbol)) if (!PPCAnalyst::AnalyzeFunction(guard, start_addr, symbol))
return nullptr; return nullptr;
m_functions[start_addr] = std::move(symbol); const auto insert = m_functions.emplace(start_addr, std::move(symbol));
Common::Symbol* ptr = &m_functions[start_addr]; Common::Symbol* ptr = &insert.first->second;
ptr->type = Common::Symbol::Type::Function; ptr->type = Common::Symbol::Type::Function;
m_checksum_to_function[ptr->hash].insert(ptr); m_checksum_to_function[ptr->hash].insert(ptr);
return ptr; return ptr;
@ -71,23 +71,25 @@ void PPCSymbolDB::AddKnownSymbol(const Core::CPUThreadGuard& guard, u32 startAdd
tf.Rename(name); tf.Rename(name);
tf.type = type; tf.type = type;
tf.address = startAddr; tf.address = startAddr;
if (tf.type == Common::Symbol::Type::Function)
auto& new_symbol = m_functions.emplace(startAddr, std::move(tf)).first->second;
if (new_symbol.type == Common::Symbol::Type::Function)
{ {
PPCAnalyst::AnalyzeFunction(guard, startAddr, tf, size); PPCAnalyst::AnalyzeFunction(guard, startAddr, new_symbol, size);
// Do not truncate symbol when a size is expected // Do not truncate symbol when a size is expected
if (size != 0 && tf.size != size) if (size != 0 && new_symbol.size != size)
{ {
WARN_LOG_FMT(SYMBOLS, "Analysed symbol ({}) size mismatch, {} expected but {} computed", WARN_LOG_FMT(SYMBOLS, "Analysed symbol ({}) size mismatch, {} expected but {} computed",
name, size, tf.size); name, size, new_symbol.size);
tf.size = size; new_symbol.size = size;
} }
m_checksum_to_function[tf.hash].insert(&m_functions[startAddr]); m_checksum_to_function[new_symbol.hash].insert(&new_symbol);
} }
else else
{ {
tf.size = size; new_symbol.size = size;
} }
m_functions[startAddr] = tf;
} }
} }