diff options
| author | 2021-05-27 17:15:23 -0700 | |
|---|---|---|
| committer | 2021-05-28 17:42:41 -0700 | |
| commit | ee099b26976dd7bfd1ac7907363f4f7608fe75c0 (patch) | |
| tree | 17663da7860f35ae4ac2dad054cb59b75e0363e1 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #6356 from ogniK5377/ApplyNpadSystemCommonPolicy (diff) | |
| download | yuzu-ee099b26976dd7bfd1ac7907363f4f7608fe75c0.tar.gz yuzu-ee099b26976dd7bfd1ac7907363f4f7608fe75c0.tar.xz yuzu-ee099b26976dd7bfd1ac7907363f4f7608fe75c0.zip | |
hle: kernel: KSlabHeap: Allow host or guest allocations.
- Use host allocations for kernel memory, as this is not properly emulated yet.
- Use guest allocations for TLS, as this needs to be backed by DeviceMemory.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 8b55df82e..b7a6c9abf 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -620,7 +620,8 @@ struct KernelCore::Impl { | |||
| 620 | 620 | ||
| 621 | void InitializePageSlab() { | 621 | void InitializePageSlab() { |
| 622 | // Allocate slab heaps | 622 | // Allocate slab heaps |
| 623 | user_slab_heap_pages = std::make_unique<KSlabHeap<Page>>(); | 623 | user_slab_heap_pages = |
| 624 | std::make_unique<KSlabHeap<Page>>(KSlabHeap<Page>::AllocationType::Guest); | ||
| 624 | 625 | ||
| 625 | // TODO(ameerj): This should be derived, not hardcoded within the kernel | 626 | // TODO(ameerj): This should be derived, not hardcoded within the kernel |
| 626 | constexpr u64 user_slab_heap_size{0x3de000}; | 627 | constexpr u64 user_slab_heap_size{0x3de000}; |