diff options
| author | 2014-06-16 22:57:09 -0400 | |
|---|---|---|
| committer | 2014-06-16 23:43:29 -0400 | |
| commit | 3577dd027ddbaa2517eacad700ed0768a1f4b518 (patch) | |
| tree | 4ddf41f874385673ed1e1e1396b3731e67810318 /src/core/loader/loader.cpp | |
| parent | Loader: Moved elf and loader modules to a "loader" subdirectory. (diff) | |
| download | yuzu-3577dd027ddbaa2517eacad700ed0768a1f4b518.tar.gz yuzu-3577dd027ddbaa2517eacad700ed0768a1f4b518.tar.xz yuzu-3577dd027ddbaa2517eacad700ed0768a1f4b518.zip | |
Loader: Added support for booting NCCH executables.
NCCH: Fixed typo in printing NCCH filename.
Diffstat (limited to 'src/core/loader/loader.cpp')
| -rw-r--r-- | src/core/loader/loader.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 7e6922e0c..41fa9c32e 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | #include "core/loader/loader.h" | 8 | #include "core/loader/loader.h" |
| 9 | #include "core/loader/elf_reader.h" | 9 | #include "core/loader/elf_reader.h" |
| 10 | #include "core/loader/ncch.h" | ||
| 10 | #include "core/system.h" | 11 | #include "core/system.h" |
| 11 | #include "core/core.h" | 12 | #include "core/core.h" |
| 12 | #include "core/hle/kernel/kernel.h" | 13 | #include "core/hle/kernel/kernel.h" |
| @@ -165,6 +166,10 @@ bool LoadFile(std::string &filename, std::string *error_string) { | |||
| 165 | case FILETYPE_CTR_BIN: | 166 | case FILETYPE_CTR_BIN: |
| 166 | return Load_BIN(filename); | 167 | return Load_BIN(filename); |
| 167 | 168 | ||
| 169 | case FILETYPE_CTR_CXI: | ||
| 170 | case FILETYPE_CTR_CCI: | ||
| 171 | return Loader::Load_NCCH(filename, error_string); | ||
| 172 | |||
| 168 | case FILETYPE_ERROR: | 173 | case FILETYPE_ERROR: |
| 169 | ERROR_LOG(LOADER, "Could not read file"); | 174 | ERROR_LOG(LOADER, "Could not read file"); |
| 170 | *error_string = "Error reading file"; | 175 | *error_string = "Error reading file"; |