Browse Source
Merge pull request #688 from lioncash/comma
vm_manager: Add missing commas to string literal array elements in GetMemoryStateName()
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
12 additions and
22 deletions
-
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 { |
|
|
|
|
