Browse Source

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.
nce_cpp
Lioncash 8 years ago
parent
commit
81bf614695
  1. 34
      src/core/hle/kernel/vm_manager.cpp

34
src/core/hle/kernel/vm_manager.cpp

@ -16,30 +16,20 @@
namespace Kernel { namespace Kernel {
static const char* GetMemoryStateName(MemoryState state) { 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 { bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const {

Loading…
Cancel
Save