mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-06 00:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compilation fix 2

Browse Source
This commit is contained in:
Nekotekina 2015-01-02 15:32:54 +03:00
parent b61bcb6ad6
commit 658079af55
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
View File

@ -169,6 +169,7 @@ template<typename T> T ARMv7_instrs::Shift_C(T value, SRType type, s32 amount, b
case SRType_ASR: return ASR_C(value, amount, carry_out);
case SRType_ROR: return ROR_C(value, amount, carry_out);
case SRType_RRX: return RRX_C(value, carry_in, carry_out);
default: throw __FUNCTION__;
}
}
@ -710,6 +711,7 @@ void ARMv7_instrs::B(ARMv7Thread* thr, const ARMv7_encoding type)
jump = 1 + 4 + sign<26, u32>((thr->code.data & 0xffffff) << 2);
break;
}
default: throw __FUNCTION__;
}
if (ConditionPassed(thr, cond))
@ -1410,7 +1412,7 @@ void ARMv7_instrs::LSL_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
if (ConditionPassed(thr, cond))
{
bool carry;
const u32 res = Shift_C(thr->read_gpr(m), SRType_LSL, shift_n, thr->APSR.C, carry);
const u32 res = Shift_C<u32>(thr->read_gpr(m), SRType_LSL, shift_n, thr->APSR.C, carry);
thr->write_gpr(d, res);
if (set_flags)
{

2
rpcs3/Emu/SysCalls/lv2/sys_cond.cpp
View File

@ -152,7 +152,7 @@ s32 sys_cond_wait(PPUThread& CPU, u32 cond_id, u64 timeout)
bool pushed_in_sleep_queue = false, signaled = false;
while (true)
{
if (signaled = signaled || cond->queue.pop(tid, mutex->protocol)) // check if signaled
if ((signaled = signaled || cond->queue.pop(tid, mutex->protocol))) // check if signaled
{
if (mutex->owner.compare_and_swap_test(0, tid)) // try to lock
{

2
rpcs3/Emu/SysCalls/lv2/sys_lwcond.cpp
View File

@ -169,7 +169,7 @@ s32 sys_lwcond_wait(PPUThread& CPU, vm::ptr<sys_lwcond_t> lwcond, u64 timeout)
bool signaled = false;
while (true)
{
if (signaled = signaled || lw->queue.pop(tid, mutex->attribute)) // check signaled threads
if ((signaled = signaled || lw->queue.pop(tid, mutex->attribute))) // check signaled threads
{
s32 res = mutex->lock(tid, timeout ? get_system_time() - start_time : 0); // this is bad
if (res == CELL_OK)

2
rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp
View File

@ -49,7 +49,7 @@ s32 sys_rwlock_destroy(u32 rw_lock_id)
return CELL_ESRCH;
}
if (!rw->sync.compare_and_swap_test({ 0, 0 }, { ~0, ~0 })) // check if locked and make unusable
if (!rw->sync.compare_and_swap_test({ 0, 0 }, { ~0u, ~0u })) // check if locked and make unusable
{
return CELL_EBUSY;
}