piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

AX HLE (GC): Some protection from bad data. Fixes an SMB2 crash on reset for me, might fix other random crashes, who knows.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4376 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-10-07 19:01:14 +00:00
parent da0830ca69
commit c0c52fffe9
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
View File

@ -249,24 +249,32 @@ if (m_DebuggerFrame->ScanMails)
} }
// ---------------- // ----------------
static void ReadOutPB(u32 pb_address, AXParamBlock &PB) static bool ReadOutPB(u32 pb_address, AXParamBlock &PB)
{ {
const u16 *pSrc = (const u16 *)g_dspInitialize.pGetMemoryPointer(pb_address); const u16 *pSrc = (const u16 *)g_dspInitialize.pGetMemoryPointer(pb_address);
if (!pSrc)
return false;
u16 *pDest = (u16 *)&PB; u16 *pDest = (u16 *)&PB;
// TODO: SSE. Although it won't help much.
for (int p = 0; p < (int)sizeof(AXParamBlock) / 2; p++) for (int p = 0; p < (int)sizeof(AXParamBlock) / 2; p++)
{ {
pDest[p] = Common::swap16(pSrc[p]); pDest[p] = Common::swap16(pSrc[p]);
} }
return true;
} }
static void WriteBackPB(u32 pb_address, AXParamBlock &PB) static bool WriteBackPB(u32 pb_address, AXParamBlock &PB)
{ {
const u16 *pSrc = (const u16*)&PB; const u16 *pSrc = (const u16*)&PB;
u16 *pDest = (u16 *)g_dspInitialize.pGetMemoryPointer(pb_address); u16 *pDest = (u16 *)g_dspInitialize.pGetMemoryPointer(pb_address);
if (!pDest)
return false;
// TODO: SSE. Although it won't help much.
for (size_t p = 0; p < sizeof(AXParamBlock) / 2; p++) for (size_t p = 0; p < sizeof(AXParamBlock) / 2; p++)
{ {
pDest[p] = Common::swap16(pSrc[p]); pDest[p] = Common::swap16(pSrc[p]);
} }
return true;
} }
static void ProcessUpdates(AXParamBlock &PB) static void ProcessUpdates(AXParamBlock &PB)
@ -330,13 +338,18 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
AXParamBlock PB; AXParamBlock PB;
u32 blockAddr = m_addressPBs; u32 blockAddr = m_addressPBs;
if (!blockAddr)
return;
// ------------ // ------------
for (int i = 0; i < NUMBER_OF_PBS; i++) for (int i = 0; i < NUMBER_OF_PBS; i++)
{ {
ReadOutPB(blockAddr, PB); if (!ReadOutPB(blockAddr, PB))
break;
ProcessUpdates(PB); ProcessUpdates(PB);
MixAddVoice(PB, templbuffer, temprbuffer, _iSize, false); MixAddVoice(PB, templbuffer, temprbuffer, _iSize, false);
WriteBackPB(blockAddr, PB); if (!WriteBackPB(blockAddr, PB))
break;
blockAddr = (PB.next_pb_hi << 16) | PB.next_pb_lo; blockAddr = (PB.next_pb_hi << 16) | PB.next_pb_lo;
if (!blockAddr) { if (!blockAddr) {