From 3873b36db333547152280b741e85aa54c69d8199 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Sat, 16 Apr 2016 09:14:18 +0100
Subject: Memory: ReadBlock/WriteBlock

---
 src/core/memory.cpp | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/core/memory.h   |  4 ++-
 src/core/mmio.h     |  4 +++
 3 files changed, 81 insertions(+), 4 deletions(-)

(limited to 'src/core')

diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 68a29b154..c7b99a467 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -364,6 +364,45 @@ u64 Read64(const VAddr addr) {
     return Read<u64_le>(addr);
 }
 
+void ReadBlock(const VAddr src_addr, u8* dest_buffer, const size_t size) {
+    size_t remaining_size = size;
+    size_t page_index = src_addr >> PAGE_BITS;
+    size_t page_offset = src_addr & PAGE_MASK;
+
+    while (remaining_size > 0) {
+        const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size);
+        const VAddr current_vaddr = (page_index << PAGE_BITS) + page_offset;
+
+        switch (current_page_table->attributes[page_index]) {
+        case PageType::Unmapped: {
+            LOG_ERROR(HW_Memory, "unmapped ReadBlock @ 0x%08X (start address = 0x%08X, size = %zu)", current_vaddr, src_addr, size);
+            std::memset(dest_buffer, 0, copy_amount);
+            break;
+        }
+        case PageType::Memory: {
+            DEBUG_ASSERT(current_page_table->pointers[page_index]);
+
+            const u8* src_ptr = current_page_table->pointers[page_index] + page_offset;
+            std::memcpy(dest_buffer, src_ptr, copy_amount);
+            break;
+        }
+        case PageType::Special: {
+            DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
+
+            GetMMIOHandler(current_vaddr)->ReadBlock(current_vaddr, dest_buffer, copy_amount);
+            break;
+        }
+        default:
+            UNREACHABLE();
+        }
+
+        page_index++;
+        page_offset = 0;
+        dest_buffer += copy_amount;
+        remaining_size -= copy_amount;
+    }
+}
+
 void Write8(const VAddr addr, const u8 data) {
     Write<u8>(addr, data);
 }
@@ -380,9 +419,41 @@ void Write64(const VAddr addr, const u64 data) {
     Write<u64_le>(addr, data);
 }
 
-void WriteBlock(const VAddr addr, const u8* data, const size_t size) {
-    for (u32 offset = 0; offset < size; offset++) {
-        Write8(addr + offset, data[offset]);
+void WriteBlock(const VAddr dest_addr, const u8* src_buffer, const size_t size) {
+    size_t remaining_size = size;
+    size_t page_index = dest_addr >> PAGE_BITS;
+    size_t page_offset = dest_addr & PAGE_MASK;
+
+    while (remaining_size > 0) {
+        const size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size);
+        const VAddr current_vaddr = (page_index << PAGE_BITS) + page_offset;
+
+        switch (current_page_table->attributes[page_index]) {
+        case PageType::Unmapped: {
+            LOG_ERROR(HW_Memory, "unmapped WriteBlock @ 0x%08X (start address = 0x%08X, size = %zu)", current_vaddr, dest_addr, size);
+            break;
+        }
+        case PageType::Memory: {
+            DEBUG_ASSERT(current_page_table->pointers[page_index]);
+
+            u8* dest_ptr = current_page_table->pointers[page_index] + page_offset;
+            std::memcpy(dest_ptr, src_buffer, copy_amount);
+            break;
+        }
+        case PageType::Special: {
+            DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
+
+            GetMMIOHandler(current_vaddr)->WriteBlock(current_vaddr, src_buffer, copy_amount);
+            break;
+        }
+        default:
+            UNREACHABLE();
+        }
+
+        page_index++;
+        page_offset = 0;
+        src_buffer += copy_amount;
+        remaining_size -= copy_amount;
     }
 }
 
diff --git a/src/core/memory.h b/src/core/memory.h
index 9ada78fc8..35bd5eb0c 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -118,12 +118,14 @@ u16 Read16(VAddr addr);
 u32 Read32(VAddr addr);
 u64 Read64(VAddr addr);
 
+void ReadBlock(const VAddr src_addr, u8* dest_buffer, size_t size);
+
 void Write8(VAddr addr, u8 data);
 void Write16(VAddr addr, u16 data);
 void Write32(VAddr addr, u32 data);
 void Write64(VAddr addr, u64 data);
 
-void WriteBlock(VAddr addr, const u8* data, size_t size);
+void WriteBlock(const VAddr dest_addr, const u8* src_buffer, size_t size);
 
 u8* GetPointer(VAddr virtual_address);
 
diff --git a/src/core/mmio.h b/src/core/mmio.h
index cb644f51b..35b73b061 100644
--- a/src/core/mmio.h
+++ b/src/core/mmio.h
@@ -25,10 +25,14 @@ public:
     virtual u32 Read32(VAddr addr) = 0;
     virtual u64 Read64(VAddr addr) = 0;
 
+    virtual bool ReadBlock(VAddr src_addr, u8* dest_buffer, size_t size) = 0;
+
     virtual void Write8(VAddr addr, u8 data) = 0;
     virtual void Write16(VAddr addr, u16 data) = 0;
     virtual void Write32(VAddr addr, u32 data) = 0;
     virtual void Write64(VAddr addr, u64 data) = 0;
+
+    virtual bool WriteBlock(VAddr dest_addr, const u8* src_buffer, size_t size) = 0;
 };
 
 using MMIORegionPointer = std::shared_ptr<MMIORegion>;
-- 
cgit v1.2.3