summaryrefslogtreecommitdiff
path: root/src/core/loader/loader.cpp
diff options
context:
space:
mode:
authorGravatar Morph2022-08-01 22:54:48 -0400
committerGravatar GitHub2022-08-01 22:54:48 -0400
commit9c31edccdf44f9d816895f80605a15116a67fd8a (patch)
tree1aeda95966b96162b68bde5ea4566e5596cc1f67 /src/core/loader/loader.cpp
parentMerge pull request #8697 from zhaobot/tx-update-20220801034544 (diff)
parentcore/loader: remove ELF loader (diff)
downloadyuzu-9c31edccdf44f9d816895f80605a15116a67fd8a.tar.gz
yuzu-9c31edccdf44f9d816895f80605a15116a67fd8a.tar.xz
yuzu-9c31edccdf44f9d816895f80605a15116a67fd8a.zip
Merge pull request #8701 from liamwhite/elf
core/loader: remove ELF loader
Diffstat (limited to 'src/core/loader/loader.cpp')
-rw-r--r--src/core/loader/loader.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 994ee891f..104d16efa 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -12,7 +12,6 @@
12#include "core/core.h" 12#include "core/core.h"
13#include "core/hle/kernel/k_process.h" 13#include "core/hle/kernel/k_process.h"
14#include "core/loader/deconstructed_rom_directory.h" 14#include "core/loader/deconstructed_rom_directory.h"
15#include "core/loader/elf.h"
16#include "core/loader/kip.h" 15#include "core/loader/kip.h"
17#include "core/loader/nax.h" 16#include "core/loader/nax.h"
18#include "core/loader/nca.h" 17#include "core/loader/nca.h"
@@ -39,8 +38,6 @@ std::optional<FileType> IdentifyFileLoader(FileSys::VirtualFile file) {
39FileType IdentifyFile(FileSys::VirtualFile file) { 38FileType IdentifyFile(FileSys::VirtualFile file) {
40 if (const auto romdir_type = IdentifyFileLoader<AppLoader_DeconstructedRomDirectory>(file)) { 39 if (const auto romdir_type = IdentifyFileLoader<AppLoader_DeconstructedRomDirectory>(file)) {
41 return *romdir_type; 40 return *romdir_type;
42 } else if (const auto elf_type = IdentifyFileLoader<AppLoader_ELF>(file)) {
43 return *elf_type;
44 } else if (const auto nso_type = IdentifyFileLoader<AppLoader_NSO>(file)) { 41 } else if (const auto nso_type = IdentifyFileLoader<AppLoader_NSO>(file)) {
45 return *nso_type; 42 return *nso_type;
46 } else if (const auto nro_type = IdentifyFileLoader<AppLoader_NRO>(file)) { 43 } else if (const auto nro_type = IdentifyFileLoader<AppLoader_NRO>(file)) {
@@ -69,8 +66,6 @@ FileType GuessFromFilename(const std::string& name) {
69 const std::string extension = 66 const std::string extension =
70 Common::ToLower(std::string(Common::FS::GetExtensionFromFilename(name))); 67 Common::ToLower(std::string(Common::FS::GetExtensionFromFilename(name)));
71 68
72 if (extension == "elf")
73 return FileType::ELF;
74 if (extension == "nro") 69 if (extension == "nro")
75 return FileType::NRO; 70 return FileType::NRO;
76 if (extension == "nso") 71 if (extension == "nso")
@@ -89,8 +84,6 @@ FileType GuessFromFilename(const std::string& name) {
89 84
90std::string GetFileTypeString(FileType type) { 85std::string GetFileTypeString(FileType type) {
91 switch (type) { 86 switch (type) {
92 case FileType::ELF:
93 return "ELF";
94 case FileType::NRO: 87 case FileType::NRO:
95 return "NRO"; 88 return "NRO";
96 case FileType::NSO: 89 case FileType::NSO:
@@ -208,10 +201,6 @@ static std::unique_ptr<AppLoader> GetFileLoader(Core::System& system, FileSys::V
208 FileType type, u64 program_id, 201 FileType type, u64 program_id,
209 std::size_t program_index) { 202 std::size_t program_index) {
210 switch (type) { 203 switch (type) {
211 // Standard ELF file format.
212 case FileType::ELF:
213 return std::make_unique<AppLoader_ELF>(std::move(file));
214
215 // NX NSO file format. 204 // NX NSO file format.
216 case FileType::NSO: 205 case FileType::NSO:
217 return std::make_unique<AppLoader_NSO>(std::move(file)); 206 return std::make_unique<AppLoader_NSO>(std::move(file));