From f23ace47e6aa95b248d21c6d40e85fedd78d5bcd Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 2 Aug 2022 06:28:14 +0200 Subject: [PATCH] early-access version 2886 --- README.md | 2 +- src/core/CMakeLists.txt | 2 -- src/core/loader/loader.cpp | 11 ----------- src/core/loader/loader.h | 1 - 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/README.md b/README.md index 62db7a5f8..98efa6bcc 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2885. +This is the source code for early-access 2886. ## Legal Notice diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7e78d8d23..0ba596073 100755 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -729,8 +729,6 @@ add_library(core STATIC internal_network/sockets.h loader/deconstructed_rom_directory.cpp loader/deconstructed_rom_directory.h - loader/elf.cpp - loader/elf.h loader/kip.cpp loader/kip.h loader/loader.cpp diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 994ee891f..104d16efa 100755 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -12,7 +12,6 @@ #include "core/core.h" #include "core/hle/kernel/k_process.h" #include "core/loader/deconstructed_rom_directory.h" -#include "core/loader/elf.h" #include "core/loader/kip.h" #include "core/loader/nax.h" #include "core/loader/nca.h" @@ -39,8 +38,6 @@ std::optional IdentifyFileLoader(FileSys::VirtualFile file) { FileType IdentifyFile(FileSys::VirtualFile file) { if (const auto romdir_type = IdentifyFileLoader(file)) { return *romdir_type; - } else if (const auto elf_type = IdentifyFileLoader(file)) { - return *elf_type; } else if (const auto nso_type = IdentifyFileLoader(file)) { return *nso_type; } else if (const auto nro_type = IdentifyFileLoader(file)) { @@ -69,8 +66,6 @@ FileType GuessFromFilename(const std::string& name) { const std::string extension = Common::ToLower(std::string(Common::FS::GetExtensionFromFilename(name))); - if (extension == "elf") - return FileType::ELF; if (extension == "nro") return FileType::NRO; if (extension == "nso") @@ -89,8 +84,6 @@ FileType GuessFromFilename(const std::string& name) { std::string GetFileTypeString(FileType type) { switch (type) { - case FileType::ELF: - return "ELF"; case FileType::NRO: return "NRO"; case FileType::NSO: @@ -208,10 +201,6 @@ static std::unique_ptr GetFileLoader(Core::System& system, FileSys::V FileType type, u64 program_id, std::size_t program_index) { switch (type) { - // Standard ELF file format. - case FileType::ELF: - return std::make_unique(std::move(file)); - // NX NSO file format. case FileType::NSO: return std::make_unique(std::move(file)); diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 7bf4faaf1..7b43f70ed 100755 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -34,7 +34,6 @@ namespace Loader { enum class FileType { Error, Unknown, - ELF, NSO, NRO, NCA,