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/3dsx.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/3dsx.cpp')
| -rw-r--r-- | src/core/loader/3dsx.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index 84b13ee52..ad5e929ce 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp | |||
| @@ -9,6 +9,7 @@ | |||
| 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" | 11 | #include "core/hle/kernel/process.h" |
| 12 | #include "core/hle/kernel/resource_limit.h" | ||
| 12 | #include "core/hle/service/fs/archive.h" | 13 | #include "core/hle/service/fs/archive.h" |
| 13 | #include "core/loader/elf.h" | 14 | #include "core/loader/elf.h" |
| 14 | #include "core/loader/ncch.h" | 15 | #include "core/loader/ncch.h" |
| @@ -233,6 +234,9 @@ ResultStatus AppLoader_THREEDSX::Load() { | |||
| 233 | Kernel::g_current_process = Kernel::Process::Create(filename, 0); | 234 | Kernel::g_current_process = Kernel::Process::Create(filename, 0); |
| 234 | Kernel::g_current_process->svc_access_mask.set(); | 235 | Kernel::g_current_process->svc_access_mask.set(); |
| 235 | Kernel::g_current_process->address_mappings = default_address_mappings; | 236 | Kernel::g_current_process->address_mappings = default_address_mappings; |
| 237 | |||
| 238 | // Attach the default resource limit (APPLICATION) to the process | ||
| 239 | Kernel::g_current_process->resource_limit = Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION); | ||
| 236 | 240 | ||
| 237 | Load3DSXFile(*file, Memory::PROCESS_IMAGE_VADDR); | 241 | Load3DSXFile(*file, Memory::PROCESS_IMAGE_VADDR); |
| 238 | 242 | ||