Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 12:47:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2482 from raven02/patch-14

Browse Source 
Remove hack for MIPSInt BREAK in Sol Trigger
This commit is contained in:
Henrik Rydgård 2013-06-26 04:47:05 -07:00
commit eb33d302f1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/HLE/sceP3da.cpp
View File

@ -42,7 +42,7 @@ static inline int getScaleValue(u32 channelsNum) {
u32 sceP3daBridgeCore(u32 p3daCoreAddr, u32 channelsNum, u32 samplesNum, u32 inputAddr, u32 outputAddr)
{
INFO_LOG(HLE, "sceP3daBridgeCore(%08x, %08x, %08x, %08x, %08x)", p3daCoreAddr, channelsNum, samplesNum, inputAddr, outputAddr);
DEBUG_LOG(HLE, "sceP3daBridgeCore(%08x, %08x, %08x, %08x, %08x)", p3daCoreAddr, channelsNum, samplesNum, inputAddr, outputAddr);
if (Memory::IsValidAddress(inputAddr) && Memory::IsValidAddress(outputAddr)) {
int scaleval = getScaleValue(channelsNum);
s16* outbuf = (s16*)Memory::GetPointer(outputAddr);

4
Core/MIPS/MIPSInt.cpp
View File

@ -27,7 +27,6 @@
#include "MIPSInt.h"
#include "MIPSTables.h"
#include "Core/Reporting.h"
#include "Core/Config.h"
#include "../HLE/HLE.h"
#include "../System.h"
@ -192,8 +191,7 @@ namespace MIPSInt
{
Reporting::ReportMessage("BREAK instruction hit");
ERROR_LOG(CPU, "BREAK!");
if (!g_Config.bIgnoreBadMemAccess)
Core_UpdateState(CORE_STEPPING);
Core_UpdateState(CORE_STEPPING);
PC += 4;
}