summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/vm_manager.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-12-15 00:19:12 +0100
committerLioncash <mathew1800@gmail.com>2018-12-16 01:43:32 +0100
commit34b24a47e9515a6a80d1961fc2e83bcfc84b7889 (patch)
tree0dcf9c311df68534e71b12dfde14916f8fa42d1f /src/core/hle/kernel/vm_manager.cpp
parentMerge pull request #1732 from DarkLordZach/yield-types (diff)
downloadyuzu-34b24a47e9515a6a80d1961fc2e83bcfc84b7889.tar
yuzu-34b24a47e9515a6a80d1961fc2e83bcfc84b7889.tar.gz
yuzu-34b24a47e9515a6a80d1961fc2e83bcfc84b7889.tar.bz2
yuzu-34b24a47e9515a6a80d1961fc2e83bcfc84b7889.tar.lz
yuzu-34b24a47e9515a6a80d1961fc2e83bcfc84b7889.tar.xz
yuzu-34b24a47e9515a6a80d1961fc2e83bcfc84b7889.tar.zst
yuzu-34b24a47e9515a6a80d1961fc2e83bcfc84b7889.zip
Diffstat (limited to 'src/core/hle/kernel/vm_manager.cpp')
-rw-r--r--src/core/hle/kernel/vm_manager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index d3b55a51e..ea3f59935 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -38,7 +38,7 @@ static const char* GetMemoryStateName(MemoryState state) {
bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const {
ASSERT(base + size == next.base);
if (permissions != next.permissions || meminfo_state != next.meminfo_state ||
- type != next.type) {
+ attribute != next.attribute || type != next.type) {
return false;
}
if (type == VMAType::AllocatedMemoryBlock &&
@@ -308,6 +308,7 @@ MemoryInfo VMManager::QueryMemory(VAddr address) const {
if (IsValidHandle(vma)) {
memory_info.base_address = vma->second.base;
+ memory_info.attributes = ToSvcMemoryAttribute(vma->second.attribute);
memory_info.permission = static_cast<u32>(vma->second.permissions);
memory_info.size = vma->second.size;
memory_info.state = ToSvcMemoryState(vma->second.meminfo_state);