summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_memory_layout.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-03-24 02:31:46 +0100
committerbunnei <bunneidev@gmail.com>2021-03-24 02:31:46 +0100
commitab5995c7ae878fcf3b9a0c537f0e37377f206d76 (patch)
treee48ed1c0a30a0ce2fe5365023934030e68ac9379 /src/core/hle/kernel/k_memory_layout.h
parenthle: kernel: Merge KMemoryRegionAttr and KMemoryRegionType. (diff)
downloadyuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar
yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar.gz
yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar.bz2
yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar.lz
yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar.xz
yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar.zst
yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_memory_layout.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/kernel/k_memory_layout.h b/src/core/hle/kernel/k_memory_layout.h
index b3e057326..590dc449a 100644
--- a/src/core/hle/kernel/k_memory_layout.h
+++ b/src/core/hle/kernel/k_memory_layout.h
@@ -14,20 +14,20 @@
namespace Kernel {
-constexpr std::size_t L1BlockSize = Size_1_GB;
-constexpr std::size_t L2BlockSize = Size_2_MB;
+constexpr std::size_t L1BlockSize = Common::Size_1_GB;
+constexpr std::size_t L2BlockSize = Common::Size_2_MB;
constexpr std::size_t GetMaximumOverheadSize(std::size_t size) {
return (Common::DivideUp(size, L1BlockSize) + Common::DivideUp(size, L2BlockSize)) * PageSize;
}
-constexpr std::size_t MainMemorySize = Size_4_GB;
-constexpr std::size_t MainMemorySizeMax = Size_8_GB;
+constexpr std::size_t MainMemorySize = Common::Size_4_GB;
+constexpr std::size_t MainMemorySizeMax = Common::Size_8_GB;
constexpr std::size_t ReservedEarlyDramSize = 0x60000;
constexpr std::size_t DramPhysicalAddress = 0x80000000;
-constexpr std::size_t KernelAslrAlignment = Size_2_MB;
+constexpr std::size_t KernelAslrAlignment = Common::Size_2_MB;
constexpr std::size_t KernelVirtualAddressSpaceWidth = 1ULL << 39;
constexpr std::size_t KernelPhysicalAddressSpaceWidth = 1ULL << 48;
@@ -51,10 +51,10 @@ constexpr std::size_t KernelPhysicalAddressSpaceSize =
constexpr std::size_t KernelPhysicalAddressCodeBase = DramPhysicalAddress + ReservedEarlyDramSize;
constexpr std::size_t KernelPageTableHeapSize = GetMaximumOverheadSize(MainMemorySizeMax);
-constexpr std::size_t KernelInitialPageHeapSize = Size_128_KB;
+constexpr std::size_t KernelInitialPageHeapSize = Common::Size_128_KB;
-constexpr std::size_t KernelSlabHeapDataSize = Size_5_MB;
-constexpr std::size_t KernelSlabHeapGapsSize = Size_2_MB - Size_64_KB;
+constexpr std::size_t KernelSlabHeapDataSize = Common::Size_5_MB;
+constexpr std::size_t KernelSlabHeapGapsSize = Common::Size_2_MB - Common::Size_64_KB;
constexpr std::size_t KernelSlabHeapSize = KernelSlabHeapDataSize + KernelSlabHeapGapsSize;
// NOTE: This is calculated from KThread slab counts, assuming KThread size <= 0x860.