From e9b9797a86b08139d2dfdd7c5b3b0cbd8be091e1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 27 May 2018 17:15:20 -0400 Subject: SymbolDB: Normalize variable names Normalizes variable naming so that it adheres to our coding style While we're at it do minor cleanup relating to modified lines --- Source/Core/Common/SymbolDB.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Source/Core/Common/SymbolDB.cpp') diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp index 0c2268b39a..eabb098f28 100644 --- a/Source/Core/Common/SymbolDB.cpp +++ b/Source/Core/Common/SymbolDB.cpp @@ -28,25 +28,25 @@ void Symbol::Rename(const std::string& symbol_name) void SymbolDB::List() { - for (const auto& func : functions) + for (const auto& func : m_functions) { DEBUG_LOG(OSHLE, "%s @ %08x: %i bytes (hash %08x) : %i calls", func.second.name.c_str(), - func.second.address, func.second.size, func.second.hash, func.second.numCalls); + func.second.address, func.second.size, func.second.hash, func.second.num_calls); } - INFO_LOG(OSHLE, "%zu functions known in this program above.", functions.size()); + INFO_LOG(OSHLE, "%zu functions known in this program above.", m_functions.size()); } void SymbolDB::Clear(const char* prefix) { // TODO: honor prefix - functions.clear(); - checksumToFunction.clear(); + m_functions.clear(); + m_checksum_to_function.clear(); } void SymbolDB::Index() { int i = 0; - for (auto& func : functions) + for (auto& func : m_functions) { func.second.index = i++; } @@ -54,7 +54,7 @@ void SymbolDB::Index() Symbol* SymbolDB::GetSymbolFromName(const std::string& name) { - for (auto& func : functions) + for (auto& func : m_functions) { if (func.second.function_name == name) return &func.second; @@ -67,7 +67,7 @@ std::vector SymbolDB::GetSymbolsFromName(const std::string& name) { std::vector symbols; - for (auto& func : functions) + for (auto& func : m_functions) { if (func.second.function_name == name) symbols.push_back(&func.second); @@ -78,18 +78,18 @@ std::vector SymbolDB::GetSymbolsFromName(const std::string& name) Symbol* SymbolDB::GetSymbolFromHash(u32 hash) { - XFuncPtrMap::iterator iter = checksumToFunction.find(hash); - if (iter != checksumToFunction.end()) - return *iter->second.begin(); - else + auto iter = m_checksum_to_function.find(hash); + if (iter == m_checksum_to_function.end()) return nullptr; + + return *iter->second.begin(); } std::vector SymbolDB::GetSymbolsFromHash(u32 hash) { - const auto iter = checksumToFunction.find(hash); + const auto iter = m_checksum_to_function.find(hash); - if (iter == checksumToFunction.cend()) + if (iter == m_checksum_to_function.cend()) return {}; return {iter->second.cbegin(), iter->second.cend()}; @@ -97,5 +97,5 @@ std::vector SymbolDB::GetSymbolsFromHash(u32 hash) void SymbolDB::AddCompleteSymbol(const Symbol& symbol) { - functions.emplace(symbol.address, symbol); + m_functions.emplace(symbol.address, symbol); } -- cgit v1.2.3 From 72e8058fb8221cadd9595ed3b4c08f41c52e0ebf Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 27 May 2018 17:25:20 -0400 Subject: SymbolDB: Default constructor and destructor within the cpp file Given this is a class with non-trivial data-members, it's preferable to default the constructor and destructor in the cpp file. --- Source/Core/Common/SymbolDB.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/Core/Common/SymbolDB.cpp') diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp index eabb098f28..f6f5815dcb 100644 --- a/Source/Core/Common/SymbolDB.cpp +++ b/Source/Core/Common/SymbolDB.cpp @@ -20,6 +20,10 @@ static std::string GetStrippedFunctionName(const std::string& symbol_name) return name; } +SymbolDB::SymbolDB() = default; + +SymbolDB::~SymbolDB() = default; + void Symbol::Rename(const std::string& symbol_name) { this->name = symbol_name; -- cgit v1.2.3 From f4ec41992988519b0c09db2f6e3f1c79982022ef Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 27 May 2018 17:37:52 -0400 Subject: SymbolDB: Namespace code under the Common namespace Moves more common code into the Common namespace where it belongs. --- Source/Core/Common/SymbolDB.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Source/Core/Common/SymbolDB.cpp') diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp index f6f5815dcb..b433671daa 100644 --- a/Source/Core/Common/SymbolDB.cpp +++ b/Source/Core/Common/SymbolDB.cpp @@ -11,6 +11,8 @@ #include "Common/Logging/Log.h" #include "Common/SymbolDB.h" +namespace Common +{ static std::string GetStrippedFunctionName(const std::string& symbol_name) { std::string name = symbol_name.substr(0, symbol_name.find('(')); @@ -103,3 +105,4 @@ void SymbolDB::AddCompleteSymbol(const Symbol& symbol) { m_functions.emplace(symbol.address, symbol); } +} // namespace Common -- cgit v1.2.3