mirror of https://github.com/RPCS3/rpcs3.git
format fix
This commit is contained in:
parent
19e1631697
commit
85d23e2c32
|
@ -87,8 +87,6 @@ void Emulator::Init()
|
||||||
m_modules_init[0]->Init();
|
m_modules_init[0]->Init();
|
||||||
m_modules_init.erase(m_modules_init.begin());
|
m_modules_init.erase(m_modules_init.begin());
|
||||||
}
|
}
|
||||||
//if(m_memory_viewer) m_memory_viewer->Close();
|
|
||||||
//m_memory_viewer = new MemoryViewerPanel(wxGetApp().m_MainFrame);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Emulator::SetPath(const std::string& path, const std::string& elf_path)
|
void Emulator::SetPath(const std::string& path, const std::string& elf_path)
|
||||||
|
@ -141,7 +139,7 @@ void Emulator::CheckStatus()
|
||||||
|
|
||||||
//if (IsAllStoped)
|
//if (IsAllStoped)
|
||||||
//{
|
//{
|
||||||
// //ConLog.Warning("all stoped!");
|
// //LOG_WARNING(GENERAL, "all stoped!");
|
||||||
// Pause(); //Stop();
|
// Pause(); //Stop();
|
||||||
//}
|
//}
|
||||||
}
|
}
|
||||||
|
@ -306,22 +304,17 @@ void Emulator::Run()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsRunning()) Stop();
|
if (IsRunning()) Stop();
|
||||||
|
|
||||||
if (IsPaused())
|
if (IsPaused())
|
||||||
{
|
{
|
||||||
Resume();
|
Resume();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
SendDbgCommand(DID_START_EMU);
|
SendDbgCommand(DID_START_EMU);
|
||||||
|
|
||||||
//ConLog.Write("run...");
|
|
||||||
m_status = Running;
|
m_status = Running;
|
||||||
|
|
||||||
//if(m_memory_viewer && m_memory_viewer->exit) safe_delete(m_memory_viewer);
|
|
||||||
|
|
||||||
//m_memory_viewer->SetPC(loader.GetEntry());
|
|
||||||
//m_memory_viewer->Show();
|
|
||||||
//m_memory_viewer->ShowPC();
|
|
||||||
|
|
||||||
GetCPU().Exec();
|
GetCPU().Exec();
|
||||||
SendDbgCommand(DID_STARTED_EMU);
|
SendDbgCommand(DID_STARTED_EMU);
|
||||||
}
|
}
|
||||||
|
@ -329,7 +322,6 @@ void Emulator::Run()
|
||||||
void Emulator::Pause()
|
void Emulator::Pause()
|
||||||
{
|
{
|
||||||
if (!IsRunning()) return;
|
if (!IsRunning()) return;
|
||||||
//ConLog.Write("pause...");
|
|
||||||
SendDbgCommand(DID_PAUSE_EMU);
|
SendDbgCommand(DID_PAUSE_EMU);
|
||||||
|
|
||||||
if (InterlockedCompareExchange((volatile u32*)&m_status, Paused, Running) == Running)
|
if (InterlockedCompareExchange((volatile u32*)&m_status, Paused, Running) == Running)
|
||||||
|
@ -341,20 +333,18 @@ void Emulator::Pause()
|
||||||
void Emulator::Resume()
|
void Emulator::Resume()
|
||||||
{
|
{
|
||||||
if (!IsPaused()) return;
|
if (!IsPaused()) return;
|
||||||
//ConLog.Write("resume...");
|
|
||||||
SendDbgCommand(DID_RESUME_EMU);
|
SendDbgCommand(DID_RESUME_EMU);
|
||||||
|
|
||||||
m_status = Running;
|
m_status = Running;
|
||||||
|
|
||||||
CheckStatus();
|
CheckStatus();
|
||||||
//if(IsRunning() && Ini.CPUDecoderMode.GetValue() != 1) GetCPU().Exec();
|
|
||||||
SendDbgCommand(DID_RESUMED_EMU);
|
SendDbgCommand(DID_RESUMED_EMU);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Emulator::Stop()
|
void Emulator::Stop()
|
||||||
{
|
{
|
||||||
if(IsStopped()) return;
|
if(IsStopped()) return;
|
||||||
//ConLog.Write("shutdown...");
|
|
||||||
|
|
||||||
SendDbgCommand(DID_STOP_EMU);
|
SendDbgCommand(DID_STOP_EMU);
|
||||||
m_status = Stopped;
|
m_status = Stopped;
|
||||||
|
@ -396,7 +386,6 @@ void Emulator::Stop()
|
||||||
CurGameInfo.Reset();
|
CurGameInfo.Reset();
|
||||||
Memory.Close();
|
Memory.Close();
|
||||||
|
|
||||||
//if(m_memory_viewer && m_memory_viewer->IsShown()) m_memory_viewer->Hide();
|
|
||||||
SendDbgCommand(DID_STOPPED_EMU);
|
SendDbgCommand(DID_STOPPED_EMU);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -435,8 +424,7 @@ void Emulator::LoadPoints(const std::string& path)
|
||||||
u16 version;
|
u16 version;
|
||||||
f >> version >> break_count >> marked_count;
|
f >> version >> break_count >> marked_count;
|
||||||
|
|
||||||
if(version != bpdb_version ||
|
if (version != bpdb_version || (sizeof(u16) + break_count * sizeof(u64) + sizeof(u32) + marked_count * sizeof(u64) + sizeof(u32)) != length)
|
||||||
(sizeof(u16) + break_count * sizeof(u64) + sizeof(u32) + marked_count * sizeof(u64) + sizeof(u32)) != length)
|
|
||||||
{
|
{
|
||||||
LOG_ERROR(LOADER, "'%s' is broken", path.c_str());
|
LOG_ERROR(LOADER, "'%s' is broken", path.c_str());
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue