Merge pull request #7870 from yuzu-emu/fix-codememory-size

hle: kernel: KCodeMemory: Correct m_page_group number of pages.
This commit is contained in:
bunnei 2022-02-09 11:29:32 -07:00 committed by GitHub
commit bcd666b86b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/alignment.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "core/device_memory.h" #include "core/device_memory.h"
#include "core/hle/kernel/k_auto_object.h" #include "core/hle/kernel/k_auto_object.h"
@ -28,8 +29,7 @@ ResultCode KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr
auto& page_table = m_owner->PageTable(); auto& page_table = m_owner->PageTable();
// Construct the page group. // Construct the page group.
KMemoryInfo kBlockInfo = page_table.QueryInfo(addr); m_page_group = KPageLinkedList(addr, Common::DivideUp(size, PageSize));
m_page_group = KPageLinkedList(kBlockInfo.GetAddress(), kBlockInfo.GetNumPages());
// Lock the memory. // Lock the memory.
R_TRY(page_table.LockForCodeMemory(addr, size)) R_TRY(page_table.LockForCodeMemory(addr, size))
@ -143,4 +143,4 @@ ResultCode KCodeMemory::UnmapFromOwner(VAddr address, size_t size) {
return ResultSuccess; return ResultSuccess;
} }
} // namespace Kernel } // namespace Kernel