diff options
| author | 2015-05-04 00:01:16 -0300 | |
|---|---|---|
| committer | 2015-05-08 22:11:02 -0300 | |
| commit | 6d60acf0f1afcae873988da5218f2f1c7bc9d151 (patch) | |
| tree | cec75198ab74759002dd1da78f6ac2af5e61949f /src/core/loader/3dsx.cpp | |
| parent | Common: Add StringFromFixedZeroTerminatedBuffer (diff) | |
| download | yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.tar.gz yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.tar.xz yuzu-6d60acf0f1afcae873988da5218f2f1c7bc9d151.zip | |
Kernel: Introduce skeleton Process class to hold process data
Diffstat (limited to 'src/core/loader/3dsx.cpp')
| -rw-r--r-- | src/core/loader/3dsx.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index 5d806c5d0..5aaeb53d8 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp | |||
| @@ -8,9 +8,10 @@ | |||
| 8 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 9 | 9 | ||
| 10 | #include "core/file_sys/archive_romfs.h" | 10 | #include "core/file_sys/archive_romfs.h" |
| 11 | #include "core/hle/kernel/process.h" | ||
| 12 | #include "core/hle/service/fs/archive.h" | ||
| 11 | #include "core/loader/elf.h" | 13 | #include "core/loader/elf.h" |
| 12 | #include "core/loader/ncch.h" | 14 | #include "core/loader/ncch.h" |
| 13 | #include "core/hle/service/fs/archive.h" | ||
| 14 | #include "core/mem_map.h" | 15 | #include "core/mem_map.h" |
| 15 | 16 | ||
| 16 | #include "3dsx.h" | 17 | #include "3dsx.h" |
| @@ -229,8 +230,12 @@ ResultStatus AppLoader_THREEDSX::Load() { | |||
| 229 | if (!file->IsOpen()) | 230 | if (!file->IsOpen()) |
| 230 | return ResultStatus::Error; | 231 | return ResultStatus::Error; |
| 231 | 232 | ||
| 232 | Load3DSXFile(*file, 0x00100000); | 233 | Kernel::g_current_process = Kernel::Process::Create(filename, 0); |
| 233 | Kernel::LoadExec(0x00100000); | 234 | Kernel::g_current_process->static_address_mappings = default_address_mappings; |
| 235 | |||
| 236 | Load3DSXFile(*file, Memory::EXEFS_CODE_VADDR); | ||
| 237 | |||
| 238 | Kernel::g_current_process->Run(Memory::EXEFS_CODE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE); | ||
| 234 | 239 | ||
| 235 | is_loaded = true; | 240 | is_loaded = true; |
| 236 | return ResultStatus::Success; | 241 | return ResultStatus::Success; |