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

Confirmed the ARAM DMA alignment by testing the real hardware. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5704 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
skidau 2010-06-15 01:01:34 +00:00
parent bd163db74f
commit cab62472b8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/Src/HW/DSP.cpp
View File

@ -444,7 +444,8 @@ void Write16(const u16 _Value, const u32 _Address)
break; break;
case AR_DMA_MMADDR_L: case AR_DMA_MMADDR_L:
g_arDMA.MMAddr = (g_arDMA.MMAddr & 0xFFFF0000) | (_Value); // Align MMAddr to the 32 byte boundary. Verified on real HW
g_arDMA.MMAddr = ((g_arDMA.MMAddr & 0xFFFF0000) | (_Value)) & ~31;
break; break;
case AR_DMA_ARADDR_H: case AR_DMA_ARADDR_H:
@ -452,7 +453,8 @@ void Write16(const u16 _Value, const u32 _Address)
break; break;
case AR_DMA_ARADDR_L: case AR_DMA_ARADDR_L:
g_arDMA.ARAddr = (g_arDMA.ARAddr & 0xFFFF0000) | (_Value); // Align ARAddr to the 32 byte boundary. Verified on real HW
g_arDMA.ARAddr = ((g_arDMA.ARAddr & 0xFFFF0000) | (_Value)) & ~31;
break; break;
case AR_DMA_CNT_H: case AR_DMA_CNT_H:
@ -460,7 +462,8 @@ void Write16(const u16 _Value, const u32 _Address)
break; break;
case AR_DMA_CNT_L: case AR_DMA_CNT_L:
g_arDMA.Cnt.Hex = ((g_arDMA.Cnt.Hex & 0xFFFF0000) | (_Value) + 3) & ~3; // Align count to the 32 byte boundary. Verified on real HW
g_arDMA.Cnt.Hex = ((g_arDMA.Cnt.Hex & 0xFFFF0000) | (_Value)) & ~31;
Do_ARAM_DMA(); Do_ARAM_DMA();
break; break;
@ -615,9 +618,6 @@ void UpdateAudioDMA()
void Do_ARAM_DMA() void Do_ARAM_DMA()
{ {
// Align ARAddr to the 32 byte boundary. TODO: Verify alignment on the real hw
g_arDMA.ARAddr = g_arDMA.ARAddr & ~31;
// Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks // Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks
if (g_arDMA.Cnt.dir) if (g_arDMA.Cnt.dir)
{ {