ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARAM: No ARAM backing DMA in wiimode

This commit is contained in:
booto 2019-01-29 23:27:07 -05:00
parent 70299f2505
commit 03d7fef5a6
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Core/Core/HW/DSP.cpp
View File

@ -579,20 +579,29 @@ static void Do_ARAM_DMA()
aram_transfer_direction[s_arDMA.Cnt.dir], s_arDMA.ARAddr, aram_transfer_direction[s_arDMA.Cnt.dir], s_arDMA.ARAddr,
aram_transfer_direction[1 - s_arDMA.Cnt.dir], s_arDMA.MMAddr, PC); aram_transfer_direction[1 - s_arDMA.Cnt.dir], s_arDMA.MMAddr, PC);
if (s_ARAM.wii_mode)
{
// Wii has no physical ARAM
if (s_arDMA.Cnt.dir == ARAM_DMA_DIR_FROM_ARAM)
{
std::fill_n(Memory::GetPointer(s_arDMA.MMAddr), ARAM_LINE_SIZE * lines_to_transfer, 0);
}
s_arDMA.MMAddr += ARAM_LINE_SIZE * lines_to_transfer;
s_arDMA.ARAddr += ARAM_LINE_SIZE * lines_to_transfer;
s_arDMA.Cnt.count -= ARAM_LINE_SIZE * lines_to_transfer;
return;
}
const ARAM_ADDRESS_CONVERSION_F convert_address = conversion_functions[s_ARAM_Info.base_size]; const ARAM_ADDRESS_CONVERSION_F convert_address = conversion_functions[s_ARAM_Info.base_size];
for (u32 n = 0; n < lines_to_transfer; ++n) for (u32 n = 0; n < lines_to_transfer; ++n)
{ {
std::optional<u32> physical_aram_addr = convert_address(s_arDMA.ARAddr); std::optional<u32> physical_aram_addr = convert_address(s_arDMA.ARAddr);
if (physical_aram_addr) if (physical_aram_addr)
{ {
const u8* source = &s_ARAM.ptr[*physical_aram_addr]; u8* copy_pointers[2] = {Memory::GetPointer(s_arDMA.MMAddr), &s_ARAM.ptr[*physical_aram_addr]};
u8* dest = Memory::GetPointer(s_arDMA.MMAddr); std::copy_n(copy_pointers[s_arDMA.Cnt.dir], ARAM_LINE_SIZE,
if (s_arDMA.Cnt.dir == ARAM_DMA_DIR_TO_ARAM) copy_pointers[1 - s_arDMA.Cnt.dir]);
{
source = dest;
dest = &s_ARAM.ptr[*physical_aram_addr];
}
std::copy_n(source, ARAM_LINE_SIZE, dest);
} }
else else
{ {
@ -607,7 +616,7 @@ static void Do_ARAM_DMA()
s_arDMA.ARAddr += ARAM_LINE_SIZE; s_arDMA.ARAddr += ARAM_LINE_SIZE;
} }
s_arDMA.Cnt.count -= ARAM_LINE_SIZE * lines_to_transfer; s_arDMA.Cnt.count -= ARAM_LINE_SIZE * lines_to_transfer;
} } // namespace DSP
u8 ReadARAM(u32 address) u8 ReadARAM(u32 address)
{ {