mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 03:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

asserts replaced (2)

Browse source
This commit is contained in:
Nekotekina 2014-12-06 15:48:08 +03:00
parent 270bfad96f
commit 796c1b46c2
3 changed files with 99 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
View file

@ -37,7 +37,10 @@ s64 spursCreateLv2EventQueue(vm::ptr<CellSpurs> spurs, u32& queue_id, vm::ptr<u8
return CELL_EAGAIN; // rough
}
assert(spursAttachLv2EventQueue(spurs, queue_id, port, 1, true) == CELL_OK);
if (s32 res = spursAttachLv2EventQueue(spurs, queue_id, port, 1, true))
{
assert(!"spursAttachLv2EventQueue() failed");
}
return CELL_OK;
}
@ -138,7 +141,10 @@ s64 spursInit(
spurs->m.nSpus = nSpus;
spurs->m.spuPriority = spuPriority;
#ifdef PRX_DEBUG
assert(spu_image_import(spurs->m.spuImg, vm::read32(libsre_rtoc - (isSecond ? 0x7E94 : 0x7E98)), 1) == CELL_OK);
if (s32 res = spu_image_import(spurs->m.spuImg, vm::read32(libsre_rtoc - (isSecond ? 0x7E94 : 0x7E98)), 1))
{
assert(!"spu_image_import() failed");
}
#else
spurs->m.spuImg.addr = Memory.Alloc(0x40000, 4096);
#endif
@ -492,8 +498,14 @@ s64 spursInit(
}
}
assert(lwmutex_create(spurs->m.mutex, SYS_SYNC_PRIORITY, SYS_SYNC_NOT_RECURSIVE, *(u64*)"_spuPrv") == CELL_OK);
assert(lwcond_create(spurs->m.cond, spurs->m.mutex, *(u64*)"_spuPrv") == CELL_OK);
if (s32 res = lwmutex_create(spurs->m.mutex, SYS_SYNC_PRIORITY, SYS_SYNC_NOT_RECURSIVE, *(u64*)"_spuPrv"))
{
assert(!"lwmutex_create() failed");
}
if (s32 res = lwcond_create(spurs->m.cond, spurs->m.mutex, *(u64*)"_spuPrv"))
{
assert(!"lwcond_create() failed");
}
spurs->m.flags1 = (flags & SAF_EXIT_IF_NO_WORK ? SF1_EXIT_IF_NO_WORK : 0) | (isSecond ? SF1_IS_SECOND : 0);
spurs->m.flagRecv.write_relaxed(0xff);
@ -504,14 +516,20 @@ s64 spursInit(
spurs->m.ppuPriority = ppuPriority;
u32 queue;
assert(spursCreateLv2EventQueue(spurs, queue, vm::ptr<u8>::make(spurs.addr() + 0xc9), 0x2a, *(u64*)"_spuPrv") == CELL_OK);
if (s32 res = spursCreateLv2EventQueue(spurs, queue, vm::ptr<u8>::make(spurs.addr() + 0xc9), 0x2a, *(u64*)"_spuPrv"))
{
assert(!"spursCreateLv2EventQueue() failed");
}
spurs->m.queue = queue;
u32 port = event_port_create(0);
assert(port && ~port);
spurs->m.port = port;
assert(sys_event_port_connect_local(port, queue) == CELL_OK);
if (s32 res = sys_event_port_connect_local(port, queue))
{
assert(!"sys_event_port_connect_local() failed");
}
name = std::string(prefix, prefixSize);
@ -536,10 +554,16 @@ s64 spursInit(
if (spurs->m.flags1 & SF1_EXIT_IF_NO_WORK)
{
assert(sys_lwmutex_lock(spurs->get_lwmutex(), 0) == CELL_OK);
if (s32 res = sys_lwmutex_lock(spurs->get_lwmutex(), 0))
{
assert(!"sys_lwmutex_lock() failed");
}
if (spurs->m.xD66.read_relaxed())
{
assert(sys_lwmutex_unlock(spurs->get_lwmutex()) == CELL_OK);
if (s32 res = sys_lwmutex_unlock(spurs->get_lwmutex()))
{
assert(!"sys_lwmutex_unlock() failed");
}
return;
}
else while (true)
@ -590,28 +614,40 @@ s64 spursInit(
spurs->m.xD65.exchange(1);
if (spurs->m.xD64.read_relaxed() == 0)
{
assert(sys_lwcond_wait(spurs->get_lwcond(), 0) == CELL_OK);
if (s32 res = sys_lwcond_wait(spurs->get_lwcond(), 0))
{
assert(!"sys_lwcond_wait() failed");
}
}
spurs->m.xD65.exchange(0);
if (spurs->m.xD66.read_relaxed())
{
assert(sys_lwmutex_unlock(spurs->get_lwmutex()) == CELL_OK);
if (s32 res = sys_lwmutex_unlock(spurs->get_lwmutex()))
{
assert(!"sys_lwmutex_unlock() failed");
}
return;
}
}
assert(sys_lwmutex_unlock(spurs->get_lwmutex()) == CELL_OK);
if (s32 res = sys_lwmutex_unlock(spurs->get_lwmutex()))
{
assert(!"sys_lwmutex_unlock() failed");
}
}
if (Emu.IsStopped()) continue;
assert(sys_spu_thread_group_start(spurs->m.spuTG) == CELL_OK);
if (s32 res = sys_spu_thread_group_start(spurs->m.spuTG))
{
assert(!"sys_spu_thread_group_start() failed");
}
if (s32 res = sys_spu_thread_group_join(spurs->m.spuTG, vm::ptr<u32>::make(0), vm::ptr<u32>::make(0)))
{
if (res == CELL_ESTAT)
{
return;
}
assert(res == CELL_OK);
assert(!"sys_spu_thread_group_join() failed");
}
if (Emu.IsStopped()) continue;
@ -635,7 +671,10 @@ s64 spursInit(
// enable exception event handler
if (spurs->m.enableEH.compare_and_swap_test(be_t<u32>::make(0), be_t<u32>::make(1)))
{
assert(sys_spu_thread_group_connect_event(spurs->m.spuTG, spurs->m.queue, SYS_SPU_THREAD_GROUP_EVENT_EXCEPTION) == CELL_OK);
if (s32 res = sys_spu_thread_group_connect_event(spurs->m.spuTG, spurs->m.queue, SYS_SPU_THREAD_GROUP_EVENT_EXCEPTION))
{
assert(!"sys_spu_thread_group_connect_event() failed");
}
}
spurs->m.unk22 = 0;
@ -997,7 +1036,10 @@ s64 spursAttachLv2EventQueue(vm::ptr<CellSpurs> spurs, u32 queue, vm::ptr<u8> po
}
s32 sdk_ver;
assert(process_get_sdk_version(process_getpid(), sdk_ver) == CELL_OK);
if (s32 res = process_get_sdk_version(process_getpid(), sdk_ver))
{
assert(!"process_get_sdk_version() failed");
}
if (sdk_ver == -1) sdk_ver = 0x460000;
u8 _port = 0x3f;
@ -1236,9 +1278,18 @@ s64 spursWakeUp(vm::ptr<CellSpurs> spurs)
spurs->m.xD64.exchange(1);
if (spurs->m.xD65.read_sync())
{
assert(sys_lwmutex_lock(spurs->get_lwmutex(), 0) == 0);
assert(sys_lwcond_signal(spurs->get_lwcond()) == 0);
assert(sys_lwmutex_unlock(spurs->get_lwmutex()) == 0);
if (s32 res = sys_lwmutex_lock(spurs->get_lwmutex(), 0))
{
assert(!"sys_lwmutex_lock() failed");
}
if (s32 res = sys_lwcond_signal(spurs->get_lwcond()))
{
assert(!"sys_lwcond_signal() failed");
}
if (s32 res = sys_lwmutex_unlock(spurs->get_lwmutex()))
{
assert(!"sys_lwmutex_unlock() failed");
}
}
return CELL_OK;
}

22
rpcs3/Emu/SysCalls/Modules/cellSync.cpp
View file

@ -1086,7 +1086,10 @@ s32 syncLFQueueGetPushPointer(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32
}
}
assert(sys_event_queue_receive(queue->m_eq_id, vm::ptr<sys_event_data>::make(0), 0) == CELL_OK);
if (s32 res = sys_event_queue_receive(queue->m_eq_id, vm::ptr<sys_event_data>::make(0), 0))
{
assert(!"sys_event_queue_receive() failed");
}
var1 = 1;
}
}
@ -1106,7 +1109,7 @@ s32 syncLFQueueGetPushPointer2(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32
{
// TODO
//pointer = 0;
assert(0);
assert(!"syncLFQueueGetPushPointer2()");
return CELL_OK;
}
@ -1268,7 +1271,7 @@ s32 syncLFQueueCompletePushPointer2(vm::ptr<CellSyncLFQueue> queue, s32 pointer,
{
// TODO
//if (fpSendSignal) return fpSendSignal(0, 0);
assert(0);
assert(!"syncLFQueueCompletePushPointer2()");
return CELL_OK;
}
@ -1465,7 +1468,10 @@ s32 syncLFQueueGetPopPointer(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32 i
}
}
assert(sys_event_queue_receive(queue->m_eq_id, vm::ptr<sys_event_data>::make(0), 0) == CELL_OK);
if (s32 res = sys_event_queue_receive(queue->m_eq_id, vm::ptr<sys_event_data>::make(0), 0))
{
assert(!"sys_event_queue_receive() failed");
}
var1 = 1;
}
}
@ -1485,7 +1491,7 @@ s32 syncLFQueueGetPopPointer2(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32
{
// TODO
//pointer = 0;
assert(0);
assert(!"syncLFQueueGetPopPointer2()");
return CELL_OK;
}
@ -1647,7 +1653,7 @@ s32 syncLFQueueCompletePopPointer2(vm::ptr<CellSyncLFQueue> queue, s32 pointer,
{
// TODO
//if (fpSendSignal) fpSendSignal(0, 0);
assert(0);
assert(!"syncLFQueueCompletePopPointer2()");
return CELL_OK;
}
@ -1906,7 +1912,7 @@ s32 syncLFQueueAttachLv2EventQueue(vm::ptr<u32> spus, u32 num, vm::ptr<CellSyncL
spus, num, queue);
#endif
assert(!"syncLFQueueAttachLv2EventQueue");
assert(!"syncLFQueueAttachLv2EventQueue()");
return CELL_OK;
}
@ -1924,7 +1930,7 @@ s32 syncLFQueueDetachLv2EventQueue(vm::ptr<u32> spus, u32 num, vm::ptr<CellSyncL
spus, num, queue);
#endif
assert(!"syncLFQueueDetachLv2EventQueue");
assert(!"syncLFQueueDetachLv2EventQueue()");
return CELL_OK;
}

20
rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
View file

@ -205,7 +205,10 @@ vm::ptr<char> _sys_strcat(vm::ptr<char> dest, vm::ptr<const char> source)
{
sysPrxForUser->Log("_sys_strcat(dest_addr=0x%x, source_addr=0x%x)", dest.addr(), source.addr());
assert(strcat(dest.get_ptr(), source.get_ptr()) == dest.get_ptr());
if (strcat(dest.get_ptr(), source.get_ptr()) != dest.get_ptr())
{
assert(!"strcat(): unexpected result");
}
return dest;
}
@ -213,7 +216,10 @@ vm::ptr<char> _sys_strncat(vm::ptr<char> dest, vm::ptr<const char> source, u32 l
{
sysPrxForUser->Log("_sys_strncat(dest_addr=0x%x, source_addr=0x%x, len=%d)", dest.addr(), source.addr(), len);
assert(strncat(dest.get_ptr(), source.get_ptr(), len) == dest.get_ptr());
if (strncat(dest.get_ptr(), source.get_ptr(), len) != dest.get_ptr())
{
assert(!"strncat(): unexpected result");
}
return dest;
}
@ -221,7 +227,10 @@ vm::ptr<char> _sys_strcpy(vm::ptr<char> dest, vm::ptr<const char> source)
{
sysPrxForUser->Log("_sys_strcpy(dest_addr=0x%x, source_addr=0x%x)", dest.addr(), source.addr());
assert(strcpy(dest.get_ptr(), source.get_ptr()) == dest.get_ptr());
if (strcpy(dest.get_ptr(), source.get_ptr()) != dest.get_ptr())
{
assert(!"strcpy(): unexpected result");
}
return dest;
}
@ -234,7 +243,10 @@ vm::ptr<char> _sys_strncpy(vm::ptr<char> dest, vm::ptr<const char> source, u32 l
return vm::ptr<char>::make(0);
}
assert(strncpy(dest.get_ptr(), source.get_ptr(), len) == dest.get_ptr());
if (strncpy(dest.get_ptr(), source.get_ptr(), len) != dest.get_ptr())
{
assert(!"strncpy(): unexpected result");
}
return dest;
}