diff options
| author | bunnei <bunneidev@gmail.com> | 2017-09-21 05:15:27 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2017-09-30 20:28:54 +0200 |
| commit | 46297c9653d9335fac7ff20a10d23258844bfdaf (patch) | |
| tree | a1cea24cf68b3d3215b4e54e95e4ff8dab2eff19 /src | |
| parent | kernel: Various threading fixes to support 64-bit addressing. (diff) | |
| download | yuzu-46297c9653d9335fac7ff20a10d23258844bfdaf.tar yuzu-46297c9653d9335fac7ff20a10d23258844bfdaf.tar.gz yuzu-46297c9653d9335fac7ff20a10d23258844bfdaf.tar.bz2 yuzu-46297c9653d9335fac7ff20a10d23258844bfdaf.tar.lz yuzu-46297c9653d9335fac7ff20a10d23258844bfdaf.tar.xz yuzu-46297c9653d9335fac7ff20a10d23258844bfdaf.tar.zst yuzu-46297c9653d9335fac7ff20a10d23258844bfdaf.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/memory.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index ed453d0c1..ebe16b030 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -184,7 +184,7 @@ T Read(const VAddr vaddr) { PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; switch (type) { case PageType::Unmapped: - LOG_ERROR(HW_Memory, "unmapped Read%lu @ 0x%08X", sizeof(T) * 8, vaddr); + LOG_ERROR(HW_Memory, "unmapped Read%lu @ 0x%llx", sizeof(T) * 8, vaddr); return 0; case PageType::Memory: ASSERT_MSG(false, "Mapped memory page without a pointer @ %08X", vaddr); @@ -222,7 +222,7 @@ void Write(const VAddr vaddr, const T data) { PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; switch (type) { case PageType::Unmapped: - LOG_ERROR(HW_Memory, "unmapped Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u64)data, + LOG_ERROR(HW_Memory, "unmapped Write%lu 0x%llx @ 0x%llx", sizeof(data) * 8, (u64)data, vaddr); return; case PageType::Memory: @@ -280,7 +280,7 @@ u8* GetPointer(const VAddr vaddr) { return GetPointerFromVMA(vaddr); } - LOG_ERROR(HW_Memory, "unknown GetPointer @ 0x%08x", vaddr); + LOG_ERROR(HW_Memory, "unknown GetPointer @ 0x%llx", vaddr); return nullptr; } @@ -444,7 +444,7 @@ void ReadBlock(const VAddr src_addr, void* dest_buffer, const size_t size) { switch (current_page_table->attributes[page_index]) { case PageType::Unmapped: { - LOG_ERROR(HW_Memory, "unmapped ReadBlock @ 0x%08X (start address = 0x%08X, size = %zu)", + LOG_ERROR(HW_Memory, "unmapped ReadBlock @ 0x%llx (start address = 0x%llx, size = %zu)", current_vaddr, src_addr, size); std::memset(dest_buffer, 0, copy_amount); break; @@ -512,7 +512,7 @@ void WriteBlock(const VAddr dest_addr, const void* src_buffer, const size_t size switch (current_page_table->attributes[page_index]) { case PageType::Unmapped: { LOG_ERROR(HW_Memory, - "unmapped WriteBlock @ 0x%08X (start address = 0x%08X, size = %zu)", + "unmapped WriteBlock @ 0x%llx (start address = 0x%llx, size = %zu)", current_vaddr, dest_addr, size); break; } @@ -564,7 +564,7 @@ void ZeroBlock(const VAddr dest_addr, const size_t size) { switch (current_page_table->attributes[page_index]) { case PageType::Unmapped: { - LOG_ERROR(HW_Memory, "unmapped ZeroBlock @ 0x%08X (start address = 0x%08X, size = %zu)", + LOG_ERROR(HW_Memory, "unmapped ZeroBlock @ 0x%llx (start address = 0x%llx, size = %zu)", current_vaddr, dest_addr, size); break; } @@ -613,7 +613,7 @@ void CopyBlock(VAddr dest_addr, VAddr src_addr, const size_t size) { switch (current_page_table->attributes[page_index]) { case PageType::Unmapped: { - LOG_ERROR(HW_Memory, "unmapped CopyBlock @ 0x%08X (start address = 0x%08X, size = %zu)", + LOG_ERROR(HW_Memory, "unmapped CopyBlock @ 0x%llx (start address = 0x%llx, size = %zu)", current_vaddr, src_addr, size); ZeroBlock(dest_addr, copy_amount); break; @@ -721,7 +721,7 @@ boost::optional<PAddr> TryVirtualToPhysicalAddress(const VAddr addr) { PAddr VirtualToPhysicalAddress(const VAddr addr) { auto paddr = TryVirtualToPhysicalAddress(addr); if (!paddr) { - LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%08X", addr); + LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%llx", addr); // To help with debugging, set bit on address so that it's obviously invalid. return addr | 0x80000000; } |