summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar MerryMage2016-04-16 15:22:45 +0100
committerGravatar Subv2016-05-28 13:44:49 -0500
commit31d49e01094068519850bbfa414f314fdb27beee (patch)
tree088a73db78fdcd567c3e4850c4add8c4d6a6522e /src
parentDSP_DSP: Remove use of Memory::GetPointer (diff)
downloadyuzu-31d49e01094068519850bbfa414f314fdb27beee.tar.gz
yuzu-31d49e01094068519850bbfa414f314fdb27beee.tar.xz
yuzu-31d49e01094068519850bbfa414f314fdb27beee.zip
Memory: CopyBlock
Diffstat (limited to 'src')
-rw-r--r--src/core/memory.cpp41
-rw-r--r--src/core/memory.h4
2 files changed, 43 insertions, 2 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 1604a7da5..bf2493270 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -495,6 +495,47 @@ void ZeroBlock(const VAddr dest_addr, const size_t size) {
495 } 495 }
496} 496}
497 497
498void CopyBlock(VAddr dest_addr, VAddr src_addr, const size_t size) {
499 size_t remaining_size = size;
500 size_t page_index = src_addr >> PAGE_BITS;
501 size_t page_offset = src_addr & PAGE_MASK;
502
503 while (remaining_size > 0) {
504 const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size);
505 const VAddr current_vaddr = (page_index << PAGE_BITS) + page_offset;
506
507 switch (current_page_table->attributes[page_index]) {
508 case PageType::Unmapped: {
509 LOG_ERROR(HW_Memory, "unmapped CopyBlock @ 0x%08X (start address = 0x%08X, size = %zu)", current_vaddr, src_addr, size);
510 ZeroBlock(dest_addr, copy_amount);
511 break;
512 }
513 case PageType::Memory: {
514 DEBUG_ASSERT(current_page_table->pointers[page_index]);
515 const u8* src_ptr = current_page_table->pointers[page_index] + page_offset;
516 WriteBlock(dest_addr, src_ptr, copy_amount);
517 break;
518 }
519 case PageType::Special: {
520 DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
521
522 std::vector<u8> buffer(copy_amount);
523 GetMMIOHandler(current_vaddr)->ReadBlock(current_vaddr, buffer.data(), buffer.size());
524 WriteBlock(dest_addr, buffer.data(), buffer.size());
525 break;
526 }
527 default:
528 UNREACHABLE();
529 }
530
531 page_index++;
532 page_offset = 0;
533 dest_addr += copy_amount;
534 src_addr += copy_amount;
535 remaining_size -= copy_amount;
536 }
537}
538
498template<> 539template<>
499u8 ReadMMIO<u8>(MMIORegionPointer mmio_handler, VAddr addr) { 540u8 ReadMMIO<u8>(MMIORegionPointer mmio_handler, VAddr addr) {
500 return mmio_handler->Read8(addr); 541 return mmio_handler->Read8(addr);
diff --git a/src/core/memory.h b/src/core/memory.h
index 713cdfb2f..bb5dd0d15 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -118,15 +118,15 @@ u16 Read16(VAddr addr);
118u32 Read32(VAddr addr); 118u32 Read32(VAddr addr);
119u64 Read64(VAddr addr); 119u64 Read64(VAddr addr);
120 120
121void ReadBlock(const VAddr src_addr, u8* dest_buffer, size_t size);
122
123void Write8(VAddr addr, u8 data); 121void Write8(VAddr addr, u8 data);
124void Write16(VAddr addr, u16 data); 122void Write16(VAddr addr, u16 data);
125void Write32(VAddr addr, u32 data); 123void Write32(VAddr addr, u32 data);
126void Write64(VAddr addr, u64 data); 124void Write64(VAddr addr, u64 data);
127 125
126void ReadBlock(const VAddr src_addr, u8* dest_buffer, size_t size);
128void WriteBlock(const VAddr dest_addr, const u8* src_buffer, size_t size); 127void WriteBlock(const VAddr dest_addr, const u8* src_buffer, size_t size);
129void ZeroBlock(const VAddr dest_addr, const size_t size); 128void ZeroBlock(const VAddr dest_addr, const size_t size);
129void CopyBlock(VAddr dest_addr, VAddr src_addr, size_t size);
130 130
131u8* GetPointer(VAddr virtual_address); 131u8* GetPointer(VAddr virtual_address);
132 132