CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm_manager: Add missing commas to string literal array elements in GetMemoryStateName() 

Without these, this would perform concatenation, which is definitely not
what we want here.
master
Lioncash 2018-07-18 18:40:35 +07:00
parent 3d1e8f750c
commit 93cba6f699
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/core/hle/kernel/vm_manager.cpp
Unescape Escape View File

@ -16,30 +16,20 @@
namespace Kernel { namespace Kernel {
static const char* GetMemoryStateName(MemoryState state) { static const char* GetMemoryStateName(MemoryState state) {
static const char* names[] = { static constexpr const char* names[] = {
"Unmapped", "Unmapped", "Io",
"Io", "Normal", "CodeStatic",
"Normal", "CodeMutable", "Heap",
"CodeStatic", "Shared", "Unknown1",
"CodeMutable", "ModuleCodeStatic", "ModuleCodeMutable",
"Heap", "IpcBuffer0", "Mapped",
"Shared", "ThreadLocal", "TransferMemoryIsolated",
"Unknown1" "TransferMemory", "ProcessMemory",
"ModuleCodeStatic", "Unknown2", "IpcBuffer1",
"ModuleCodeMutable", "IpcBuffer3", "KernelStack",
"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 { bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const {