From eb3eb9f75d9ed1e12bc472fdd94812e911c92927 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 8 May 2015 23:09:41 -0300 Subject: Loader: Remove .bin file support It is of very limited practical utility currently, and will soon be impossible to support due to more accurate memory map emulation. --- src/citra_qt/main.cpp | 2 +- src/core/loader/loader.cpp | 19 ------------------- src/core/loader/loader.h | 1 - 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index d15338f0..f115c5b6 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -256,7 +256,7 @@ void GMainWindow::ShutdownGame() { void GMainWindow::OnMenuLoadFile() { - QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.bin *.cci *.cxi)")); + QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.cci *.cxi)")); if (filename.size()) { // Shutdown previous session if the emu thread is still active... if (emu_thread != nullptr) diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 505e2d28..4f881cf6 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -63,8 +63,6 @@ static FileType GuessFromExtension(const std::string& extension_) { return FileType::CXI; else if (extension == ".cci") return FileType::CCI; - else if (extension == ".bin") - return FileType::BIN; else if (extension == ".3ds") return FileType::CCI; else if (extension == ".3dsx") @@ -82,8 +80,6 @@ static const char* GetFileTypeString(FileType type) { return "ELF"; case FileType::THREEDSX: return "3DSX"; - case FileType::BIN: - return "raw"; case FileType::Error: case FileType::Unknown: break; @@ -137,21 +133,6 @@ ResultStatus LoadFile(const std::string& filename) { break; } - // Raw BIN file format... - case FileType::BIN: - { - Kernel::g_current_process = Kernel::Process::Create(filename_filename, 0); - Kernel::g_current_process->svc_access_mask.set(); - Kernel::g_current_process->address_mappings = default_address_mappings; - - size_t size = (size_t)file->GetSize(); - if (file->ReadBytes(Memory::GetPointer(Memory::EXEFS_CODE_VADDR), size) != size) - return ResultStatus::Error; - - Kernel::g_current_process->Run(Memory::EXEFS_CODE_VADDR, 0x30, Kernel::DEFAULT_STACK_SIZE); - return ResultStatus::Success; - } - // Error occurred durring IdentifyFile... case FileType::Error: diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index a56f6720..87e16fb9 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -24,7 +24,6 @@ enum class FileType { CXI, CIA, ELF, - BIN, THREEDSX, //3DSX }; -- cgit v1.2.3