summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-19 03:59:09 +0200
committerGitHub <noreply@github.com>2018-07-19 03:59:09 +0200
commit90ce935f3d3558ca2b1dd53afa904c0618bb3f1d (patch)
tree934778e1bb3aac0fd33186b0fcd7e3d688764227
parentMerge pull request #693 from lioncash/unused (diff)
parentvm_manager: Add missing commas to string literal array elements in GetMemoryStateName() (diff)
downloadyuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.tar
yuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.tar.gz
yuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.tar.bz2
yuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.tar.lz
yuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.tar.xz
yuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.tar.zst
yuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.zip
-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 @@
namespace Kernel {
static const char* GetMemoryStateName(MemoryState state) {
- static const char* names[] = {
- "Unmapped",
- "Io",
- "Normal",
- "CodeStatic",
- "CodeMutable",
- "Heap",
- "Shared",
- "Unknown1"
- "ModuleCodeStatic",
- "ModuleCodeMutable",
- "IpcBuffer0",
- "Mapped",
- "ThreadLocal",
- "TransferMemoryIsolated",
- "TransferMemory",
- "ProcessMemory",
- "Unknown2"
- "IpcBuffer1",
- "IpcBuffer3",
- "KernelStack",
+ static constexpr const char* names[] = {
+ "Unmapped", "Io",
+ "Normal", "CodeStatic",
+ "CodeMutable", "Heap",
+ "Shared", "Unknown1",
+ "ModuleCodeStatic", "ModuleCodeMutable",
+ "IpcBuffer0", "Mapped",
+ "ThreadLocal", "TransferMemoryIsolated",
+ "TransferMemory", "ProcessMemory",
+ "Unknown2", "IpcBuffer1",
+ "IpcBuffer3", "KernelStack",
};
- return names[(int)state];
+ return names[static_cast<int>(state)];
}
bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const {