From 5986448d67cc0e7cc761ed35123bfeb761e7e1ce Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Thu, 12 Feb 2015 11:44:53 +0300 Subject: [PATCH] Small fix --- rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp | 6 +++--- rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index 5f8dc1c7a1..48669968f1 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -2660,7 +2660,7 @@ s64 cellSpursCreateTaskset(vm::ptr spurs, vm::ptr t return CELL_OK; #endif - return spursCreateTaskset(spurs, taskset, args, priority, maxContention, vm::ptr::make(0), CellSpursTaskset::size, 0); + return spursCreateTaskset(spurs, taskset, args, priority, maxContention, vm::ptr::make(0), 6400/*CellSpursTaskset::size*/, 0); } s64 cellSpursJoinTaskset(vm::ptr taskset) @@ -2990,7 +2990,7 @@ s64 cellSpursTasksetAttributeSetTasksetSize(vm::ptr a return CELL_SPURS_TASK_ERROR_ALIGN; } - if (size != CellSpursTaskset::size && size != CellSpursTaskset2::size) + if (size != 6400/*CellSpursTaskset::size*/ && size != CellSpursTaskset2::size) { return CELL_SPURS_TASK_ERROR_INVAL; } @@ -3425,7 +3425,7 @@ s64 _cellSpursTasksetAttributeInitialize(vm::ptr attr attribute->m.sdk_version = sdk_version; attribute->m.args = args; memcpy(attribute->m.priority, priority.get_ptr(), 8); - attribute->m.taskset_size = CellSpursTaskset::size; + attribute->m.taskset_size = 6400/*CellSpursTaskset::size*/; attribute->m.max_contention = max_contention; return CELL_OK; #endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp index 794a17af82..67f07e0bd3 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp @@ -525,12 +525,12 @@ bool spursKernelWorkloadExit(SPUThread & spu) { /// SPURS kernel entry point bool spursKernelEntry(SPUThread & spu) { - //while (true) { - // std::this_thread::sleep_for(std::chrono::milliseconds(100)); - // if (Emu.IsStopped()) { - // return false; - // } - //} + while (true) { + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + if (Emu.IsStopped()) { + return false; + } + } auto ctxt = vm::get_ptr(spu.ls_offset + 0x100); memset(ctxt, 0, sizeof(SpursKernelContext)); @@ -598,7 +598,7 @@ void spursSysServiceIdleHandler(SPUThread & spu, SpursKernelContext * ctxt) { bool shouldExit; while (true) { - vm::reservation_acquire(vm::get_ptr(spu.ls_offset + 0x100), vm::cast(ctxt->spurs.addr()), 128/*, [&spu](){ spu.Notify(); }*/); + vm::reservation_acquire(vm::get_ptr(spu.ls_offset + 0x100), vm::cast(ctxt->spurs.addr()), 128, [&spu](){ spu.Notify(); }); auto spurs = vm::get_ptr(spu.ls_offset + 0x100); // Find the number of SPUs that are idling in this SPURS instance