Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4747 from MerryMage/copyblock

Browse source 
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
commit 803e1fd5a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 54 deletions
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) {
// 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;