summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2018-02-14 00:27:46 -0500
committerGravatar Lioncash2018-02-14 01:50:14 -0500
commit1e33db85734eb658b0168743905d4b1a50030237 (patch)
treed7ea7286d5927503f556b52c7c92e3441abeace0 /src
parentgdbstub: Silence formatting specifier warnings (diff)
downloadyuzu-1e33db85734eb658b0168743905d4b1a50030237.tar.gz
yuzu-1e33db85734eb658b0168743905d4b1a50030237.tar.xz
yuzu-1e33db85734eb658b0168743905d4b1a50030237.zip
vm_manager: Silence formatting specifier warnings
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/vm_manager.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 6da77eb58..d5b36d71a 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -2,6 +2,7 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <cinttypes>
5#include <iterator> 6#include <iterator>
6#include "common/assert.h" 7#include "common/assert.h"
7#include "common/logging/log.h" 8#include "common/logging/log.h"
@@ -206,7 +207,8 @@ void VMManager::RefreshMemoryBlockMappings(const std::vector<u8>* block) {
206void VMManager::LogLayout(Log::Level log_level) const { 207void VMManager::LogLayout(Log::Level log_level) const {
207 for (const auto& p : vma_map) { 208 for (const auto& p : vma_map) {
208 const VirtualMemoryArea& vma = p.second; 209 const VirtualMemoryArea& vma = p.second;
209 LOG_GENERIC(Log::Class::Kernel, log_level, "%08X - %08X size: %8X %c%c%c %s", vma.base, 210 LOG_GENERIC(Log::Class::Kernel, log_level,
211 "%016" PRIx64 " - %016" PRIx64 " size: %16" PRIx64 " %c%c%c %s", vma.base,
210 vma.base + vma.size, vma.size, 212 vma.base + vma.size, vma.size,
211 (u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-', 213 (u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-',
212 (u8)vma.permissions & (u8)VMAPermission::Write ? 'W' : '-', 214 (u8)vma.permissions & (u8)VMAPermission::Write ? 'W' : '-',
@@ -222,8 +224,8 @@ VMManager::VMAIter VMManager::StripIterConstness(const VMAHandle& iter) {
222} 224}
223 225
224ResultVal<VMManager::VMAIter> VMManager::CarveVMA(VAddr base, u64 size) { 226ResultVal<VMManager::VMAIter> VMManager::CarveVMA(VAddr base, u64 size) {
225 ASSERT_MSG((size & Memory::PAGE_MASK) == 0, "non-page aligned size: 0x%8X", size); 227 ASSERT_MSG((size & Memory::PAGE_MASK) == 0, "non-page aligned size: 0x%16" PRIx64, size);
226 ASSERT_MSG((base & Memory::PAGE_MASK) == 0, "non-page aligned base: 0x%08X", base); 228 ASSERT_MSG((base & Memory::PAGE_MASK) == 0, "non-page aligned base: 0x%016" PRIx64, base);
227 229
228 VMAIter vma_handle = StripIterConstness(FindVMA(base)); 230 VMAIter vma_handle = StripIterConstness(FindVMA(base));
229 if (vma_handle == vma_map.end()) { 231 if (vma_handle == vma_map.end()) {
@@ -258,8 +260,8 @@ ResultVal<VMManager::VMAIter> VMManager::CarveVMA(VAddr base, u64 size) {
258} 260}
259 261
260ResultVal<VMManager::VMAIter> VMManager::CarveVMARange(VAddr target, u64 size) { 262ResultVal<VMManager::VMAIter> VMManager::CarveVMARange(VAddr target, u64 size) {
261 ASSERT_MSG((size & Memory::PAGE_MASK) == 0, "non-page aligned size: 0x%8X", size); 263 ASSERT_MSG((size & Memory::PAGE_MASK) == 0, "non-page aligned size: 0x%16" PRIx64, size);
262 ASSERT_MSG((target & Memory::PAGE_MASK) == 0, "non-page aligned base: 0x%08X", target); 264 ASSERT_MSG((target & Memory::PAGE_MASK) == 0, "non-page aligned base: 0x%016" PRIx64, target);
263 265
264 VAddr target_end = target + size; 266 VAddr target_end = target + size;
265 ASSERT(target_end >= target); 267 ASSERT(target_end >= target);