From d134ca68c6a24b62382061d66dae153fb73145f1 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 8 Feb 2022 18:47:11 -0800 Subject: hle: kernel: KCodeMemory: Correct m_page_group number of pages. Credits to @xerpi for finding this issue and pointing it out on #7519. --- src/core/hle/kernel/k_code_memory.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/core/hle/kernel/k_code_memory.cpp index d69f7ffb7..2419d113b 100644 --- a/src/core/hle/kernel/k_code_memory.cpp +++ b/src/core/hle/kernel/k_code_memory.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "common/alignment.h" #include "common/common_types.h" #include "core/device_memory.h" #include "core/hle/kernel/k_auto_object.h" @@ -29,7 +30,7 @@ ResultCode KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr // Construct the page group. KMemoryInfo kBlockInfo = page_table.QueryInfo(addr); - m_page_group = KPageLinkedList(kBlockInfo.GetAddress(), kBlockInfo.GetNumPages()); + m_page_group = KPageLinkedList(addr, Common::DivideUp(size, PageSize)); // Lock the memory. R_TRY(page_table.LockForCodeMemory(addr, size)) @@ -143,4 +144,4 @@ ResultCode KCodeMemory::UnmapFromOwner(VAddr address, size_t size) { return ResultSuccess; } -} // namespace Kernel \ No newline at end of file +} // namespace Kernel -- cgit v1.2.3 From 862dddf8c90c05d1cc14e4d51dd8fb3b683152ac Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 8 Feb 2022 18:49:41 -0800 Subject: hle: kernel: KCodeMemory: Remove unused QueryMemory. --- src/core/hle/kernel/k_code_memory.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/core/hle/kernel/k_code_memory.cpp index 2419d113b..0b225e8e0 100644 --- a/src/core/hle/kernel/k_code_memory.cpp +++ b/src/core/hle/kernel/k_code_memory.cpp @@ -29,7 +29,6 @@ ResultCode KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr auto& page_table = m_owner->PageTable(); // Construct the page group. - KMemoryInfo kBlockInfo = page_table.QueryInfo(addr); m_page_group = KPageLinkedList(addr, Common::DivideUp(size, PageSize)); // Lock the memory. -- cgit v1.2.3