diff options
| author | 2015-05-15 09:42:36 -0400 | |
|---|---|---|
| committer | 2015-05-15 09:42:36 -0400 | |
| commit | ef8d0e9823e0ac61624002b89912e8995a3588e4 (patch) | |
| tree | dfaee1cefb39e627bd90562c416d19fe6002209c /src/core/loader/elf.cpp | |
| parent | Merge pull request #675 from jroweboy/windows-build-fixes (diff) | |
| parent | Core/ResourceLimits: Implemented the basic structure of ResourceLimits. (diff) | |
| download | yuzu-ef8d0e9823e0ac61624002b89912e8995a3588e4.tar.gz yuzu-ef8d0e9823e0ac61624002b89912e8995a3588e4.tar.xz yuzu-ef8d0e9823e0ac61624002b89912e8995a3588e4.zip | |
Merge pull request #761 from Subv/resource_limits
Core/ResourceLimits: Implemented the basic structure of ResourceLimits.
Diffstat (limited to 'src/core/loader/elf.cpp')
| -rw-r--r-- | src/core/loader/elf.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index a951bc80f..f00753a79 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include "common/symbols.h" | 11 | #include "common/symbols.h" |
| 12 | 12 | ||
| 13 | #include "core/hle/kernel/kernel.h" | 13 | #include "core/hle/kernel/kernel.h" |
| 14 | #include "core/hle/kernel/resource_limit.h" | ||
| 14 | #include "core/loader/elf.h" | 15 | #include "core/loader/elf.h" |
| 15 | #include "core/memory.h" | 16 | #include "core/memory.h" |
| 16 | 17 | ||
| @@ -354,6 +355,9 @@ ResultStatus AppLoader_ELF::Load() { | |||
| 354 | Kernel::g_current_process->svc_access_mask.set(); | 355 | Kernel::g_current_process->svc_access_mask.set(); |
| 355 | Kernel::g_current_process->address_mappings = default_address_mappings; | 356 | Kernel::g_current_process->address_mappings = default_address_mappings; |
| 356 | 357 | ||
| 358 | // Attach the default resource limit (APPLICATION) to the process | ||
| 359 | Kernel::g_current_process->resource_limit = Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | ||
| 360 | |||
| 357 | ElfReader elf_reader(&buffer[0]); | 361 | ElfReader elf_reader(&buffer[0]); |
| 358 | elf_reader.LoadInto(Memory::PROCESS_IMAGE_VADDR); | 362 | elf_reader.LoadInto(Memory::PROCESS_IMAGE_VADDR); |
| 359 | // TODO: Fill application title | 363 | // TODO: Fill application title |