summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2022-02-09 11:29:32 -0700
committerGravatar GitHub2022-02-09 11:29:32 -0700
commitbcd666b86bc9db78733e61bd82b6a60ebe593b80 (patch)
treed0983e02c0426bb89b95db6f687be943aa719cdd /src
parentMerge pull request #7847 from tech-ticks/master (diff)
parenthle: kernel: KCodeMemory: Remove unused QueryMemory. (diff)
downloadyuzu-bcd666b86bc9db78733e61bd82b6a60ebe593b80.tar.gz
yuzu-bcd666b86bc9db78733e61bd82b6a60ebe593b80.tar.xz
yuzu-bcd666b86bc9db78733e61bd82b6a60ebe593b80.zip
Merge pull request #7870 from yuzu-emu/fix-codememory-size
hle: kernel: KCodeMemory: Correct m_page_group number of pages.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/k_code_memory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/core/hle/kernel/k_code_memory.cpp
index d69f7ffb7..0b225e8e0 100644
--- a/src/core/hle/kernel/k_code_memory.cpp
+++ b/src/core/hle/kernel/k_code_memory.cpp
@@ -2,6 +2,7 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common/alignment.h"
5#include "common/common_types.h" 6#include "common/common_types.h"
6#include "core/device_memory.h" 7#include "core/device_memory.h"
7#include "core/hle/kernel/k_auto_object.h" 8#include "core/hle/kernel/k_auto_object.h"
@@ -28,8 +29,7 @@ ResultCode KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr
28 auto& page_table = m_owner->PageTable(); 29 auto& page_table = m_owner->PageTable();
29 30
30 // Construct the page group. 31 // Construct the page group.
31 KMemoryInfo kBlockInfo = page_table.QueryInfo(addr); 32 m_page_group = KPageLinkedList(addr, Common::DivideUp(size, PageSize));
32 m_page_group = KPageLinkedList(kBlockInfo.GetAddress(), kBlockInfo.GetNumPages());
33 33
34 // Lock the memory. 34 // Lock the memory.
35 R_TRY(page_table.LockForCodeMemory(addr, size)) 35 R_TRY(page_table.LockForCodeMemory(addr, size))
@@ -143,4 +143,4 @@ ResultCode KCodeMemory::UnmapFromOwner(VAddr address, size_t size) {
143 return ResultSuccess; 143 return ResultSuccess;
144} 144}
145 145
146} // namespace Kernel \ No newline at end of file 146} // namespace Kernel