diff options
| author | bunnei <bunneidev@gmail.com> | 2018-05-02 15:24:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 15:24:41 -0400 |
| commit | 618cce317265eacfc9200727b473d331b4aa55a3 (patch) | |
| tree | edfd9282300ba280bf51ba8a99f8a727122a31c0 /src/core/hle/kernel/shared_memory.cpp | |
| parent | 7d3a42dccdd421319e60f80faf11a7fdcc7ca228 (diff) | |
| parent | 1b310cbb3a5259e172ac09888e602520f383f19d (diff) | |
Merge pull request #431 from lioncash/fmt
general: Make formatting of logged hex values more straightforward
Diffstat (limited to 'src/core/hle/kernel/shared_memory.cpp')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index f0b65c73d2..ac4921298a 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -107,7 +107,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi // Error out if the requested permissions don't match what the creator process allows. if (static_cast<u32>(permissions) & ~static_cast<u32>(own_other_permissions)) { - NGLOG_ERROR(Kernel, "cannot map id={}, address={:#X} name={}, permissions don't match", + NGLOG_ERROR(Kernel, "cannot map id={}, address=0x{:X} name={}, permissions don't match", GetObjectId(), address, name); return ERR_INVALID_COMBINATION; } @@ -115,7 +115,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi // Error out if the provided permissions are not compatible with what the creator process needs. if (other_permissions != MemoryPermission::DontCare && static_cast<u32>(this->permissions) & ~static_cast<u32>(other_permissions)) { - NGLOG_ERROR(Kernel, "cannot map id={}, address={:#X} name={}, permissions don't match", + NGLOG_ERROR(Kernel, "cannot map id={}, address=0x{:X} name={}, permissions don't match", GetObjectId(), address, name); return ERR_WRONG_PERMISSION; } @@ -133,7 +133,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi if (result.Failed()) { NGLOG_ERROR( Kernel, - "cannot map id={}, target_address={:#X} name={}, error mapping to virtual memory", + "cannot map id={}, target_address=0x{:X} name={}, error mapping to virtual memory", GetObjectId(), target_address, name); return result.Code(); } |
