summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/vm_manager.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-03-10 23:46:23 +0100
committerbunnei <bunneidev@gmail.com>2018-03-16 23:32:21 +0100
commit8be7131033653a68deae12208b8bec79fb1a004e (patch)
treedcbf2cf9490ab167097fc282b39c95b5249505b1 /src/core/hle/kernel/vm_manager.cpp
parentMerge pull request #237 from mailwl/nifm-module (diff)
downloadyuzu-8be7131033653a68deae12208b8bec79fb1a004e.tar
yuzu-8be7131033653a68deae12208b8bec79fb1a004e.tar.gz
yuzu-8be7131033653a68deae12208b8bec79fb1a004e.tar.bz2
yuzu-8be7131033653a68deae12208b8bec79fb1a004e.tar.lz
yuzu-8be7131033653a68deae12208b8bec79fb1a004e.tar.xz
yuzu-8be7131033653a68deae12208b8bec79fb1a004e.tar.zst
yuzu-8be7131033653a68deae12208b8bec79fb1a004e.zip
Diffstat (limited to 'src/core/hle/kernel/vm_manager.cpp')
-rw-r--r--src/core/hle/kernel/vm_manager.cpp24
1 files changed, 21 insertions, 3 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index d5b36d71a..9ea7e0406 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -18,8 +18,26 @@ namespace Kernel {
static const char* GetMemoryStateName(MemoryState state) {
static const char* names[] = {
- "Free", "Reserved", "IO", "Static", "Code", "Private",
- "Shared", "Continuous", "Aliased", "Alias", "AliasCode", "Locked",
+ "Unmapped",
+ "Io",
+ "Normal",
+ "CodeStatic",
+ "CodeMutable",
+ "Heap",
+ "Shared",
+ "Unknown1"
+ "ModuleCodeStatic",
+ "ModuleCodeMutable",
+ "IpcBuffer0",
+ "Mapped",
+ "ThreadLocal",
+ "TransferMemoryIsolated",
+ "TransferMemory",
+ "ProcessMemory",
+ "Unknown2"
+ "IpcBuffer1",
+ "IpcBuffer3",
+ "KernelStack",
};
return names[(int)state];
@@ -142,7 +160,7 @@ VMManager::VMAIter VMManager::Unmap(VMAIter vma_handle) {
VirtualMemoryArea& vma = vma_handle->second;
vma.type = VMAType::Free;
vma.permissions = VMAPermission::None;
- vma.meminfo_state = MemoryState::Free;
+ vma.meminfo_state = MemoryState::Unmapped;
vma.backing_block = nullptr;
vma.offset = 0;