diff options
author | Lioncash <mathew1800@gmail.com> | 2018-04-26 01:11:22 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-04-26 02:32:09 +0200 |
commit | 40dee76c57e76438d06fc282d1f8a632933d5816 (patch) | |
tree | b8c8571cb0bd59744f431affdab790827feb446a /src/core/hle/kernel/shared_memory.cpp | |
parent | Merge pull request #390 from mailwl/pctl-module (diff) | |
download | yuzu-40dee76c57e76438d06fc282d1f8a632933d5816.tar yuzu-40dee76c57e76438d06fc282d1f8a632933d5816.tar.gz yuzu-40dee76c57e76438d06fc282d1f8a632933d5816.tar.bz2 yuzu-40dee76c57e76438d06fc282d1f8a632933d5816.tar.lz yuzu-40dee76c57e76438d06fc282d1f8a632933d5816.tar.xz yuzu-40dee76c57e76438d06fc282d1f8a632933d5816.tar.zst yuzu-40dee76c57e76438d06fc282d1f8a632933d5816.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index bc99993c8..b18e9aea4 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -107,16 +107,16 @@ 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)) { - LOG_ERROR(Kernel, "cannot map id=%u, address=0x%lx name=%s, permissions don't match", - GetObjectId(), address, name.c_str()); + NGLOG_ERROR(Kernel, "cannot map id={}, address={:#X} name={}, permissions don't match", + GetObjectId(), address, name); return ERR_INVALID_COMBINATION; } // 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)) { - LOG_ERROR(Kernel, "cannot map id=%u, address=0x%lx name=%s, permissions don't match", - GetObjectId(), address, name.c_str()); + NGLOG_ERROR(Kernel, "cannot map id={}, address={:#X} name={}, permissions don't match", + GetObjectId(), address, name); return ERR_WRONG_PERMISSION; } @@ -131,9 +131,10 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi auto result = target_process->vm_manager.MapMemoryBlock( target_address, backing_block, backing_block_offset, size, MemoryState::Shared); if (result.Failed()) { - LOG_ERROR(Kernel, - "cannot map id=%u, target_address=0x%lx name=%s, error mapping to virtual memory", - GetObjectId(), target_address, name.c_str()); + NGLOG_ERROR( + Kernel, + "cannot map id={}, target_address={:#X} name={}, error mapping to virtual memory", + GetObjectId(), target_address, name); return result.Code(); } |