mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
loader: Refactor to also pass filepath into IdentifyType.
This commit is contained in:
parent
2dafd0d287
commit
023aef053c
8 changed files with 19 additions and 19 deletions
|
@ -364,7 +364,7 @@ SectionID ElfReader::GetSectionByName(const char* name, int firstSection) const
|
||||||
|
|
||||||
namespace Loader {
|
namespace Loader {
|
||||||
|
|
||||||
FileType AppLoader_ELF::IdentifyType(FileUtil::IOFile& file) {
|
FileType AppLoader_ELF::IdentifyType(FileUtil::IOFile& file, const std::string&) {
|
||||||
static constexpr u16 ELF_MACHINE_ARM{0x28};
|
static constexpr u16 ELF_MACHINE_ARM{0x28};
|
||||||
|
|
||||||
u32 magic = 0;
|
u32 magic = 0;
|
||||||
|
|
|
@ -22,12 +22,13 @@ public:
|
||||||
/**
|
/**
|
||||||
* Returns the type of the file
|
* Returns the type of the file
|
||||||
* @param file FileUtil::IOFile open file
|
* @param file FileUtil::IOFile open file
|
||||||
|
* @param filepath Path of the file that we are opening.
|
||||||
* @return FileType found, or FileType::Error if this loader doesn't know it
|
* @return FileType found, or FileType::Error if this loader doesn't know it
|
||||||
*/
|
*/
|
||||||
static FileType IdentifyType(FileUtil::IOFile& file);
|
static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath);
|
||||||
|
|
||||||
FileType GetFileType() override {
|
FileType GetFileType() override {
|
||||||
return IdentifyType(file);
|
return IdentifyType(file, filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
|
ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
|
||||||
|
|
|
@ -21,11 +21,11 @@ const std::initializer_list<Kernel::AddressMapping> default_address_mappings = {
|
||||||
{0x1F000000, 0x600000, false}, // entire VRAM
|
{0x1F000000, 0x600000, false}, // entire VRAM
|
||||||
};
|
};
|
||||||
|
|
||||||
FileType IdentifyFile(FileUtil::IOFile& file) {
|
FileType IdentifyFile(FileUtil::IOFile& file, const std::string& filepath) {
|
||||||
FileType type;
|
FileType type;
|
||||||
|
|
||||||
#define CHECK_TYPE(loader) \
|
#define CHECK_TYPE(loader) \
|
||||||
type = AppLoader_##loader::IdentifyType(file); \
|
type = AppLoader_##loader::IdentifyType(file, filepath); \
|
||||||
if (FileType::Error != type) \
|
if (FileType::Error != type) \
|
||||||
return type;
|
return type;
|
||||||
|
|
||||||
|
@ -45,13 +45,13 @@ FileType IdentifyFile(const std::string& file_name) {
|
||||||
return FileType::Unknown;
|
return FileType::Unknown;
|
||||||
}
|
}
|
||||||
|
|
||||||
return IdentifyFile(file);
|
return IdentifyFile(file, file_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
FileType GuessFromExtension(const std::string& extension_) {
|
FileType GuessFromExtension(const std::string& extension_) {
|
||||||
std::string extension = Common::ToLower(extension_);
|
std::string extension = Common::ToLower(extension_);
|
||||||
|
|
||||||
if (extension == ".elf" || extension == ".axf")
|
if (extension == ".elf")
|
||||||
return FileType::ELF;
|
return FileType::ELF;
|
||||||
else if (extension == ".nro")
|
else if (extension == ".nro")
|
||||||
return FileType::NRO;
|
return FileType::NRO;
|
||||||
|
@ -117,7 +117,7 @@ std::unique_ptr<AppLoader> GetLoader(const std::string& filename) {
|
||||||
std::string filename_filename, filename_extension;
|
std::string filename_filename, filename_extension;
|
||||||
Common::SplitPath(filename, nullptr, &filename_filename, &filename_extension);
|
Common::SplitPath(filename, nullptr, &filename_filename, &filename_extension);
|
||||||
|
|
||||||
FileType type = IdentifyFile(file);
|
FileType type = IdentifyFile(file, filename);
|
||||||
FileType filename_type = GuessFromExtension(filename_extension);
|
FileType filename_type = GuessFromExtension(filename_extension);
|
||||||
|
|
||||||
if (type != filename_type) {
|
if (type != filename_type) {
|
||||||
|
|
|
@ -37,9 +37,10 @@ enum class FileType {
|
||||||
/**
|
/**
|
||||||
* Identifies the type of a bootable file based on the magic value in its header.
|
* Identifies the type of a bootable file based on the magic value in its header.
|
||||||
* @param file open file
|
* @param file open file
|
||||||
|
* @param filepath Path of the file that we are opening.
|
||||||
* @return FileType of file
|
* @return FileType of file
|
||||||
*/
|
*/
|
||||||
FileType IdentifyFile(FileUtil::IOFile& file);
|
FileType IdentifyFile(FileUtil::IOFile& file, const std::string& filepath);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Identifies the type of a bootable file based on the magic value in its header.
|
* Identifies the type of a bootable file based on the magic value in its header.
|
||||||
|
|
|
@ -45,7 +45,7 @@ struct ModHeader {
|
||||||
};
|
};
|
||||||
static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size.");
|
static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size.");
|
||||||
|
|
||||||
FileType AppLoader_NRO::IdentifyType(FileUtil::IOFile& file) {
|
FileType AppLoader_NRO::IdentifyType(FileUtil::IOFile& file, const std::string&) {
|
||||||
// Read NSO header
|
// Read NSO header
|
||||||
NroHeader nro_header{};
|
NroHeader nro_header{};
|
||||||
file.Seek(0, SEEK_SET);
|
file.Seek(0, SEEK_SET);
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <map>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
|
@ -23,12 +22,13 @@ public:
|
||||||
/**
|
/**
|
||||||
* Returns the type of the file
|
* Returns the type of the file
|
||||||
* @param file FileUtil::IOFile open file
|
* @param file FileUtil::IOFile open file
|
||||||
|
* @param filepath Path of the file that we are opening.
|
||||||
* @return FileType found, or FileType::Error if this loader doesn't know it
|
* @return FileType found, or FileType::Error if this loader doesn't know it
|
||||||
*/
|
*/
|
||||||
static FileType IdentifyType(FileUtil::IOFile& file);
|
static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath);
|
||||||
|
|
||||||
FileType GetFileType() override {
|
FileType GetFileType() override {
|
||||||
return IdentifyType(file);
|
return IdentifyType(file, filepath);
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
|
ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <lz4.h>
|
#include <lz4.h>
|
||||||
|
|
||||||
#include "common/common_funcs.h"
|
#include "common/common_funcs.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "common/swap.h"
|
#include "common/swap.h"
|
||||||
|
@ -47,7 +46,7 @@ struct ModHeader {
|
||||||
};
|
};
|
||||||
static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size.");
|
static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size.");
|
||||||
|
|
||||||
FileType AppLoader_NSO::IdentifyType(FileUtil::IOFile& file) {
|
FileType AppLoader_NSO::IdentifyType(FileUtil::IOFile& file, const std::string&) {
|
||||||
u32 magic = 0;
|
u32 magic = 0;
|
||||||
file.Seek(0, SEEK_SET);
|
file.Seek(0, SEEK_SET);
|
||||||
if (1 != file.ReadArray<u32>(&magic, 1)) {
|
if (1 != file.ReadArray<u32>(&magic, 1)) {
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <map>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
|
@ -23,12 +22,13 @@ public:
|
||||||
/**
|
/**
|
||||||
* Returns the type of the file
|
* Returns the type of the file
|
||||||
* @param file FileUtil::IOFile open file
|
* @param file FileUtil::IOFile open file
|
||||||
|
* @param filepath Path of the file that we are opening.
|
||||||
* @return FileType found, or FileType::Error if this loader doesn't know it
|
* @return FileType found, or FileType::Error if this loader doesn't know it
|
||||||
*/
|
*/
|
||||||
static FileType IdentifyType(FileUtil::IOFile& file);
|
static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath);
|
||||||
|
|
||||||
FileType GetFileType() override {
|
FileType GetFileType() override {
|
||||||
return IdentifyType(file);
|
return IdentifyType(file, filepath);
|
||||||
}
|
}
|
||||||
|
|
||||||
static VAddr LoadModule(const std::string& path, VAddr load_base);
|
static VAddr LoadModule(const std::string& path, VAddr load_base);
|
||||||
|
@ -36,7 +36,6 @@ public:
|
||||||
ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
|
ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
std::string filepath;
|
std::string filepath;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue