SymbolDB: Use set to map hash with symbols

dolphin-emu · Oct 10, 2016 · 92a2e03 · 92a2e03
1 parent e509268
commit 92a2e03
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp
@@ -65,7 +65,7 @@ Symbol* SymbolDB::GetSymbolFromHash(u32 hash)
 {
   XFuncPtrMap::iterator iter = checksumToFunction.find(hash);
   if (iter != checksumToFunction.end())
-    return iter->second;
+    return *iter->second.begin();
   else
     return nullptr;
 }
@@ -76,7 +76,8 @@ std::vector<Symbol*> SymbolDB::GetSymbolsFromHash(u32 hash)
 
   for (const auto& iter : checksumToFunction)
     if (iter.first == hash)
-      symbols.push_back(iter.second);
+      for (const auto& symbol : iter.second)
+        symbols.push_back(symbol);
 
   return symbols;
 }

diff --git a/Source/Core/Common/SymbolDB.h b/Source/Core/Common/SymbolDB.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <map>
+#include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ -57,7 +58,7 @@ class SymbolDB
 {
 public:
   typedef std::map<u32, Symbol> XFuncMap;
-  typedef std::map<u32, Symbol*> XFuncPtrMap;
+  typedef std::map<u32, std::set<Symbol*>> XFuncPtrMap;
 
 protected:
   XFuncMap functions;

diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
@@ -58,7 +58,7 @@ Symbol* PPCSymbolDB::AddFunction(u32 startAddr)
     // LOG(OSHLE, "Symbol found at %08x", startAddr);
     functions[startAddr] = tempFunc;
     tempFunc.type = Symbol::Type::Function;
-    checksumToFunction[tempFunc.hash] = &(functions[startAddr]);
+    checksumToFunction[tempFunc.hash].insert(&functions[startAddr]);
     return &functions[startAddr];
   }
 }
@@ -87,7 +87,7 @@ void PPCSymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const std::string& nam
     if (tf.type == Symbol::Type::Function)
     {
       PPCAnalyst::AnalyzeFunction(startAddr, tf, size);
-      checksumToFunction[tf.hash] = &(functions[startAddr]);
+      checksumToFunction[tf.hash].insert(&functions[startAddr]);
       tf.function_name = GetStrippedFunctionName(name);
     }
     tf.size = size;