hle: kernel: Use host memory allocations for KSlabMemory.
- There are some issues with the current workaround, we will just use host memory until we have a complete kernel memory implementation.
This commit is contained in:
parent
7331bb9d8d
commit
b4fc2e52a2
4 changed files with 20 additions and 174 deletions
|
@ -70,14 +70,22 @@ constexpr size_t SlabCountExtraKThread = 160;
|
|||
template <typename T>
|
||||
VAddr InitializeSlabHeap(Core::System& system, KMemoryLayout& memory_layout, VAddr address,
|
||||
size_t num_objects) {
|
||||
// TODO(bunnei): This is just a place holder. We should initialize the appropriate KSlabHeap for
|
||||
// kernel object type T with the backing kernel memory pointer once we emulate kernel memory.
|
||||
|
||||
const size_t size = Common::AlignUp(sizeof(T) * num_objects, alignof(void*));
|
||||
VAddr start = Common::AlignUp(address, alignof(T));
|
||||
|
||||
// This is intentionally empty. Once KSlabHeap is fully implemented, we can replace this with
|
||||
// the pointer to emulated memory to pass along. Until then, KSlabHeap will just allocate/free
|
||||
// host memory.
|
||||
void* backing_kernel_memory{};
|
||||
|
||||
if (size > 0) {
|
||||
const KMemoryRegion* region = memory_layout.FindVirtual(start + size - 1);
|
||||
ASSERT(region != nullptr);
|
||||
ASSERT(region->IsDerivedFrom(KMemoryRegionType_KernelSlab));
|
||||
T::InitializeSlabHeap(system.Kernel(), system.Memory().GetKernelBuffer(start, size), size);
|
||||
T::InitializeSlabHeap(system.Kernel(), backing_kernel_memory, size);
|
||||
}
|
||||
|
||||
return start + size;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue