diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-29 16:24:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-29 16:24:52 +0100 |
commit | 6aee148b170e6886e58a3996f729b2cc87329e95 (patch) | |
tree | 39efd9469af6a922ee5f38d906940412333c1455 /src/core/hle/kernel/k_page_table.cpp | |
parent | Merge pull request #11827 from liamwhite/preallocated (diff) | |
parent | kernel: make sure new process is in list (diff) | |
download | yuzu-6aee148b170e6886e58a3996f729b2cc87329e95.tar yuzu-6aee148b170e6886e58a3996f729b2cc87329e95.tar.gz yuzu-6aee148b170e6886e58a3996f729b2cc87329e95.tar.bz2 yuzu-6aee148b170e6886e58a3996f729b2cc87329e95.tar.lz yuzu-6aee148b170e6886e58a3996f729b2cc87329e95.tar.xz yuzu-6aee148b170e6886e58a3996f729b2cc87329e95.tar.zst yuzu-6aee148b170e6886e58a3996f729b2cc87329e95.zip |
Diffstat (limited to 'src/core/hle/kernel/k_page_table.cpp')
-rw-r--r-- | src/core/hle/kernel/k_page_table.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 217ccbae3..1d47bdf6b 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -82,14 +82,14 @@ public: using namespace Common::Literals; -constexpr size_t GetAddressSpaceWidthFromType(FileSys::ProgramAddressSpaceType as_type) { +constexpr size_t GetAddressSpaceWidthFromType(Svc::CreateProcessFlag as_type) { switch (as_type) { - case FileSys::ProgramAddressSpaceType::Is32Bit: - case FileSys::ProgramAddressSpaceType::Is32BitNoMap: + case Svc::CreateProcessFlag::AddressSpace32Bit: + case Svc::CreateProcessFlag::AddressSpace32BitWithoutAlias: return 32; - case FileSys::ProgramAddressSpaceType::Is36Bit: + case Svc::CreateProcessFlag::AddressSpace64BitDeprecated: return 36; - case FileSys::ProgramAddressSpaceType::Is39Bit: + case Svc::CreateProcessFlag::AddressSpace64Bit: return 39; default: ASSERT(false); @@ -105,7 +105,7 @@ KPageTable::KPageTable(Core::System& system_) KPageTable::~KPageTable() = default; -Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type, bool enable_aslr, +Result KPageTable::InitializeForProcess(Svc::CreateProcessFlag as_type, bool enable_aslr, bool enable_das_merge, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_addr, size_t code_size, KSystemResource* system_resource, @@ -133,7 +133,7 @@ Result KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_type ASSERT(code_addr + code_size - 1 <= end - 1); // Adjust heap/alias size if we don't have an alias region - if (as_type == FileSys::ProgramAddressSpaceType::Is32BitNoMap) { + if (as_type == Svc::CreateProcessFlag::AddressSpace32BitWithoutAlias) { heap_region_size += alias_region_size; alias_region_size = 0; } |