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

Merge pull request #10924 from Pokechu22/symbols-missing-last-function 

PPCSymbolDB: Fix getting symbol for the last function
This commit is contained in:
Admiral H. Curtiss 2022-07-30 21:52:10 +02:00 committed by GitHub
parent ecc4bc5098 1f17a3bb1e
commit 92c7566646
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,18 +92,20 @@ void PPCSymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const std::string& nam
Common::Symbol* PPCSymbolDB::GetSymbolFromAddr(u32 addr)
{
auto it = m_functions.lower_bound(addr);
if (it == m_functions.end())
return nullptr;
// If the address is exactly the start address of a symbol, we're done.
if (it->second.address == addr)
return &it->second;
// Otherwise, check whether the address is within the bounds of a symbol.
if (it != m_functions.end())
{
// If the address is exactly the start address of a symbol, we're done.
if (it->second.address == addr)
return &it->second;
}
if (it != m_functions.begin())
{
// Otherwise, check whether the address is within the bounds of a symbol.
--it;
if (addr >= it->second.address && addr < it->second.address + it->second.size)
return &it->second;
if (addr >= it->second.address && addr < it->second.address + it->second.size)
return &it->second;
}
return nullptr;
}