archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 17:01:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPU: fix MFC_PUTQLLUC_CMD fence trait

Browse source
This commit is contained in:
Nekotekina 2018-04-28 20:11:16 +03:00
parent f4af3f2987
commit 4d60d85db5
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -743,7 +743,7 @@ bool SPUThread::do_dma_check(const spu_mfc_cmd& args)
if (UNLIKELY(mfc_barrier & mask || (args.cmd & MFC_FENCE_MASK && mfc_fence & mask))) if (UNLIKELY(mfc_barrier & mask || (args.cmd & MFC_FENCE_MASK && mfc_fence & mask)))
{ {
// Check for special value combination (normally impossible) // Check for special value combination (normally impossible)
if (UNLIKELY(mfc_barrier == -1 && mfc_fence == -1)) if (false)
{ {
// Update barrier/fence masks if necessary // Update barrier/fence masks if necessary
mfc_barrier = 0; mfc_barrier = 0;
@ -998,6 +998,11 @@ void SPUThread::do_mfc(bool wait)
} }
else if (args.cmd == MFC_PUTQLLUC_CMD) else if (args.cmd == MFC_PUTQLLUC_CMD)
{ {
if (fence & mask)
{
return false;
}
do_putlluc(args); do_putlluc(args);
} }
@ -1263,11 +1268,13 @@ bool SPUThread::process_mfc_cmd(spu_mfc_cmd args)
} }
case MFC_PUTQLLUC_CMD: case MFC_PUTQLLUC_CMD:
{ {
if (UNLIKELY(!do_dma_check(args))) const u32 mask = 1u << args.tag;
if (UNLIKELY((mfc_barrier | mfc_fence) & mask))
{ {
args.size = 0; args.size = 0;
mfc_queue[mfc_size++] = args; mfc_queue[mfc_size++] = args;
mfc_fence |= 1u << args.tag; mfc_fence |= mask;
} }
else else
{ {