diff options
| author | bunnei <bunneidev@gmail.com> | 2022-03-08 17:39:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-08 17:39:03 -0800 |
| commit | 6f670381cf9f1bd80eded9dedcaa4e15c4ad1dc1 (patch) | |
| tree | 5bf52ede3772c7361d0805b5142b22cc6e1acf15 /src/core/hle/kernel | |
| parent | f2743b41b0f8f82bcfe678cf735819ea987b62b4 (diff) | |
| parent | 853e58e5932c4703bb521b5454a9b0fc325c7152 (diff) | |
Merge pull request #7975 from bunnei/ldr-fix
hle: service: ldr: Use deterministic addresses when mapping NROs.
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/k_page_table.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h index aea1b8f63..e99abe36a 100644 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/core/hle/kernel/k_page_table.h @@ -253,7 +253,9 @@ public: constexpr bool IsInsideASLRRegion(VAddr address, std::size_t size) const { return !IsOutsideASLRRegion(address, size); } - + constexpr std::size_t GetNumGuardPages() const { + return IsKernel() ? 1 : 4; + } PAddr GetPhysicalAddr(VAddr addr) const { const auto backing_addr = page_table_impl.backing_addr[addr >> PageBits]; ASSERT(backing_addr); @@ -275,10 +277,6 @@ private: return is_aslr_enabled; } - constexpr std::size_t GetNumGuardPages() const { - return IsKernel() ? 1 : 4; - } - constexpr bool ContainsPages(VAddr addr, std::size_t num_pages) const { return (address_space_start <= addr) && (num_pages <= (address_space_end - address_space_start) / PageSize) && |