diff options
| author | 2023-10-20 17:08:00 +0200 | |
|---|---|---|
| committer | 2023-10-20 17:08:00 +0200 | |
| commit | 2e760a98333520f3de1fa7c7a1f9298fd7241ceb (patch) | |
| tree | 90e8a1aa75a91659c0b553f3746ea4febc0bf273 /src/core/debugger/gdbstub.cpp | |
| parent | Merge pull request #11825 from liamwhite/system-resource (diff) | |
| parent | gdbstub: add PermissionLocked to mappings table (diff) | |
| download | yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.tar.gz yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.tar.xz yuzu-2e760a98333520f3de1fa7c7a1f9298fd7241ceb.zip | |
Merge pull request #11748 from liamwhite/kern_1700
kernel: update for 17.0.0
Diffstat (limited to 'src/core/debugger/gdbstub.cpp')
| -rw-r--r-- | src/core/debugger/gdbstub.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index 82964f0a1..2076aa8a2 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp | |||
| @@ -822,11 +822,13 @@ void GDBStub::HandleRcmd(const std::vector<u8>& command) { | |||
| 822 | const char i = True(mem_info.attribute & MemoryAttribute::IpcLocked) ? 'I' : '-'; | 822 | const char i = True(mem_info.attribute & MemoryAttribute::IpcLocked) ? 'I' : '-'; |
| 823 | const char d = True(mem_info.attribute & MemoryAttribute::DeviceShared) ? 'D' : '-'; | 823 | const char d = True(mem_info.attribute & MemoryAttribute::DeviceShared) ? 'D' : '-'; |
| 824 | const char u = True(mem_info.attribute & MemoryAttribute::Uncached) ? 'U' : '-'; | 824 | const char u = True(mem_info.attribute & MemoryAttribute::Uncached) ? 'U' : '-'; |
| 825 | const char p = | ||
| 826 | True(mem_info.attribute & MemoryAttribute::PermissionLocked) ? 'P' : '-'; | ||
| 825 | 827 | ||
| 826 | reply += | 828 | reply += fmt::format(" {:#012x} - {:#012x} {} {} {}{}{}{}{} [{}, {}]\n", |
| 827 | fmt::format(" {:#012x} - {:#012x} {} {} {}{}{}{} [{}, {}]\n", | 829 | mem_info.base_address, |
| 828 | mem_info.base_address, mem_info.base_address + mem_info.size - 1, | 830 | mem_info.base_address + mem_info.size - 1, perm, state, l, i, |
| 829 | perm, state, l, i, d, u, mem_info.ipc_count, mem_info.device_count); | 831 | d, u, p, mem_info.ipc_count, mem_info.device_count); |
| 830 | } | 832 | } |
| 831 | 833 | ||
| 832 | const uintptr_t next_address = mem_info.base_address + mem_info.size; | 834 | const uintptr_t next_address = mem_info.base_address + mem_info.size; |