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 #8932 from sepalani/cw-map 

PPCSymbolDB: Improve symbol map column detection
This commit is contained in:
Léo Lam 2021-08-29 23:28:09 +02:00 committed by GitHub
parent 006fc99e8e 0b0bab11d8
commit 86f2c7889d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <map> #include <map>
#include <sstream>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <utility> #include <utility>
@ -242,12 +243,6 @@ bool PPCSymbolDB::LoadMap(const std::string& filename, bool bad)
if (length < 4) if (length < 4)
continue; continue;
if (length == 34 && strcmp(line, " address Size address offset\n") == 0)
{
column_count = 4;
continue;
}
char temp[256]{}; char temp[256]{};
sscanf(line, "%255s", temp); sscanf(line, "%255s", temp);
@ -297,14 +292,38 @@ bool PPCSymbolDB::LoadMap(const std::string& filename, bool bad)
if (section_name.empty()) if (section_name.empty())
continue; continue;
// Detect two columns with three columns fallback // Column detection heuristic
if (column_count == 0) if (column_count == 0)
{ {
const std::string_view stripped_line = StripSpaces(line); constexpr auto is_hex_str = [](const std::string& s) {
if (std::count(stripped_line.begin(), stripped_line.end(), ' ') == 1) return !s.empty() && s.find_first_not_of("0123456789abcdefABCDEF") == std::string::npos;
column_count = 2; };
else const std::string stripped_line(StripSpaces(line));
std::istringstream iss(stripped_line);
iss.imbue(std::locale::classic());
std::string word;
// Two columns format:
// 80004000 zz_80004000_
if (!(iss >> word) || word.length() != 8 || !is_hex_str(word))
continue;
column_count = 2;
// Three columns format:
// Starting Virtual
// address Size address
// -----------------------
if (iss && iss >> word && is_hex_str(word) && iss >> word && is_hex_str(word))
column_count = 3; column_count = 3;
else
iss.str("");
// Four columns format:
// Starting Virtual File
// address Size address offset
// ---------------------------------
if (iss && iss >> word && word.length() == 8 && is_hex_str(word))
column_count = 4;
} }
u32 address, vaddress, size, offset, alignment; u32 address, vaddress, size, offset, alignment;