summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_memory_layout.h
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-03-13 14:16:16 +0100
committerGitHub <noreply@github.com>2023-03-13 14:16:16 +0100
commit1f952f6ac9e3aca3dba8e4286fe937616081a767 (patch)
treeca57513605bdef4767762614c074ca90b7791575 /src/core/hle/kernel/k_memory_layout.h
parentMerge pull request #9942 from liamwhite/speling (diff)
parentkernel: additional style fixes to KThread, KProcess (diff)
downloadyuzu-1f952f6ac9e3aca3dba8e4286fe937616081a767.tar
yuzu-1f952f6ac9e3aca3dba8e4286fe937616081a767.tar.gz
yuzu-1f952f6ac9e3aca3dba8e4286fe937616081a767.tar.bz2
yuzu-1f952f6ac9e3aca3dba8e4286fe937616081a767.tar.lz
yuzu-1f952f6ac9e3aca3dba8e4286fe937616081a767.tar.xz
yuzu-1f952f6ac9e3aca3dba8e4286fe937616081a767.tar.zst
yuzu-1f952f6ac9e3aca3dba8e4286fe937616081a767.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_memory_layout.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/core/hle/kernel/k_memory_layout.h b/src/core/hle/kernel/k_memory_layout.h
index 17fa1a6ed..551b7a0e4 100644
--- a/src/core/hle/kernel/k_memory_layout.h
+++ b/src/core/hle/kernel/k_memory_layout.h
@@ -80,35 +80,35 @@ public:
KMemoryLayout();
KMemoryRegionTree& GetVirtualMemoryRegionTree() {
- return virtual_tree;
+ return m_virtual_tree;
}
const KMemoryRegionTree& GetVirtualMemoryRegionTree() const {
- return virtual_tree;
+ return m_virtual_tree;
}
KMemoryRegionTree& GetPhysicalMemoryRegionTree() {
- return physical_tree;
+ return m_physical_tree;
}
const KMemoryRegionTree& GetPhysicalMemoryRegionTree() const {
- return physical_tree;
+ return m_physical_tree;
}
KMemoryRegionTree& GetVirtualLinearMemoryRegionTree() {
- return virtual_linear_tree;
+ return m_virtual_linear_tree;
}
const KMemoryRegionTree& GetVirtualLinearMemoryRegionTree() const {
- return virtual_linear_tree;
+ return m_virtual_linear_tree;
}
KMemoryRegionTree& GetPhysicalLinearMemoryRegionTree() {
- return physical_linear_tree;
+ return m_physical_linear_tree;
}
const KMemoryRegionTree& GetPhysicalLinearMemoryRegionTree() const {
- return physical_linear_tree;
+ return m_physical_linear_tree;
}
VAddr GetLinearVirtualAddress(PAddr address) const {
- return address + linear_phys_to_virt_diff;
+ return address + m_linear_phys_to_virt_diff;
}
PAddr GetLinearPhysicalAddress(VAddr address) const {
- return address + linear_virt_to_phys_diff;
+ return address + m_linear_virt_to_phys_diff;
}
const KMemoryRegion* FindVirtual(VAddr address) const {
@@ -391,13 +391,13 @@ private:
}
private:
- u64 linear_phys_to_virt_diff{};
- u64 linear_virt_to_phys_diff{};
- KMemoryRegionAllocator memory_region_allocator;
- KMemoryRegionTree virtual_tree;
- KMemoryRegionTree physical_tree;
- KMemoryRegionTree virtual_linear_tree;
- KMemoryRegionTree physical_linear_tree;
+ u64 m_linear_phys_to_virt_diff{};
+ u64 m_linear_virt_to_phys_diff{};
+ KMemoryRegionAllocator m_memory_region_allocator;
+ KMemoryRegionTree m_virtual_tree;
+ KMemoryRegionTree m_physical_tree;
+ KMemoryRegionTree m_virtual_linear_tree;
+ KMemoryRegionTree m_physical_linear_tree;
};
namespace Init {