summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-08-27 06:04:26 +0200
committerbunnei <bunneidev@gmail.com>2014-08-31 05:23:33 +0200
commit738b88293ca82a7823d79d0406ac38019b7dec9c (patch)
tree5b2f042cae820f5b8ad622731bc378247fac7788
parentThreading: Fix thread starting to execute first instruction correctly. (diff)
downloadyuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.tar
yuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.tar.gz
yuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.tar.bz2
yuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.tar.lz
yuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.tar.xz
yuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.tar.zst
yuzu-738b88293ca82a7823d79d0406ac38019b7dec9c.zip
-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)
void GMainWindow::OnMenuLoadFile()
{
- QString filename = QFileDialog::getOpenFileName(this, tr("Load file"), QString(), tr("3DS executable (*.elf *.axf *.cci *.cxi)"));
+ QString filename = QFileDialog::getOpenFileName(this, tr("Load file"), QString(), tr("3DS executable (*.elf *.axf *.bin *.cci *.cxi)"));
if (filename.size())
BootGame(filename.toLatin1().data());
}
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 @@
#include "core/loader/elf.h"
#include "core/loader/ncch.h"
#include "core/hle/kernel/archive.h"
+#include "core/mem_map.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -39,6 +40,9 @@ FileType IdentifyFile(const std::string &filename) {
else if (!strcasecmp(extension.c_str(), ".cci")) {
return FileType::CCI; // TODO(bunnei): Do some filetype checking :p
}
+ else if (!strcasecmp(extension.c_str(), ".bin")) {
+ return FileType::BIN; // TODO(bunnei): Do some filetype checking :p
+ }
return FileType::Unknown;
}
@@ -69,6 +73,22 @@ ResultStatus LoadFile(const std::string& filename) {
break;
}
+ // Raw BIN file format...
+ case FileType::BIN:
+ {
+ INFO_LOG(LOADER, "Loading BIN file %s...", filename.c_str());
+
+ File::IOFile file(filename, "rb");
+
+ if (file.IsOpen()) {
+ file.ReadBytes(Memory::GetPointer(Memory::EXEFS_CODE_VADDR), (size_t)file.GetSize());
+ Kernel::LoadExec(Memory::EXEFS_CODE_VADDR);
+ } else {
+ return ResultStatus::Error;
+ }
+ 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 4ba10de52..68f843005 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -21,6 +21,7 @@ enum class FileType {
CXI,
CIA,
ELF,
+ BIN,
};
/// Return type for functions in Loader namespace