summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-06-16 23:51:04 +0200
committerbunnei <ericbunnie@gmail.com>2014-06-16 23:51:04 +0200
commit10ae45b5e7b4d66660803cc5dfe26aa6e1b8843f (patch)
treedb1dec8381b8b1dc2d87654a8cbd07f099a230df
parentMerge branch 'threading' of https://github.com/bunnei/citra (diff)
downloadyuzu-10ae45b5e7b4d66660803cc5dfe26aa6e1b8843f.tar
yuzu-10ae45b5e7b4d66660803cc5dfe26aa6e1b8843f.tar.gz
yuzu-10ae45b5e7b4d66660803cc5dfe26aa6e1b8843f.tar.bz2
yuzu-10ae45b5e7b4d66660803cc5dfe26aa6e1b8843f.tar.lz
yuzu-10ae45b5e7b4d66660803cc5dfe26aa6e1b8843f.tar.xz
yuzu-10ae45b5e7b4d66660803cc5dfe26aa6e1b8843f.tar.zst
yuzu-10ae45b5e7b4d66660803cc5dfe26aa6e1b8843f.zip
-rw-r--r--src/core/loader.cpp76
1 files changed, 0 insertions, 76 deletions
diff --git a/src/core/loader.cpp b/src/core/loader.cpp
index ff1c873bb..c14f2259c 100644
--- a/src/core/loader.cpp
+++ b/src/core/loader.cpp
@@ -8,34 +8,12 @@
#include "core/loader.h"
#include "core/system.h"
#include "core/core.h"
-#include "core/file_sys/directory_file_system.h"
#include "core/elf/elf_reader.h"
#include "core/hle/kernel/kernel.h"
#include "core/mem_map.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
-/// Loads an extracted CXI from a directory
-bool LoadDirectory_CXI(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
- DirectoryFileSystem *fs = new DirectoryFileSystem(&System::g_ctr_file_system, path);
- System::g_ctr_file_system.Mount("fs:", fs);
-
- std::string final_name = "fs:/" + file + extension;
- File::IOFile f(filename, "rb");
-
- if (f.IsOpen()) {
- // TODO(ShizZy): read here to memory....
- }
- ERROR_LOG(TIME, "Unimplemented function!");
- return true;
-}
-
/// Loads a CTR ELF file
bool Load_ELF(std::string &filename) {
std::string full_path = filename;
@@ -68,54 +46,6 @@ bool Load_ELF(std::string &filename) {
return true;
}
-/// Loads a Launcher DAT file
-bool Load_DAT(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];
-
- f.ReadBytes(buffer, size);
-
- /**
- * (mattvail) We shouldn't really support this type of file
- * but for the sake of making it easier... we'll temporarily/hackishly
- * allow it. No sense in making a proper reader for this.
- */
- u32 entry_point = 0x00100000; // write to same entrypoint as elf
- u32 payload_offset = 0xA150;
-
- const u8 *src = &buffer[payload_offset];
- u8 *dst = Memory::GetPointer(entry_point);
- u32 srcSize = size - payload_offset; //just load everything...
- u32 *s = (u32*)src;
- u32 *d = (u32*)dst;
- for (int j = 0; j < (int)(srcSize + 3) / 4; j++)
- {
- *d++ = (*s++);
- }
-
- Kernel::LoadExec(entry_point);
-
-
- delete[] buffer;
- }
- else {
- return false;
- }
- f.Close();
-
- return true;
-}
-
-
/// Loads a CTR BIN file extracted from an ExeFS
bool Load_BIN(std::string &filename) {
std::string full_path = filename;
@@ -229,12 +159,6 @@ bool LoadFile(std::string &filename, std::string *error_string) {
case FILETYPE_CTR_BIN:
return Load_BIN(filename);
- case FILETYPE_LAUNCHER_DAT:
- return Load_DAT(filename);
-
- case FILETYPE_DIRECTORY_CXI:
- return LoadDirectory_CXI(filename);
-
case FILETYPE_ERROR:
ERROR_LOG(LOADER, "Could not read file");
*error_string = "Error reading file";