summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/hle/kernel/vm_manager.cpp34
1 files changed, 12 insertions, 22 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 034dd490e..10b3ebaca 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -16,30 +16,20 @@
16namespace Kernel { 16namespace Kernel {
17 17
18static const char* GetMemoryStateName(MemoryState state) { 18static const char* GetMemoryStateName(MemoryState state) {
19 static const char* names[] = { 19 static constexpr const char* names[] = {
20 "Unmapped", 20 "Unmapped", "Io",
21 "Io", 21 "Normal", "CodeStatic",
22 "Normal", 22 "CodeMutable", "Heap",
23 "CodeStatic", 23 "Shared", "Unknown1",
24 "CodeMutable", 24 "ModuleCodeStatic", "ModuleCodeMutable",
25 "Heap", 25 "IpcBuffer0", "Mapped",
26 "Shared", 26 "ThreadLocal", "TransferMemoryIsolated",
27 "Unknown1" 27 "TransferMemory", "ProcessMemory",
28 "ModuleCodeStatic", 28 "Unknown2", "IpcBuffer1",
29 "ModuleCodeMutable", 29 "IpcBuffer3", "KernelStack",
30 "IpcBuffer0",
31 "Mapped",
32 "ThreadLocal",
33 "TransferMemoryIsolated",
34 "TransferMemory",
35 "ProcessMemory",
36 "Unknown2"
37 "IpcBuffer1",
38 "IpcBuffer3",
39 "KernelStack",
40 }; 30 };
41 31
42 return names[(int)state]; 32 return names[static_cast<int>(state)];
43} 33}
44 34
45bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const { 35bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const {