The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 15:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11505 from Pokechu22/revert-dsp-code-alignment

Browse Source 
Revert "DSPLLE: Add assertion for bad DMA alignment"
This commit is contained in:
Pierre Bourdon 2023-01-29 03:08:30 +01:00 committed by GitHub
commit 19d16b136a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/HW/DSPLLE/DSPHost.cpp
View File

@ -5,7 +5,6 @@
#include <string> #include <string>
#include "Common/Assert.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Hash.h" #include "Common/Hash.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
@ -41,11 +40,6 @@ void WriteHostMemory(u8 value, u32 addr)
void DMAToDSP(u16* dst, u32 addr, u32 size) void DMAToDSP(u16* dst, u32 addr, u32 size)
{ {
// Hardware testing indicates that a misaligned DMA address does not work properly (it's unclear
// exactly what goes wrong currently). A size that's not a multiple of 32 is allowed, though
// (and occurs with modern libogc homebrew uCode, including the oggpalyer (asnd uCode) and
// modplay (aesnd uCode) examples). It's untested whether extra bytes are copied in that case.
ASSERT_MSG(DSPLLE, (addr & 0x1f) == 0, "DSP DMA addr must be 32-byte aligned (was {:08x})", addr);
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
auto& memory = system.GetMemory(); auto& memory = system.GetMemory();
memory.CopyFromEmuSwapped(dst, addr, size); memory.CopyFromEmuSwapped(dst, addr, size);
@ -53,8 +47,6 @@ void DMAToDSP(u16* dst, u32 addr, u32 size)
void DMAFromDSP(const u16* src, u32 addr, u32 size) void DMAFromDSP(const u16* src, u32 addr, u32 size)
{ {
// See comment in DMAToDSP
ASSERT_MSG(DSPLLE, (addr & 0x1f) == 0, "DSP DMA addr must be 32-byte aligned (was {:08x})", addr);
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
auto& memory = system.GetMemory(); auto& memory = system.GetMemory();
memory.CopyToEmuSwapped(addr, src, size); memory.CopyToEmuSwapped(addr, src, size);