From 065d3ce063ff491ae390f13baff7934fa69bff83 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Fri, 19 Apr 2019 19:15:05 +0100
Subject: [PATCH] memory: Reorder parameters of CopyBlock to a more sensible
 order

* Also implement CopyBlock variants in terms of each other
---
 src/core/hle/kernel/ipc.cpp |  6 +++--
 src/core/memory.cpp         | 53 +++----------------------------------
 src/core/memory.h           |  4 +--
 3 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/src/core/hle/kernel/ipc.cpp b/src/core/hle/kernel/ipc.cpp
index eeb889834..c9616e566 100644
--- a/src/core/hle/kernel/ipc.cpp
+++ b/src/core/hle/kernel/ipc.cpp
@@ -154,8 +154,10 @@ ResultCode TranslateCommandBuffer(Memory::MemorySystem& memory, std::shared_ptr<
 
                 if (permissions != IPC::MappedBufferPermissions::R) {
                     // Copy the modified buffer back into the target process
-                    memory.CopyBlock(*src_process, *dst_process, found->target_address,
-                                     found->source_address, size);
+                    // NOTE: As this is a reply the "source" is the destination and the
+                    //       "target" is the source.
+                    memory.CopyBlock(*dst_process, *src_process, found->source_address,
+                                     found->target_address, size);
                 }
 
                 VAddr prev_reserve = page_start - Memory::PAGE_SIZE;
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 1584c6222..77cb7198c 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -656,58 +656,11 @@ void MemorySystem::ZeroBlock(const Kernel::Process& process, const VAddr dest_ad
 
 void MemorySystem::CopyBlock(const Kernel::Process& process, VAddr dest_addr, VAddr src_addr,
                              const std::size_t size) {
-    auto& page_table = process.vm_manager.page_table;
-    std::size_t remaining_size = size;
-    std::size_t page_index = src_addr >> PAGE_BITS;
-    std::size_t page_offset = src_addr & PAGE_MASK;
-
-    while (remaining_size > 0) {
-        const std::size_t copy_amount = std::min(PAGE_SIZE - page_offset, remaining_size);
-        const VAddr current_vaddr = static_cast<VAddr>((page_index << PAGE_BITS) + page_offset);
-
-        switch (page_table.attributes[page_index]) {
-        case PageType::Unmapped: {
-            LOG_ERROR(HW_Memory,
-                      "unmapped CopyBlock @ 0x{:08X} (start address = 0x{:08X}, size = {})",
-                      current_vaddr, src_addr, size);
-            ZeroBlock(process, dest_addr, copy_amount);
-            break;
-        }
-        case PageType::Memory: {
-            DEBUG_ASSERT(page_table.pointers[page_index]);
-            const u8* src_ptr = page_table.pointers[page_index] + page_offset;
-            WriteBlock(process, dest_addr, src_ptr, copy_amount);
-            break;
-        }
-        case PageType::Special: {
-            MMIORegionPointer handler = GetMMIOHandler(page_table, current_vaddr);
-            DEBUG_ASSERT(handler);
-            std::vector<u8> buffer(copy_amount);
-            handler->ReadBlock(current_vaddr, buffer.data(), buffer.size());
-            WriteBlock(process, dest_addr, buffer.data(), buffer.size());
-            break;
-        }
-        case PageType::RasterizerCachedMemory: {
-            RasterizerFlushVirtualRegion(current_vaddr, static_cast<u32>(copy_amount),
-                                         FlushMode::Flush);
-            WriteBlock(process, dest_addr, GetPointerForRasterizerCache(current_vaddr),
-                       copy_amount);
-            break;
-        }
-        default:
-            UNREACHABLE();
-        }
-
-        page_index++;
-        page_offset = 0;
-        dest_addr += static_cast<VAddr>(copy_amount);
-        src_addr += static_cast<VAddr>(copy_amount);
-        remaining_size -= copy_amount;
-    }
+    CopyBlock(process, process, dest_addr, src_addr, size);
 }
 
-void MemorySystem::CopyBlock(const Kernel::Process& src_process,
-                             const Kernel::Process& dest_process, VAddr src_addr, VAddr dest_addr,
+void MemorySystem::CopyBlock(const Kernel::Process& dest_process,
+                             const Kernel::Process& src_process, VAddr dest_addr, VAddr src_addr,
                              std::size_t size) {
     auto& page_table = src_process.vm_manager.page_table;
     std::size_t remaining_size = size;
diff --git a/src/core/memory.h b/src/core/memory.h
index bda4f9c24..019a9f7e7 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -265,8 +265,8 @@ public:
     void ZeroBlock(const Kernel::Process& process, VAddr dest_addr, const std::size_t size);
     void CopyBlock(const Kernel::Process& process, VAddr dest_addr, VAddr src_addr,
                    std::size_t size);
-    void CopyBlock(const Kernel::Process& src_process, const Kernel::Process& dest_process,
-                   VAddr src_addr, VAddr dest_addr, std::size_t size);
+    void CopyBlock(const Kernel::Process& dest_process, const Kernel::Process& src_process,
+                   VAddr dest_addr, VAddr src_addr, std::size_t size);
 
     std::string ReadCString(VAddr vaddr, std::size_t max_length);