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 #5466 from lioncash/db 

SignatureDB: Minor cleanup
This commit is contained in:
Mat M 2017-05-22 21:25:36 -04:00 committed by GitHub
parent 4bfd464b0c c3bab0b0e7
commit 3f437337a1
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp
View File

@ -5,7 +5,6 @@
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/PPCAnalyst.h"
@ -18,15 +17,9 @@
#include "Core/PowerPC/SignatureDB/DSYSignatureDB.h" #include "Core/PowerPC/SignatureDB/DSYSignatureDB.h"
#include "Core/PowerPC/SignatureDB/MEGASignatureDB.h" #include "Core/PowerPC/SignatureDB/MEGASignatureDB.h"
SignatureDB::SignatureDB(SignatureDB::HandlerType handler) : m_handler(CreateFormatHandler(handler)) namespace
{ {
} SignatureDB::HandlerType GetHandlerType(const std::string& file_path)
SignatureDB::SignatureDB(const std::string& file_path) : SignatureDB(GetHandlerType(file_path))
{
}
SignatureDB::HandlerType SignatureDB::GetHandlerType(const std::string& file_path)
{ {
if (StringEndsWith(file_path, ".csv")) if (StringEndsWith(file_path, ".csv"))
return SignatureDB::HandlerType::CSV; return SignatureDB::HandlerType::CSV;
@ -35,8 +28,7 @@ SignatureDB::HandlerType SignatureDB::GetHandlerType(const std::string& file_pat
return SignatureDB::HandlerType::DSY; return SignatureDB::HandlerType::DSY;
} }
std::unique_ptr<SignatureDBFormatHandler> std::unique_ptr<SignatureDBFormatHandler> CreateFormatHandler(SignatureDB::HandlerType handler)
SignatureDB::CreateFormatHandler(SignatureDB::HandlerType handler) const
{ {
switch (handler) switch (handler)
{ {
@ -49,6 +41,15 @@ SignatureDB::CreateFormatHandler(SignatureDB::HandlerType handler) const
return std::make_unique<MEGASignatureDB>(); return std::make_unique<MEGASignatureDB>();
} }
} }
} // Anonymous namespace
SignatureDB::SignatureDB(HandlerType handler) : m_handler(CreateFormatHandler(handler))
{
}
SignatureDB::SignatureDB(const std::string& file_path) : SignatureDB(GetHandlerType(file_path))
{
}
void SignatureDB::Clear() void SignatureDB::Clear()
{ {
@ -217,6 +218,4 @@ u32 HashSignatureDB::ComputeCodeChecksum(u32 offsetStart, u32 offsetEnd)
return sum; return sum;
} }
SignatureDBFormatHandler::~SignatureDBFormatHandler() SignatureDBFormatHandler::~SignatureDBFormatHandler() = default;
{
}

16
Source/Core/Core/PowerPC/SignatureDB/SignatureDB.h
View File

@ -27,8 +27,6 @@ public:
explicit SignatureDB(HandlerType handler); explicit SignatureDB(HandlerType handler);
explicit SignatureDB(const std::string& file_path); explicit SignatureDB(const std::string& file_path);
static HandlerType GetHandlerType(const std::string& file_path);
void Clear(); void Clear();
// Does not clear. Remember to clear first if that's what you want. // Does not clear. Remember to clear first if that's what you want.
bool Load(const std::string& file_path); bool Load(const std::string& file_path);
@ -41,7 +39,6 @@ public:
bool Add(u32 start_addr, u32 size, const std::string& name); bool Add(u32 start_addr, u32 size, const std::string& name);
private: private:
std::unique_ptr<SignatureDBFormatHandler> CreateFormatHandler(HandlerType handler) const;
std::unique_ptr<SignatureDBFormatHandler> m_handler; std::unique_ptr<SignatureDBFormatHandler> m_handler;
}; };
@ -66,23 +63,22 @@ class HashSignatureDB : public SignatureDBFormatHandler
public: public:
struct DBFunc struct DBFunc
{ {
u32 size; u32 size = 0;
std::string name; std::string name;
std::string object_name; std::string object_name;
std::string object_location; std::string object_location;
DBFunc() : size(0) {}
}; };
using FuncDB = std::map<u32, DBFunc>; using FuncDB = std::map<u32, DBFunc>;
static u32 ComputeCodeChecksum(u32 offsetStart, u32 offsetEnd); static u32 ComputeCodeChecksum(u32 offsetStart, u32 offsetEnd);
virtual void Clear() override; void Clear() override;
virtual void List() const override; void List() const override;
virtual void Populate(const PPCSymbolDB* func_db, const std::string& filter = "") override; void Populate(const PPCSymbolDB* func_db, const std::string& filter = "") override;
virtual void Apply(PPCSymbolDB* func_db) const override; void Apply(PPCSymbolDB* func_db) const override;
virtual bool Add(u32 startAddr, u32 size, const std::string& name) override; bool Add(u32 startAddr, u32 size, const std::string& name) override;
protected: protected:
// Map from signature to function. We store the DB in this map because it optimizes the // Map from signature to function. We store the DB in this map because it optimizes the