summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2018-12-12 10:08:46 -0500
committerGravatar Lioncash2018-12-12 14:03:50 -0500
commit366985ca925c28867b4cdf847db978acd6c2db1e (patch)
tree4a14e65865cc55c35e451ae5947e644741b9cd31 /src/core/hle/kernel/svc.cpp
parentMerge pull request #1846 from lioncash/dir (diff)
downloadyuzu-366985ca925c28867b4cdf847db978acd6c2db1e.tar.gz
yuzu-366985ca925c28867b4cdf847db978acd6c2db1e.tar.xz
yuzu-366985ca925c28867b4cdf847db978acd6c2db1e.zip
vm_manager: Amend MemoryState enum members
Amends the MemoryState enum to use the same values like the actual kernel does. Also provides the necessary operators to operate on them. This will be necessary in the future for implementing svcSetMemoryAttribute, as memory block state is checked before applying the attribute.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
-rw-r--r--src/core/hle/kernel/svc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index f43c7201c..4ae92ff9e 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -273,7 +273,7 @@ static ResultCode MapMemory(VAddr dst_addr, VAddr src_addr, u64 size) {
273 return result; 273 return result;
274 } 274 }
275 275
276 return current_process->MirrorMemory(dst_addr, src_addr, size); 276 return current_process->MirrorMemory(dst_addr, src_addr, size, MemoryState::Stack);
277} 277}
278 278
279/// Unmaps a region that was previously mapped with svcMapMemory 279/// Unmaps a region that was previously mapped with svcMapMemory
@@ -1086,7 +1086,7 @@ static ResultCode QueryProcessMemory(MemoryInfo* memory_info, PageInfo* /*page_i
1086 memory_info->base_address = vma->second.base; 1086 memory_info->base_address = vma->second.base;
1087 memory_info->permission = static_cast<u32>(vma->second.permissions); 1087 memory_info->permission = static_cast<u32>(vma->second.permissions);
1088 memory_info->size = vma->second.size; 1088 memory_info->size = vma->second.size;
1089 memory_info->type = static_cast<u32>(vma->second.meminfo_state); 1089 memory_info->type = ToSvcMemoryState(vma->second.meminfo_state);
1090 } else { 1090 } else {
1091 memory_info->base_address = 0; 1091 memory_info->base_address = 0;
1092 memory_info->permission = static_cast<u32>(VMAPermission::None); 1092 memory_info->permission = static_cast<u32>(VMAPermission::None);