summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/memory.cpp16
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) {
184 PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; 184 PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
185 switch (type) { 185 switch (type) {
186 case PageType::Unmapped: 186 case PageType::Unmapped:
187 LOG_ERROR(HW_Memory, "unmapped Read%lu @ 0x%08X", sizeof(T) * 8, vaddr); 187 LOG_ERROR(HW_Memory, "unmapped Read%lu @ 0x%llx", sizeof(T) * 8, vaddr);
188 return 0; 188 return 0;
189 case PageType::Memory: 189 case PageType::Memory:
190 ASSERT_MSG(false, "Mapped memory page without a pointer @ %08X", vaddr); 190 ASSERT_MSG(false, "Mapped memory page without a pointer @ %08X", vaddr);
@@ -222,7 +222,7 @@ void Write(const VAddr vaddr, const T data) {
222 PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; 222 PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
223 switch (type) { 223 switch (type) {
224 case PageType::Unmapped: 224 case PageType::Unmapped:
225 LOG_ERROR(HW_Memory, "unmapped Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u64)data, 225 LOG_ERROR(HW_Memory, "unmapped Write%lu 0x%llx @ 0x%llx", sizeof(data) * 8, (u64)data,
226 vaddr); 226 vaddr);
227 return; 227 return;
228 case PageType::Memory: 228 case PageType::Memory:
@@ -280,7 +280,7 @@ u8* GetPointer(const VAddr vaddr) {
280 return GetPointerFromVMA(vaddr); 280 return GetPointerFromVMA(vaddr);
281 } 281 }
282 282
283 LOG_ERROR(HW_Memory, "unknown GetPointer @ 0x%08x", vaddr); 283 LOG_ERROR(HW_Memory, "unknown GetPointer @ 0x%llx", vaddr);
284 return nullptr; 284 return nullptr;
285} 285}
286 286
@@ -444,7 +444,7 @@ void ReadBlock(const VAddr src_addr, void* dest_buffer, const size_t size) {
444 444
445 switch (current_page_table->attributes[page_index]) { 445 switch (current_page_table->attributes[page_index]) {
446 case PageType::Unmapped: { 446 case PageType::Unmapped: {
447 LOG_ERROR(HW_Memory, "unmapped ReadBlock @ 0x%08X (start address = 0x%08X, size = %zu)", 447 LOG_ERROR(HW_Memory, "unmapped ReadBlock @ 0x%llx (start address = 0x%llx, size = %zu)",
448 current_vaddr, src_addr, size); 448 current_vaddr, src_addr, size);
449 std::memset(dest_buffer, 0, copy_amount); 449 std::memset(dest_buffer, 0, copy_amount);
450 break; 450 break;
@@ -512,7 +512,7 @@ void WriteBlock(const VAddr dest_addr, const void* src_buffer, const size_t size
512 switch (current_page_table->attributes[page_index]) { 512 switch (current_page_table->attributes[page_index]) {
513 case PageType::Unmapped: { 513 case PageType::Unmapped: {
514 LOG_ERROR(HW_Memory, 514 LOG_ERROR(HW_Memory,
515 "unmapped WriteBlock @ 0x%08X (start address = 0x%08X, size = %zu)", 515 "unmapped WriteBlock @ 0x%llx (start address = 0x%llx, size = %zu)",
516 current_vaddr, dest_addr, size); 516 current_vaddr, dest_addr, size);
517 break; 517 break;
518 } 518 }
@@ -564,7 +564,7 @@ void ZeroBlock(const VAddr dest_addr, const size_t size) {
564 564
565 switch (current_page_table->attributes[page_index]) { 565 switch (current_page_table->attributes[page_index]) {
566 case PageType::Unmapped: { 566 case PageType::Unmapped: {
567 LOG_ERROR(HW_Memory, "unmapped ZeroBlock @ 0x%08X (start address = 0x%08X, size = %zu)", 567 LOG_ERROR(HW_Memory, "unmapped ZeroBlock @ 0x%llx (start address = 0x%llx, size = %zu)",
568 current_vaddr, dest_addr, size); 568 current_vaddr, dest_addr, size);
569 break; 569 break;
570 } 570 }
@@ -613,7 +613,7 @@ void CopyBlock(VAddr dest_addr, VAddr src_addr, const size_t size) {
613 613
614 switch (current_page_table->attributes[page_index]) { 614 switch (current_page_table->attributes[page_index]) {
615 case PageType::Unmapped: { 615 case PageType::Unmapped: {
616 LOG_ERROR(HW_Memory, "unmapped CopyBlock @ 0x%08X (start address = 0x%08X, size = %zu)", 616 LOG_ERROR(HW_Memory, "unmapped CopyBlock @ 0x%llx (start address = 0x%llx, size = %zu)",
617 current_vaddr, src_addr, size); 617 current_vaddr, src_addr, size);
618 ZeroBlock(dest_addr, copy_amount); 618 ZeroBlock(dest_addr, copy_amount);
619 break; 619 break;
@@ -721,7 +721,7 @@ boost::optional<PAddr> TryVirtualToPhysicalAddress(const VAddr addr) {
721PAddr VirtualToPhysicalAddress(const VAddr addr) { 721PAddr VirtualToPhysicalAddress(const VAddr addr) {
722 auto paddr = TryVirtualToPhysicalAddress(addr); 722 auto paddr = TryVirtualToPhysicalAddress(addr);
723 if (!paddr) { 723 if (!paddr) {
724 LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%08X", addr); 724 LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%llx", addr);
725 // To help with debugging, set bit on address so that it's obviously invalid. 725 // To help with debugging, set bit on address so that it's obviously invalid.
726 return addr | 0x80000000; 726 return addr | 0x80000000;
727 } 727 }