dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-16 04:09:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rsx: fix cmd jump over put register

Browse Source
This commit is contained in:
eladash 2018-08-20 15:13:35 +03:00 committed by kd-11
parent 18ec05c070
commit 56d553f10d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpcs3/Emu/RSX/RSXThread.cpp
View File

@ -648,8 +648,6 @@ namespace rsx
continue;
}
const u32 count = (cmd >> 18) & 0x7ff;
if ((cmd & RSX_METHOD_OLD_JUMP_CMD_MASK) == RSX_METHOD_OLD_JUMP_CMD)
{
u32 offs = cmd & 0x1ffffffc;
@ -734,6 +732,8 @@ namespace rsx
continue;
}
u32 count = (cmd >> 18) & 0x7ff;
//Validate the args ptr if the command attempts to read from it
const u32 args_address = RSXIOMem.RealAddr(internal_get + 4);
@ -762,10 +762,11 @@ namespace rsx
auto args = vm::ptr<u32>::make(args_address);
u32 first_cmd = (cmd & 0xfffc) >> 2;
// Not sure if this is worth trying to fix, but if it happens, its bad
// so logging it until its reported
if (internal_get < put && ((internal_get + (count + 1) * 4) > put))
LOG_ERROR(RSX, "Get pointer jumping over put pointer! This is bad!");
// Stop command execution if put will be equal to get ptr during the execution itself
if (count * 4 + 4 > put - internal_get)
{
count = (put - internal_get) / 4 - 1;
}
if (performance_counters.state != FIFO_state::running)
{