citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #4747 from MerryMage/copyblock 

memory: Re-order CopyBlock arguments to match other overload
This commit is contained in:
Weiyi Wang 2019-05-07 09:34:02 -04:00 committed by GitHub
parent 2c5816978e 065d3ce063
commit 803e1fd5a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/kernel/ipc.cpp
View File

@ -154,8 +154,10 @@ ResultCode TranslateCommandBuffer(Memory::MemorySystem& memory, std::shared_ptr<
if (permissions != IPC::MappedBufferPermissions::R) { if (permissions != IPC::MappedBufferPermissions::R) {
// Copy the modified buffer back into the target process // Copy the modified buffer back into the target process
memory.CopyBlock(*src_process, *dst_process, found->target_address, // NOTE: As this is a reply the "source" is the destination and the
found->source_address, size); // "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; VAddr prev_reserve = page_start - Memory::PAGE_SIZE;

53
src/core/memory.cpp
View File

@ -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, void MemorySystem::CopyBlock(const Kernel::Process& process, VAddr dest_addr, VAddr src_addr,
const std::size_t size) { const std::size_t size) {
auto& page_table = process.vm_manager.page_table; CopyBlock(process, process, dest_addr, src_addr, size);
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++; void MemorySystem::CopyBlock(const Kernel::Process& dest_process,
page_offset = 0; const Kernel::Process& src_process, VAddr dest_addr, VAddr src_addr,
dest_addr += static_cast<VAddr>(copy_amount);
src_addr += static_cast<VAddr>(copy_amount);
remaining_size -= copy_amount;
}
}
void MemorySystem::CopyBlock(const Kernel::Process& src_process,
const Kernel::Process& dest_process, VAddr src_addr, VAddr dest_addr,
std::size_t size) { std::size_t size) {
auto& page_table = src_process.vm_manager.page_table; auto& page_table = src_process.vm_manager.page_table;
std::size_t remaining_size = size; std::size_t remaining_size = size;

4
src/core/memory.h
View File

@ -265,8 +265,8 @@ public:
void ZeroBlock(const Kernel::Process& process, VAddr dest_addr, const std::size_t size); 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, void CopyBlock(const Kernel::Process& process, VAddr dest_addr, VAddr src_addr,
std::size_t size); std::size_t size);
void CopyBlock(const Kernel::Process& src_process, const Kernel::Process& dest_process, void CopyBlock(const Kernel::Process& dest_process, const Kernel::Process& src_process,
VAddr src_addr, VAddr dest_addr, std::size_t size); VAddr dest_addr, VAddr src_addr, std::size_t size);
std::string ReadCString(VAddr vaddr, std::size_t max_length); std::string ReadCString(VAddr vaddr, std::size_t max_length);