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/elf.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/elf.cpp')
| -rw-r--r-- | src/core/loader/elf.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 467e91924..ac3f84d04 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp | |||
| @@ -10,9 +10,9 @@ | |||
| 10 | #include "common/logging/log.h" | 10 | #include "common/logging/log.h" |
| 11 | #include "common/symbols.h" | 11 | #include "common/symbols.h" |
| 12 | 12 | ||
| 13 | #include "core/mem_map.h" | ||
| 14 | #include "core/loader/elf.h" | ||
| 15 | #include "core/hle/kernel/kernel.h" | 13 | #include "core/hle/kernel/kernel.h" |
| 14 | #include "core/loader/elf.h" | ||
| 15 | #include "core/mem_map.h" | ||
| 16 | 16 | ||
| 17 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 17 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 18 | // ELF Header Constants | 18 | // ELF Header Constants |
| @@ -350,9 +350,14 @@ ResultStatus AppLoader_ELF::Load() { | |||
| 350 | if (file->ReadBytes(&buffer[0], size) != size) | 350 | if (file->ReadBytes(&buffer[0], size) != size) |
| 351 | return ResultStatus::Error; | 351 | return ResultStatus::Error; |
| 352 | 352 | ||
| 353 | Kernel::g_current_process = Kernel::Process::Create(filename, 0); | ||
| 354 | Kernel::g_current_process->static_address_mappings = default_address_mappings; | ||
| 355 | |||
| 353 | ElfReader elf_reader(&buffer[0]); | 356 | ElfReader elf_reader(&buffer[0]); |
| 354 | elf_reader.LoadInto(0x00100000); | 357 | elf_reader.LoadInto(Memory::EXEFS_CODE_VADDR); |
| 355 | Kernel::LoadExec(elf_reader.GetEntryPoint()); | 358 | // TODO: Fill application title |
| 359 | |||
| 360 | Kernel::g_current_process->Run(elf_reader.GetEntryPoint(), 48, Kernel::DEFAULT_STACK_SIZE); | ||
| 356 | 361 | ||
| 357 | is_loaded = true; | 362 | is_loaded = true; |
| 358 | return ResultStatus::Success; | 363 | return ResultStatus::Success; |