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

Some fixes

Browse source
This commit is contained in:
Nekotekina 2015-07-01 20:09:26 +03:00
parent 3aefa2b4e1
commit 6f1e76198a
98 changed files with 2326 additions and 2348 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/ARMv7/ARMv7Thread.cpp
View file

@ -91,6 +91,7 @@ ARMv7Thread::~ARMv7Thread()
cv.notify_one();
join();
CloseStack();
armv7_free_tls(GetId());
}
@ -202,7 +203,7 @@ void ARMv7Thread::Task()
while (true)
{
if (m_state.load() && CheckStatus()) return;
if (m_state.load() && CheckStatus()) break;
// decode instruction using specified decoder
PC += m_dec->DecodeMemory(PC);
@ -219,9 +220,11 @@ void ARMv7Thread::FastCall(u32 addr)
auto old_PC = PC;
auto old_stack = SP;
auto old_LR = LR;
auto old_task = decltype(custom_task)();
PC = addr;
LR = Emu.GetCPUThreadStop();
custom_task.swap(old_task);
try
{
@ -231,6 +234,8 @@ void ARMv7Thread::FastCall(u32 addr)
{
}
m_state &= ~CPU_STATE_RETURN;
PC = old_PC;
if (SP != old_stack) // SP shouldn't change
@ -239,11 +244,12 @@ void ARMv7Thread::FastCall(u32 addr)
}
LR = old_LR;
custom_task.swap(old_task);
}
void ARMv7Thread::FastStop()
{
throw CPUThreadReturn{};
m_state |= CPU_STATE_RETURN;
}
armv7_thread::armv7_thread(u32 entry, const std::string& name, u32 stack_size, s32 prio)