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

nyu

Browse source
This commit is contained in:
Nekotekina 2015-03-02 05:10:41 +03:00
parent 31bf130b1c
commit bc94d92cba
17 changed files with 1285 additions and 1175 deletions
Download patch file Download diff file Expand all files Collapse all files

31
rpcs3/Emu/CPU/CPUThread.cpp
View file

@ -20,7 +20,6 @@ CPUThread::CPUThread(CPUThreadType type)
, m_type(type)
, m_stack_size(0)
, m_stack_addr(0)
, m_offset(0)
, m_prio(0)
, m_dec(nullptr)
, m_is_step(false)
@ -30,6 +29,7 @@ CPUThread::CPUThread(CPUThreadType type)
, m_trace_enabled(false)
, m_trace_call_stack(true)
{
offset = 0;
}
CPUThread::~CPUThread()
@ -125,11 +125,9 @@ void CPUThread::Reset()
CloseStack();
SetPc(0);
cycle = 0;
m_is_branch = false;
m_status = Stopped;
m_error = 0;
DoReset();
}
@ -202,29 +200,6 @@ void CPUThread::SetPc(const u32 pc)
PC = pc;
}
void CPUThread::SetError(const u32 error)
{
if(error == 0)
{
m_error = 0;
}
else
{
m_error |= error;
}
}
std::vector<std::string> CPUThread::ErrorToString(const u32 error)
{
std::vector<std::string> earr;
if(error == 0) return earr;
earr.push_back("Unknown error");
return earr;
}
void CPUThread::Run()
{
if(!IsStopped())
@ -322,7 +297,7 @@ void CPUThread::Task()
for (uint i = 0; i<bp.size(); ++i)
{
if (bp[i] == m_offset + PC)
if (bp[i] == offset + PC)
{
Emu.Pause();
break;
@ -349,7 +324,7 @@ void CPUThread::Task()
Step();
//if (m_trace_enabled)
//trace.push_back(PC);
NextPc(m_dec->DecodeMemory(PC + m_offset));
NextPc(m_dec->DecodeMemory(PC + offset));
if (status == CPUThread_Step)
{