Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixup for sys_lwcond_signal_x error checking #5623

Merged
merged 2 commits into from Feb 10, 2019
Merged

Fixup for sys_lwcond_signal_x error checking #5623

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972218d
Fixup for sys_lwcond_signal_x error checking
elad335 Feb 1, 2019
eea1b49
Merge branch 'master' into master
Nekotekina Feb 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
68 changes: 41 additions & 27 deletions rpcs3/Emu/Cell/lv2/sys_lwcond.cpp
View file
Open in desktop
@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#include "Emu/Memory/vm.h"
#include "Emu/System.h"
#include "Emu/IdManager.h"
Expand Down Expand Up @@ -73,15 +73,23 @@ error_code _sys_lwcond_signal(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id, u3
fmt::throw_exception("Unknown mode (%d)" HERE, mode);
}

lv2_lwmutex* mutex;

const auto cond = idm::check<lv2_obj, lv2_lwcond>(lwcond_id, [&](lv2_lwcond& cond) -> cpu_thread*
{
mutex = idm::check_unlocked<lv2_obj, lv2_lwmutex>(lwmutex_id);
if (ppu_thread_id != -1 && !idm::check_unlocked<named_thread<ppu_thread>>(ppu_thread_id))
{
return (cpu_thread*)(1);
}

if (!mutex)
lv2_lwmutex* mutex;

if (mode != 2)
{
return 0;
mutex = idm::check_unlocked<lv2_obj, lv2_lwmutex>(lwmutex_id);

if (!mutex)
{
return (cpu_thread*)(1);
}
}

if (cond.waiters)
Expand Down Expand Up @@ -121,8 +129,6 @@ error_code _sys_lwcond_signal(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id, u3
verify(HERE), !mutex->signaled;
std::lock_guard lock(mutex->mutex);
mutex->sq.emplace_back(result);
result = nullptr;
mode = 2; // Enforce CELL_OK
}

return result;
Expand All @@ -132,26 +138,31 @@ error_code _sys_lwcond_signal(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id, u3
return nullptr;
});

if (!mutex || !cond)
if (!cond || cond.ret == (cpu_thread*)(1))
{
return CELL_ESRCH;
}

if (cond.ret)
{
cond->awake(*cond.ret);
}
else if (mode == 2)
{
return CELL_OK;
}
else if (mode == 1 || ppu_thread_id == -1)
if (!cond.ret)
{
if (ppu_thread_id == -1)
{
if (mode == 3)
{
return not_an_error(CELL_ENOENT);
}
else if (mode == 2)
{
return CELL_OK;
}
}

return not_an_error(CELL_EPERM);
}
else

if (mode != 1)
{
return not_an_error(CELL_ENOENT);
cond->awake(*cond.ret);
}

return CELL_OK;
Expand All @@ -171,15 +182,18 @@ error_code _sys_lwcond_signal_all(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id

std::basic_string<cpu_thread*> threads;

lv2_lwmutex* mutex;

const auto cond = idm::check<lv2_obj, lv2_lwcond>(lwcond_id, [&](lv2_lwcond& cond) -> u32
const auto cond = idm::check<lv2_obj, lv2_lwcond>(lwcond_id, [&](lv2_lwcond& cond) -> s32
{
mutex = idm::check_unlocked<lv2_obj, lv2_lwmutex>(lwmutex_id);
lv2_lwmutex* mutex;

if (!mutex)
if (mode != 2)
{
return 0;
mutex = idm::check_unlocked<lv2_obj, lv2_lwmutex>(lwmutex_id);

if (!mutex)
{
return -1;
}
}

if (cond.waiters)
Expand Down Expand Up @@ -217,7 +231,7 @@ error_code _sys_lwcond_signal_all(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
return 0;
});

if (!mutex || !cond)
if (!cond || cond.ret == -1)
{
return CELL_ESRCH;
}
Expand Down