added ELF loading support to loader.cpp
This commit is contained in:
parent
e32c03e860
commit
85e8da6fc8
|
@ -26,6 +26,7 @@
|
|||
#include "loader.h"
|
||||
#include "system.h"
|
||||
#include "file_sys/directory_file_system.h"
|
||||
#include "elf/elf_reader.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
@ -50,6 +51,37 @@ bool LoadDirectory_CXI(std::string &filename) {
|
|||
return true;
|
||||
}
|
||||
|
||||
/// Loads a CTR ELF file
|
||||
bool Load_ELF(std::string &filename) {
|
||||
std::string full_path = filename;
|
||||
std::string path, file, extension;
|
||||
SplitPath(ReplaceAll(full_path, "\\", "/"), &path, &file, &extension);
|
||||
#if EMU_PLATFORM == PLATFORM_WINDOWS
|
||||
path = ReplaceAll(path, "/", "\\");
|
||||
#endif
|
||||
File::IOFile f(filename, "rb");
|
||||
|
||||
if (f.IsOpen()) {
|
||||
u64 size = f.GetSize();
|
||||
u8* buffer = new u8[size];
|
||||
ElfReader* elf_reader = NULL;
|
||||
|
||||
f.ReadBytes(buffer, size);
|
||||
|
||||
elf_reader = new ElfReader(buffer);
|
||||
elf_reader->LoadInto(0x00100000);
|
||||
|
||||
delete[] buffer;
|
||||
delete elf_reader;
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
f.Close();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
namespace Loader {
|
||||
|
||||
bool IsBootableDirectory() {
|
||||
|
@ -73,16 +105,24 @@ FileType IdentifyFile(std::string &filename) {
|
|||
if (File::IsDirectory(filename)) {
|
||||
if (IsBootableDirectory()) {
|
||||
return FILETYPE_DIRECTORY_CXI;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
return FILETYPE_NORMAL_DIRECTORY;
|
||||
}
|
||||
} else if (!strcasecmp(extension.c_str(),".zip")) {
|
||||
}
|
||||
else if (!strcasecmp(extension.c_str(), ".elf")) {
|
||||
return FILETYPE_CTR_ELF; // TODO(bunnei): Do some filetype checking :p
|
||||
}
|
||||
else if (!strcasecmp(extension.c_str(), ".zip")) {
|
||||
return FILETYPE_ARCHIVE_ZIP;
|
||||
} else if (!strcasecmp(extension.c_str(),".rar")) {
|
||||
}
|
||||
else if (!strcasecmp(extension.c_str(), ".rar")) {
|
||||
return FILETYPE_ARCHIVE_RAR;
|
||||
} else if (!strcasecmp(extension.c_str(),".r00")) {
|
||||
}
|
||||
else if (!strcasecmp(extension.c_str(), ".r00")) {
|
||||
return FILETYPE_ARCHIVE_RAR;
|
||||
} else if (!strcasecmp(extension.c_str(),".r01")) {
|
||||
}
|
||||
else if (!strcasecmp(extension.c_str(), ".r01")) {
|
||||
return FILETYPE_ARCHIVE_RAR;
|
||||
}
|
||||
return FILETYPE_UNKNOWN;
|
||||
|
@ -96,9 +136,13 @@ FileType IdentifyFile(std::string &filename) {
|
|||
*/
|
||||
bool LoadFile(std::string &filename, std::string *error_string) {
|
||||
INFO_LOG(LOADER, "Identifying file...");
|
||||
|
||||
// Note that this can modify filename!
|
||||
switch (IdentifyFile(filename)) {
|
||||
|
||||
case FILETYPE_CTR_ELF:
|
||||
return Load_ELF(filename);
|
||||
|
||||
case FILETYPE_DIRECTORY_CXI:
|
||||
return LoadDirectory_CXI(filename);
|
||||
|
||||
|
|
Loading…
Reference in a new issue