summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2014-08-27 00:04:26 -0400
committerGravatar bunnei2014-08-30 23:23:33 -0400
commit738b88293ca82a7823d79d0406ac38019b7dec9c (patch)
tree5b2f042cae820f5b8ad622731bc378247fac7788
parentThreading: Fix thread starting to execute first instruction correctly. (diff)
downloadyuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.tar.gz
yuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.tar.xz
yuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.zip
Loader: Added support for loading raw BIN executables.
- Useful for debugging homebrew Qt: Updated GUI to support loading .bin files.
-rw-r--r--src/citra_qt/main.cpp2
-rw-r--r--src/core/loader/loader.cpp20
-rw-r--r--src/core/loader/loader.h1
3 files changed, 22 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index a6b87f781..1bf9bc53c 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -150,7 +150,7 @@ void GMainWindow::BootGame(std::string filename)
150 150
151void GMainWindow::OnMenuLoadFile() 151void GMainWindow::OnMenuLoadFile()
152{ 152{
153 QString filename = QFileDialog::getOpenFileName(this, tr("Load file"), QString(), tr("3DS executable (*.elf *.axf *.cci *.cxi)")); 153 QString filename = QFileDialog::getOpenFileName(this, tr("Load file"), QString(), tr("3DS executable (*.elf *.axf *.bin *.cci *.cxi)"));
154 if (filename.size()) 154 if (filename.size())
155 BootGame(filename.toLatin1().data()); 155 BootGame(filename.toLatin1().data());
156} 156}
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 2b42e3c64..365f5a277 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -9,6 +9,7 @@
9#include "core/loader/elf.h" 9#include "core/loader/elf.h"
10#include "core/loader/ncch.h" 10#include "core/loader/ncch.h"
11#include "core/hle/kernel/archive.h" 11#include "core/hle/kernel/archive.h"
12#include "core/mem_map.h"
12 13
13//////////////////////////////////////////////////////////////////////////////////////////////////// 14////////////////////////////////////////////////////////////////////////////////////////////////////
14 15
@@ -39,6 +40,9 @@ FileType IdentifyFile(const std::string &filename) {
39 else if (!strcasecmp(extension.c_str(), ".cci")) { 40 else if (!strcasecmp(extension.c_str(), ".cci")) {
40 return FileType::CCI; // TODO(bunnei): Do some filetype checking :p 41 return FileType::CCI; // TODO(bunnei): Do some filetype checking :p
41 } 42 }
43 else if (!strcasecmp(extension.c_str(), ".bin")) {
44 return FileType::BIN; // TODO(bunnei): Do some filetype checking :p
45 }
42 return FileType::Unknown; 46 return FileType::Unknown;
43} 47}
44 48
@@ -69,6 +73,22 @@ ResultStatus LoadFile(const std::string& filename) {
69 break; 73 break;
70 } 74 }
71 75
76 // Raw BIN file format...
77 case FileType::BIN:
78 {
79 INFO_LOG(LOADER, "Loading BIN file %s...", filename.c_str());
80
81 File::IOFile file(filename, "rb");
82
83 if (file.IsOpen()) {
84 file.ReadBytes(Memory::GetPointer(Memory::EXEFS_CODE_VADDR), (size_t)file.GetSize());
85 Kernel::LoadExec(Memory::EXEFS_CODE_VADDR);
86 } else {
87 return ResultStatus::Error;
88 }
89 return ResultStatus::Success;
90 }
91
72 // Error occurred durring IdentifyFile... 92 // Error occurred durring IdentifyFile...
73 case FileType::Error: 93 case FileType::Error:
74 94
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 4ba10de52..68f843005 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -21,6 +21,7 @@ enum class FileType {
21 CXI, 21 CXI,
22 CIA, 22 CIA,
23 ELF, 23 ELF,
24 BIN,
24}; 25};
25 26
26/// Return type for functions in Loader namespace 27/// Return type for functions in Loader namespace