added ELF loading support to loader.cpp
This commit is contained in:
parent
e32c03e860
commit
85e8da6fc8
|
@ -26,35 +26,67 @@
|
||||||
#include "loader.h"
|
#include "loader.h"
|
||||||
#include "system.h"
|
#include "system.h"
|
||||||
#include "file_sys/directory_file_system.h"
|
#include "file_sys/directory_file_system.h"
|
||||||
|
#include "elf/elf_reader.h"
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
/// Loads an extracted CXI from a directory
|
/// Loads an extracted CXI from a directory
|
||||||
bool LoadDirectory_CXI(std::string &filename) {
|
bool LoadDirectory_CXI(std::string &filename) {
|
||||||
std::string full_path = filename;
|
std::string full_path = filename;
|
||||||
std::string path, file, extension;
|
std::string path, file, extension;
|
||||||
SplitPath(ReplaceAll(full_path, "\\", "/"), &path, &file, &extension);
|
SplitPath(ReplaceAll(full_path, "\\", "/"), &path, &file, &extension);
|
||||||
#if EMU_PLATFORM == PLATFORM_WINDOWS
|
#if EMU_PLATFORM == PLATFORM_WINDOWS
|
||||||
path = ReplaceAll(path, "/", "\\");
|
path = ReplaceAll(path, "/", "\\");
|
||||||
#endif
|
#endif
|
||||||
DirectoryFileSystem *fs = new DirectoryFileSystem(&System::g_ctr_file_system, path);
|
DirectoryFileSystem *fs = new DirectoryFileSystem(&System::g_ctr_file_system, path);
|
||||||
System::g_ctr_file_system.Mount("fs:", fs);
|
System::g_ctr_file_system.Mount("fs:", fs);
|
||||||
|
|
||||||
std::string final_name = "fs:/" + file + extension;
|
std::string final_name = "fs:/" + file + extension;
|
||||||
File::IOFile f(filename, "rb");
|
File::IOFile f(filename, "rb");
|
||||||
|
|
||||||
if (f.IsOpen()) {
|
if (f.IsOpen()) {
|
||||||
// TODO(ShizZy): read here to memory....
|
// TODO(ShizZy): read here to memory....
|
||||||
}
|
}
|
||||||
ERROR_LOG(TIME, "Unimplemented function!");
|
ERROR_LOG(TIME, "Unimplemented function!");
|
||||||
return true;
|
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 {
|
namespace Loader {
|
||||||
|
|
||||||
bool IsBootableDirectory() {
|
bool IsBootableDirectory() {
|
||||||
ERROR_LOG(TIME, "Unimplemented function!");
|
ERROR_LOG(TIME, "Unimplemented function!");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -64,28 +96,36 @@ bool IsBootableDirectory() {
|
||||||
* @return FileType of file
|
* @return FileType of file
|
||||||
*/
|
*/
|
||||||
FileType IdentifyFile(std::string &filename) {
|
FileType IdentifyFile(std::string &filename) {
|
||||||
if (filename.size() == 0) {
|
if (filename.size() == 0) {
|
||||||
ERROR_LOG(LOADER, "invalid filename %s", filename.c_str());
|
ERROR_LOG(LOADER, "invalid filename %s", filename.c_str());
|
||||||
return FILETYPE_ERROR;
|
return FILETYPE_ERROR;
|
||||||
}
|
}
|
||||||
std::string extension = filename.size() >= 5 ? filename.substr(filename.size() - 4) : "";
|
std::string extension = filename.size() >= 5 ? filename.substr(filename.size() - 4) : "";
|
||||||
|
|
||||||
if (File::IsDirectory(filename)) {
|
if (File::IsDirectory(filename)) {
|
||||||
if (IsBootableDirectory()) {
|
if (IsBootableDirectory()) {
|
||||||
return FILETYPE_DIRECTORY_CXI;
|
return FILETYPE_DIRECTORY_CXI;
|
||||||
} else {
|
}
|
||||||
return FILETYPE_NORMAL_DIRECTORY;
|
else {
|
||||||
}
|
return FILETYPE_NORMAL_DIRECTORY;
|
||||||
} else if (!strcasecmp(extension.c_str(),".zip")) {
|
}
|
||||||
return FILETYPE_ARCHIVE_ZIP;
|
}
|
||||||
} else if (!strcasecmp(extension.c_str(),".rar")) {
|
else if (!strcasecmp(extension.c_str(), ".elf")) {
|
||||||
return FILETYPE_ARCHIVE_RAR;
|
return FILETYPE_CTR_ELF; // TODO(bunnei): Do some filetype checking :p
|
||||||
} else if (!strcasecmp(extension.c_str(),".r00")) {
|
}
|
||||||
return FILETYPE_ARCHIVE_RAR;
|
else if (!strcasecmp(extension.c_str(), ".zip")) {
|
||||||
} else if (!strcasecmp(extension.c_str(),".r01")) {
|
return FILETYPE_ARCHIVE_ZIP;
|
||||||
return FILETYPE_ARCHIVE_RAR;
|
}
|
||||||
}
|
else if (!strcasecmp(extension.c_str(), ".rar")) {
|
||||||
return FILETYPE_UNKNOWN;
|
return FILETYPE_ARCHIVE_RAR;
|
||||||
|
}
|
||||||
|
else if (!strcasecmp(extension.c_str(), ".r00")) {
|
||||||
|
return FILETYPE_ARCHIVE_RAR;
|
||||||
|
}
|
||||||
|
else if (!strcasecmp(extension.c_str(), ".r01")) {
|
||||||
|
return FILETYPE_ARCHIVE_RAR;
|
||||||
|
}
|
||||||
|
return FILETYPE_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -95,48 +135,52 @@ FileType IdentifyFile(std::string &filename) {
|
||||||
* @return True on success, otherwise false
|
* @return True on success, otherwise false
|
||||||
*/
|
*/
|
||||||
bool LoadFile(std::string &filename, std::string *error_string) {
|
bool LoadFile(std::string &filename, std::string *error_string) {
|
||||||
INFO_LOG(LOADER,"Identifying file...");
|
INFO_LOG(LOADER, "Identifying file...");
|
||||||
// Note that this can modify filename!
|
|
||||||
switch (IdentifyFile(filename)) {
|
|
||||||
|
|
||||||
case FILETYPE_DIRECTORY_CXI:
|
// Note that this can modify filename!
|
||||||
return LoadDirectory_CXI(filename);
|
switch (IdentifyFile(filename)) {
|
||||||
|
|
||||||
case FILETYPE_ERROR:
|
case FILETYPE_CTR_ELF:
|
||||||
ERROR_LOG(LOADER, "Could not read file");
|
return Load_ELF(filename);
|
||||||
*error_string = "Error reading file";
|
|
||||||
break;
|
|
||||||
|
|
||||||
case FILETYPE_ARCHIVE_RAR:
|
case FILETYPE_DIRECTORY_CXI:
|
||||||
|
return LoadDirectory_CXI(filename);
|
||||||
|
|
||||||
|
case FILETYPE_ERROR:
|
||||||
|
ERROR_LOG(LOADER, "Could not read file");
|
||||||
|
*error_string = "Error reading file";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FILETYPE_ARCHIVE_RAR:
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
*error_string = "RAR file detected (Require WINRAR)";
|
*error_string = "RAR file detected (Require WINRAR)";
|
||||||
#else
|
#else
|
||||||
*error_string = "RAR file detected (Require UnRAR)";
|
*error_string = "RAR file detected (Require UnRAR)";
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FILETYPE_ARCHIVE_ZIP:
|
case FILETYPE_ARCHIVE_ZIP:
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
*error_string = "ZIP file detected (Require WINRAR)";
|
*error_string = "ZIP file detected (Require WINRAR)";
|
||||||
#else
|
#else
|
||||||
*error_string = "ZIP file detected (Require UnRAR)";
|
*error_string = "ZIP file detected (Require UnRAR)";
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FILETYPE_NORMAL_DIRECTORY:
|
case FILETYPE_NORMAL_DIRECTORY:
|
||||||
ERROR_LOG(LOADER, "Just a directory.");
|
ERROR_LOG(LOADER, "Just a directory.");
|
||||||
*error_string = "Just a directory.";
|
*error_string = "Just a directory.";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FILETYPE_UNKNOWN_BIN:
|
case FILETYPE_UNKNOWN_BIN:
|
||||||
case FILETYPE_UNKNOWN_ELF:
|
case FILETYPE_UNKNOWN_ELF:
|
||||||
case FILETYPE_UNKNOWN:
|
case FILETYPE_UNKNOWN:
|
||||||
default:
|
default:
|
||||||
ERROR_LOG(LOADER, "Failed to identify file");
|
ERROR_LOG(LOADER, "Failed to identify file");
|
||||||
*error_string = "Failed to identify file";
|
*error_string = "Failed to identify file";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
Loading…
Reference in a new issue