diff options
| author | 2021-03-23 18:31:46 -0700 | |
|---|---|---|
| committer | 2021-03-23 18:31:46 -0700 | |
| commit | ab5995c7ae878fcf3b9a0c537f0e37377f206d76 (patch) | |
| tree | e48ed1c0a30a0ce2fe5365023934030e68ac9379 /src/core/hle/kernel/kernel.cpp | |
| parent | hle: kernel: Merge KMemoryRegionAttr and KMemoryRegionType. (diff) | |
| download | yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar.gz yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar.xz yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.zip | |
common: common_sizes: Move sizes to the Common namespace.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 9360710de..e994e8bed 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -289,8 +289,8 @@ struct KernelCore::Impl { | |||
| 289 | const VAddr code_end_virt_addr = KernelVirtualAddressCodeEnd; | 289 | const VAddr code_end_virt_addr = KernelVirtualAddressCodeEnd; |
| 290 | 290 | ||
| 291 | // Setup the containing kernel region. | 291 | // Setup the containing kernel region. |
| 292 | constexpr size_t KernelRegionSize = Size_1_GB; | 292 | constexpr size_t KernelRegionSize = Common::Size_1_GB; |
| 293 | constexpr size_t KernelRegionAlign = Size_1_GB; | 293 | constexpr size_t KernelRegionAlign = Common::Size_1_GB; |
| 294 | constexpr VAddr kernel_region_start = | 294 | constexpr VAddr kernel_region_start = |
| 295 | Common::AlignDown(code_start_virt_addr, KernelRegionAlign); | 295 | Common::AlignDown(code_start_virt_addr, KernelRegionAlign); |
| 296 | size_t kernel_region_size = KernelRegionSize; | 296 | size_t kernel_region_size = KernelRegionSize; |
| @@ -337,7 +337,7 @@ struct KernelCore::Impl { | |||
| 337 | 337 | ||
| 338 | // Decide on the actual size for the misc region. | 338 | // Decide on the actual size for the misc region. |
| 339 | constexpr size_t MiscRegionAlign = KernelAslrAlignment; | 339 | constexpr size_t MiscRegionAlign = KernelAslrAlignment; |
| 340 | constexpr size_t MiscRegionMinimumSize = Size_32_MB; | 340 | constexpr size_t MiscRegionMinimumSize = Common::Size_32_MB; |
| 341 | const size_t misc_region_size = Common::AlignUp( | 341 | const size_t misc_region_size = Common::AlignUp( |
| 342 | std::max(misc_region_needed_size, MiscRegionMinimumSize), MiscRegionAlign); | 342 | std::max(misc_region_needed_size, MiscRegionMinimumSize), MiscRegionAlign); |
| 343 | ASSERT(misc_region_size > 0); | 343 | ASSERT(misc_region_size > 0); |
| @@ -350,7 +350,7 @@ struct KernelCore::Impl { | |||
| 350 | misc_region_start, misc_region_size, KMemoryRegionType_KernelMisc)); | 350 | misc_region_start, misc_region_size, KMemoryRegionType_KernelMisc)); |
| 351 | 351 | ||
| 352 | // Setup the stack region. | 352 | // Setup the stack region. |
| 353 | constexpr size_t StackRegionSize = Size_14_MB; | 353 | constexpr size_t StackRegionSize = Common::Size_14_MB; |
| 354 | constexpr size_t StackRegionAlign = KernelAslrAlignment; | 354 | constexpr size_t StackRegionAlign = KernelAslrAlignment; |
| 355 | const VAddr stack_region_start = | 355 | const VAddr stack_region_start = |
| 356 | memory_layout.GetVirtualMemoryRegionTree().GetRandomAlignedRegion( | 356 | memory_layout.GetVirtualMemoryRegionTree().GetRandomAlignedRegion( |
| @@ -382,7 +382,7 @@ struct KernelCore::Impl { | |||
| 382 | slab_region_start, slab_region_size, KMemoryRegionType_KernelSlab)); | 382 | slab_region_start, slab_region_size, KMemoryRegionType_KernelSlab)); |
| 383 | 383 | ||
| 384 | // Setup the temp region. | 384 | // Setup the temp region. |
| 385 | constexpr size_t TempRegionSize = Size_128_MB; | 385 | constexpr size_t TempRegionSize = Common::Size_128_MB; |
| 386 | constexpr size_t TempRegionAlign = KernelAslrAlignment; | 386 | constexpr size_t TempRegionAlign = KernelAslrAlignment; |
| 387 | const VAddr temp_region_start = | 387 | const VAddr temp_region_start = |
| 388 | memory_layout.GetVirtualMemoryRegionTree().GetRandomAlignedRegion( | 388 | memory_layout.GetVirtualMemoryRegionTree().GetRandomAlignedRegion( |
| @@ -438,7 +438,7 @@ struct KernelCore::Impl { | |||
| 438 | // Determine size available for kernel page table heaps, requiring > 8 MB. | 438 | // Determine size available for kernel page table heaps, requiring > 8 MB. |
| 439 | const PAddr resource_end_phys_addr = slab_start_phys_addr + resource_region_size; | 439 | const PAddr resource_end_phys_addr = slab_start_phys_addr + resource_region_size; |
| 440 | const size_t page_table_heap_size = resource_end_phys_addr - slab_end_phys_addr; | 440 | const size_t page_table_heap_size = resource_end_phys_addr - slab_end_phys_addr; |
| 441 | ASSERT(page_table_heap_size / Size_4_MB > 2); | 441 | ASSERT(page_table_heap_size / Common::Size_4_MB > 2); |
| 442 | 442 | ||
| 443 | // Insert a physical region for the kernel page table heap region | 443 | // Insert a physical region for the kernel page table heap region |
| 444 | ASSERT(memory_layout.GetPhysicalMemoryRegionTree().Insert( | 444 | ASSERT(memory_layout.GetPhysicalMemoryRegionTree().Insert( |
| @@ -463,7 +463,7 @@ struct KernelCore::Impl { | |||
| 463 | ASSERT(linear_extents.GetEndAddress() != 0); | 463 | ASSERT(linear_extents.GetEndAddress() != 0); |
| 464 | 464 | ||
| 465 | // Setup the linear mapping region. | 465 | // Setup the linear mapping region. |
| 466 | constexpr size_t LinearRegionAlign = Size_1_GB; | 466 | constexpr size_t LinearRegionAlign = Common::Size_1_GB; |
| 467 | const PAddr aligned_linear_phys_start = | 467 | const PAddr aligned_linear_phys_start = |
| 468 | Common::AlignDown(linear_extents.GetAddress(), LinearRegionAlign); | 468 | Common::AlignDown(linear_extents.GetAddress(), LinearRegionAlign); |
| 469 | const size_t linear_region_size = | 469 | const size_t linear_region_size = |