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 #5568 from lioncash/boot 

Boot: Make BootExecutableReader hierarchy constructors explicit
This commit is contained in:
Leo Lam 2017-06-07 09:27:04 +02:00 committed by GitHub
parent a3e9aba7b0 b0427731b3
commit 6ee2227ba2
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Boot/Boot.h
View File

@ -109,8 +109,8 @@ private:
class BootExecutableReader class BootExecutableReader
{ {
public: public:
BootExecutableReader(const std::string& file_name); explicit BootExecutableReader(const std::string& file_name);
BootExecutableReader(const std::vector<u8>& buffer); explicit BootExecutableReader(const std::vector<u8>& buffer);
virtual ~BootExecutableReader(); virtual ~BootExecutableReader();
virtual u32 GetEntryPoint() const = 0; virtual u32 GetEntryPoint() const = 0;

4
Source/Core/Core/Boot/DolReader.h
View File

@ -13,8 +13,8 @@
class DolReader final : public BootExecutableReader class DolReader final : public BootExecutableReader
{ {
public: public:
DolReader(const std::string& filename); explicit DolReader(const std::string& filename);
DolReader(const std::vector<u8>& buffer); explicit DolReader(const std::vector<u8>& buffer);
~DolReader(); ~DolReader();
bool IsValid() const override { return m_is_valid; } bool IsValid() const override { return m_is_valid; }

2
Source/Core/Core/Boot/ElfReader.cpp
View File

@ -76,6 +76,8 @@ ElfReader::ElfReader(const std::string& filename) : BootExecutableReader(filenam
Initialize(m_bytes.data()); Initialize(m_bytes.data());
} }
ElfReader::~ElfReader() = default;
void ElfReader::Initialize(u8* ptr) void ElfReader::Initialize(u8* ptr)
{ {
base = (char*)ptr; base = (char*)ptr;

6
Source/Core/Core/Boot/ElfReader.h
View File

@ -21,9 +21,9 @@ typedef int SectionID;
class ElfReader final : public BootExecutableReader class ElfReader final : public BootExecutableReader
{ {
public: public:
ElfReader(const std::string& filename); explicit ElfReader(const std::string& filename);
ElfReader(const std::vector<u8>& buffer); explicit ElfReader(const std::vector<u8>& buffer);
~ElfReader() {} ~ElfReader();
u32 Read32(int off) const { return base32[off >> 2]; } u32 Read32(int off) const { return base32[off >> 2]; }
// Quick accessors // Quick accessors
ElfType GetType() const { return (ElfType)(header->e_type); } ElfType GetType() const { return (ElfType)(header->e_type); }