diff options
| author |  bunnei | 2018-07-18 18:59:09 -0700 |
|---|---|---|
| committer |  GitHub | 2018-07-18 18:59:09 -0700 |
| commit | 90ce935f3d3558ca2b1dd53afa904c0618bb3f1d (patch) | |
| tree | 934778e1bb3aac0fd33186b0fcd7e3d688764227 /src | |
| parent | Merge pull request #693 from lioncash/unused (diff) | |
| parent | vm_manager: Add missing commas to string literal array elements in GetMemoryS... (diff) | |
| download | yuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.tar.gz yuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.tar.xz yuzu-90ce935f3d3558ca2b1dd53afa904c0618bb3f1d.zip | |
Merge pull request #688 from lioncash/comma
vm_manager: Add missing commas to string literal array elements in GetMemoryStateName()
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 34 |
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 @@ | |||
| 16 | namespace Kernel { | 16 | namespace Kernel { |
| 17 | 17 | ||
| 18 | static const char* GetMemoryStateName(MemoryState state) { | 18 | static 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 | ||
| 45 | bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const { | 35 | bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const { |