summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_code_memory.cpp
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-03-07 16:49:41 +0100
committerLiam <byteslice@airmail.cc>2023-03-13 03:09:09 +0100
commitc0b9e93b77cca0e5fbd455efc5dec10199ef8184 (patch)
tree2e6e76c5075bc46695b9c8a178deaadc11b3eb99 /src/core/hle/kernel/k_code_memory.cpp
parentkernel: remove gratitutous attribute usage (diff)
downloadyuzu-c0b9e93b77cca0e5fbd455efc5dec10199ef8184.tar
yuzu-c0b9e93b77cca0e5fbd455efc5dec10199ef8184.tar.gz
yuzu-c0b9e93b77cca0e5fbd455efc5dec10199ef8184.tar.bz2
yuzu-c0b9e93b77cca0e5fbd455efc5dec10199ef8184.tar.lz
yuzu-c0b9e93b77cca0e5fbd455efc5dec10199ef8184.tar.xz
yuzu-c0b9e93b77cca0e5fbd455efc5dec10199ef8184.tar.zst
yuzu-c0b9e93b77cca0e5fbd455efc5dec10199ef8184.zip
Diffstat (limited to 'src/core/hle/kernel/k_code_memory.cpp')
-rw-r--r--src/core/hle/kernel/k_code_memory.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/core/hle/kernel/k_code_memory.cpp
index 4167ade2b..89df6b5d8 100644
--- a/src/core/hle/kernel/k_code_memory.cpp
+++ b/src/core/hle/kernel/k_code_memory.cpp
@@ -16,18 +16,18 @@
namespace Kernel {
-KCodeMemory::KCodeMemory(KernelCore& kernel_)
- : KAutoObjectWithSlabHeapAndContainer{kernel_}, m_lock(kernel_) {}
+KCodeMemory::KCodeMemory(KernelCore& kernel)
+ : KAutoObjectWithSlabHeapAndContainer{kernel}, m_lock(kernel) {}
Result KCodeMemory::Initialize(Core::DeviceMemory& device_memory, VAddr addr, size_t size) {
// Set members.
- m_owner = GetCurrentProcessPointer(kernel);
+ m_owner = GetCurrentProcessPointer(m_kernel);
// Get the owner page table.
auto& page_table = m_owner->PageTable();
// Construct the page group.
- m_page_group.emplace(kernel, page_table.GetBlockInfoManager());
+ m_page_group.emplace(m_kernel, page_table.GetBlockInfoManager());
// Lock the memory.
R_TRY(page_table.LockForCodeMemory(std::addressof(*m_page_group), addr, size))
@@ -74,7 +74,7 @@ Result KCodeMemory::Map(VAddr address, size_t size) {
R_UNLESS(!m_is_mapped, ResultInvalidState);
// Map the memory.
- R_TRY(GetCurrentProcess(kernel).PageTable().MapPageGroup(
+ R_TRY(GetCurrentProcess(m_kernel).PageTable().MapPageGroup(
address, *m_page_group, KMemoryState::CodeOut, KMemoryPermission::UserReadWrite));
// Mark ourselves as mapped.
@@ -91,8 +91,8 @@ Result KCodeMemory::Unmap(VAddr address, size_t size) {
KScopedLightLock lk(m_lock);
// Unmap the memory.
- R_TRY(GetCurrentProcess(kernel).PageTable().UnmapPageGroup(address, *m_page_group,
- KMemoryState::CodeOut));
+ R_TRY(GetCurrentProcess(m_kernel).PageTable().UnmapPageGroup(address, *m_page_group,
+ KMemoryState::CodeOut));
// Mark ourselves as unmapped.
m_is_mapped = false;