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

New bitsets (experimental)

Browse source
This commit is contained in:
Nekotekina 2016-08-07 22:01:27 +03:00
parent 71441819e5
commit 46735d6b3d
20 changed files with 802 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,9 +79,8 @@ std::string ppu_thread::get_name() const
std::string ppu_thread::dump() const
{
std::string ret;
ret += fmt::format("Type: %s\n", typeid(*this).name());
ret += fmt::format("State: 0x%08x\n", state.load());
ret += fmt::format("State: %s\n", state.load());
ret += fmt::format("Priority: %d\n", prio);
ret += "\nRegisters:\n=========\n";
@ -196,7 +195,7 @@ void ppu_thread::exec_task()
while (true)
{
if (UNLIKELY(state.load()))
if (UNLIKELY(test(state)))
{
if (check_state()) return;
}
@ -228,7 +227,7 @@ void ppu_thread::exec_task()
func2 = table[_i._u32[2]];
func3 = table[_i._u32[3]];
if (UNLIKELY(state.load()))
if (UNLIKELY(test(state)))
{
break;
}
@ -241,8 +240,6 @@ void ppu_thread::exec_task()
}
}
constexpr auto stop_state = make_bitset(cpu_state::stop, cpu_state::exit, cpu_state::suspend);
ppu_thread::~ppu_thread()
{
if (stack_addr)
@ -311,7 +308,7 @@ ppu_cmd ppu_thread::cmd_wait()
while (true)
{
if (UNLIKELY(state.load()))
if (UNLIKELY(test(state)))
{
if (lock) lock.unlock();
@ -368,7 +365,7 @@ void ppu_thread::fast_call(u32 addr, u32 rtoc)
{
exec_task();
if (gpr[1] != old_stack && !state.test(cpu_state::ret) && !state.test(cpu_state::exit)) // gpr[1] shouldn't change
if (gpr[1] != old_stack && !test(state, cpu_state::ret + cpu_state::exit)) // gpr[1] shouldn't change
{
throw fmt::exception("Stack inconsistency (addr=0x%x, rtoc=0x%x, SP=0x%llx, old=0x%llx)", addr, rtoc, gpr[1], old_stack);
}