ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BootElf: Use unique_ptr<u8 []> instead of vectors.

This commit is contained in:
Scott Mansell 2014-11-01 21:03:14 +13:00
parent f1a4b98d36
commit 2642c3f73b
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/Boot/Boot_ELF.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/StdMakeUnique.h"
#include "Core/Boot/Boot.h" #include "Core/Boot/Boot.h"
#include "Core/Boot/ElfReader.h" #include "Core/Boot/ElfReader.h"
@ -14,12 +15,12 @@ bool CBoot::IsElfWii(const std::string& filename)
/* We already check if filename existed before we called this function, so /* We already check if filename existed before we called this function, so
there is no need for another check, just read the file right away */ there is no need for another check, just read the file right away */
const u64 filesize = File::GetSize(filename); size_t filesize = File::GetSize(filename);
std::vector<u8> mem((size_t)filesize); auto elf = std::make_unique<u8 []>(filesize);
{ {
File::IOFile f(filename, "rb"); File::IOFile f(filename, "rb");
f.ReadBytes(mem.data(), (size_t)filesize); f.ReadBytes(elf.get(), filesize);
} }
// Use the same method as the DOL loader uses: search for mfspr from HID4, // Use the same method as the DOL loader uses: search for mfspr from HID4,
@ -30,7 +31,7 @@ bool CBoot::IsElfWii(const std::string& filename)
u32 HID4_pattern = 0x7c13fba6; u32 HID4_pattern = 0x7c13fba6;
u32 HID4_mask = 0xfc1fffff; u32 HID4_mask = 0xfc1fffff;
ElfReader reader(mem.data()); ElfReader reader(elf.get());
for (int i = 0; i < reader.GetNumSections(); ++i) for (int i = 0; i < reader.GetNumSections(); ++i)
{ {
@ -53,16 +54,19 @@ bool CBoot::IsElfWii(const std::string& filename)
bool CBoot::Boot_ELF(const std::string& filename) bool CBoot::Boot_ELF(const std::string& filename)
{ {
const u64 filesize = File::GetSize(filename); // Read ELF from file
std::vector<u8> mem((size_t)filesize); size_t filesize = File::GetSize(filename);
auto elf = std::make_unique<u8 []>(filesize);
{ {
File::IOFile f(filename, "rb"); File::IOFile f(filename, "rb");
f.ReadBytes(mem.data(), (size_t)filesize); f.ReadBytes(elf.get(), filesize);
} }
ElfReader reader(mem.data()); // Load ELF into GameCube Memory
ElfReader reader(elf.get());
reader.LoadInto(0x80000000); reader.LoadInto(0x80000000);
if (!reader.LoadSymbols()) if (!reader.LoadSymbols())
{ {
if (LoadMapFromFilename()) if (LoadMapFromFilename())