preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-17 16:30:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move out checking for bad PC from InterpretList

Browse Source
This commit is contained in:
Henrik Rydgård committed 2024-12-13 18:45:18 +01:00
1 parent 024cb73716
commit 58eaa3bad8
1 file changed
+12 -9
Download Patch File Download Diff File Expand all files Collapse all files
GPU/GPUCommon.cpp
+12 -9
View File
@@ -628,11 +628,6 @@ bool GPUCommon::InterpretList(DisplayList &list) {
gstate_c.offsetAddr = list.offsetAddr;
if (!Memory::IsValidAddress(list.pc)) {
ERROR_LOG_REPORT(Log::G3D, "DL PC = %08x WTF!!!!", list.pc);
return true;
}
cycleLastPC = list.pc;
cyclesExecuted += 60;
downcount = list.stall == 0 ? 0x0FFFFFFF : (list.stall - list.pc) / 4;
@@ -826,9 +821,17 @@ DLResult GPUCommon::ProcessDLQueue() {
TimeCollector collectStat(&gpuStats.msProcessingDisplayLists, coreCollectDebugStats);
for (int listIndex = GetNextListIndex(); listIndex != -1; listIndex = GetNextListIndex()) {
DisplayList &l = dls[listIndex];
DEBUG_LOG(Log::G3D, "%s DL execution at %08x - stall = %08x (startingTicks=%d)", l.pc == l.startpc ? "Starting" : "Resuming", l.pc, l.stall, startingTicks);
if (!InterpretList(l)) {
DisplayList &list = dls[listIndex];
if (!Memory::IsValidAddress(list.pc)) {
ERROR_LOG(Log::G3D, "DL PC = %08x WTF!!!!", list.pc);
return DLResult::Error;
}
DEBUG_LOG(Log::G3D, "%s DL execution at %08x - stall = %08x (startingTicks=%d)",
list.pc == list.startpc ? "Starting" : "Resuming", list.pc, list.stall, startingTicks);
if (!InterpretList(list)) {
switch (gpuState) {
case GPURunState::GPUSTATE_STALL:
return DLResult::Stall;
@@ -841,7 +844,7 @@ DLResult GPUCommon::ProcessDLQueue() {
// Some other list could've taken the spot while we dilly-dallied around, so we need the check.
// Yes, this does happen.
if (l.state != PSP_GE_DL_STATE_QUEUED) {
if (list.state != PSP_GE_DL_STATE_QUEUED) {
// At the end, we can remove it from the queue and continue.
dlQueue.erase(std::remove(dlQueue.begin(), dlQueue.end(), listIndex), dlQueue.end());
}