From 96c692aefc381ff396a729148698a6b11b5bf703 Mon Sep 17 00:00:00 2001 From: Cornee Traas Date: Mon, 12 Aug 2013 11:56:56 +0200 Subject: [PATCH] Fix spelling of IsRunned to IsRunning --- rpcs3/Emu/Cell/PPCThread.cpp | 8 ++++---- rpcs3/Emu/Cell/PPCThread.h | 2 +- rpcs3/Emu/GS/GL/GLGSRender.cpp | 2 +- rpcs3/Emu/GS/Null/NullGSRender.h | 2 +- rpcs3/Emu/System.cpp | 10 +++++----- rpcs3/Emu/System.h | 2 +- rpcs3/Gui/Debugger.cpp | 2 +- rpcs3/Gui/DisAsmFrame.cpp | 6 +++--- rpcs3/Gui/InterpreterDisAsm.cpp | 4 ++-- rpcs3/Gui/MainFrame.cpp | 30 +++++++++++++++--------------- rpcs3/stdafx.h | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/rpcs3/Emu/Cell/PPCThread.cpp b/rpcs3/Emu/Cell/PPCThread.cpp index 8124a58115..aa7c2856c2 100644 --- a/rpcs3/Emu/Cell/PPCThread.cpp +++ b/rpcs3/Emu/Cell/PPCThread.cpp @@ -161,7 +161,7 @@ wxArrayString PPCThread::ErrorToString(const u32 error) void PPCThread::Run() { - if(IsRunned()) Stop(); + if(IsRunning()) Stop(); if(IsPaused()) { Resume(); @@ -170,7 +170,7 @@ void PPCThread::Run() wxGetApp().SendDbgCommand(DID_START_THREAD, this); - m_status = Runned; + m_status = Running; SetPc(entry); InitStack(); @@ -187,7 +187,7 @@ void PPCThread::Resume() wxGetApp().SendDbgCommand(DID_RESUME_THREAD, this); - m_status = Runned; + m_status = Running; DoResume(); Emu.CheckStatus(); @@ -198,7 +198,7 @@ void PPCThread::Resume() void PPCThread::Pause() { - if(!IsRunned()) return; + if(!IsRunning()) return; wxGetApp().SendDbgCommand(DID_PAUSE_THREAD, this); diff --git a/rpcs3/Emu/Cell/PPCThread.h b/rpcs3/Emu/Cell/PPCThread.h index 14abf1f17b..082420b8af 100644 --- a/rpcs3/Emu/Cell/PPCThread.h +++ b/rpcs3/Emu/Cell/PPCThread.h @@ -102,7 +102,7 @@ public: bool IsSPU() const { return m_type == PPC_THREAD_SPU; } bool IsOk() const { return m_error == 0; } - bool IsRunned() const { return m_status == Runned; } + bool IsRunning() const { return m_status == Running; } bool IsPaused() const { return m_status == Paused; } bool IsStopped() const { return m_status == Stopped; } diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index 335f834fb7..8bb5b9fc8c 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -132,7 +132,7 @@ void GLRSXThread::Task() { wxCriticalSectionLocker lock(p.m_cs_main); - if(p.m_ctrl->get == p.m_ctrl->put || !Emu.IsRunned()) + if(p.m_ctrl->get == p.m_ctrl->put || !Emu.IsRunning()) { SemaphorePostAndWait(p.m_sem_flush); diff --git a/rpcs3/Emu/GS/Null/NullGSRender.h b/rpcs3/Emu/GS/Null/NullGSRender.h index d9c9443b1a..6db11e3314 100644 --- a/rpcs3/Emu/GS/Null/NullGSRender.h +++ b/rpcs3/Emu/GS/Null/NullGSRender.h @@ -129,7 +129,7 @@ wxThread::ExitCode NullRSXThread::Entry() { wxCriticalSectionLocker lock(p.m_cs_main); - if(p.m_ctrl->get == p.m_ctrl->put || !Emu.IsRunned()) + if(p.m_ctrl->get == p.m_ctrl->put || !Emu.IsRunning()) { SemaphorePostAndWait(p.m_sem_flush); diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 812e50e05c..181ea571ac 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -145,7 +145,7 @@ void Emulator::Run() if(!IsReady()) return; } - if(IsRunned()) Stop(); + if(IsRunning()) Stop(); if(IsPaused()) { Resume(); @@ -156,7 +156,7 @@ void Emulator::Run() wxCriticalSectionLocker lock(m_cs_status); //ConLog.Write("run..."); - m_status = Runned; + m_status = Running; m_vfs.Mount("/", vfsDevice::GetRoot(m_path), new vfsLocalFile()); m_vfs.Mount("/dev_hdd0/", wxGetCwd() + "\\dev_hdd0\\", new vfsLocalFile()); @@ -189,7 +189,7 @@ void Emulator::Run() void Emulator::Pause() { - if(!IsRunned()) return; + if(!IsRunning()) return; //ConLog.Write("pause..."); wxGetApp().SendDbgCommand(DID_PAUSE_EMU); @@ -205,10 +205,10 @@ void Emulator::Resume() wxGetApp().SendDbgCommand(DID_RESUME_EMU); wxCriticalSectionLocker lock(m_cs_status); - m_status = Runned; + m_status = Running; CheckStatus(); - if(IsRunned() && Ini.CPUDecoderMode.GetValue() != 1) GetCPU().Exec(); + if(IsRunning() && Ini.CPUDecoderMode.GetValue() != 1) GetCPU().Exec(); wxGetApp().SendDbgCommand(DID_RESUMED_EMU); } diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 837fe2322f..5b6c3eed29 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -121,7 +121,7 @@ public: void SavePoints(const wxString& path); void LoadPoints(const wxString& path); - __forceinline bool IsRunned() const { wxCriticalSectionLocker lock(m_cs_status); return m_status == Runned; } + __forceinline bool IsRunning() const { wxCriticalSectionLocker lock(m_cs_status); return m_status == Running; } __forceinline bool IsPaused() const { wxCriticalSectionLocker lock(m_cs_status); return m_status == Paused; } __forceinline bool IsStopped() const { wxCriticalSectionLocker lock(m_cs_status); return m_status == Stopped; } __forceinline bool IsReady() const { wxCriticalSectionLocker lock(m_cs_status); return m_status == Ready; } diff --git a/rpcs3/Gui/Debugger.cpp b/rpcs3/Gui/Debugger.cpp index 31bb005d06..d0cad3d3a0 100644 --- a/rpcs3/Gui/Debugger.cpp +++ b/rpcs3/Gui/Debugger.cpp @@ -47,7 +47,7 @@ public: void OnRun(wxCommandEvent& event) { - if(Emu.IsRunned()) + if(Emu.IsRunning()) { Emu.Pause(); } diff --git a/rpcs3/Gui/DisAsmFrame.cpp b/rpcs3/Gui/DisAsmFrame.cpp index 5feadd3490..05512dec5c 100644 --- a/rpcs3/Gui/DisAsmFrame.cpp +++ b/rpcs3/Gui/DisAsmFrame.cpp @@ -78,14 +78,14 @@ void DisAsmFrame::AddLine(const wxString line) { static bool finished = false; - if(finished && Emu.IsRunned()) + if(finished && Emu.IsRunning()) { count = 0; finished = false; } - else if(count >= LINES_OPCODES || !Emu.IsRunned()) + else if(count >= LINES_OPCODES || !Emu.IsRunning()) { - if(Emu.IsRunned()) Emu.Pause(); + if(Emu.IsRunning()) Emu.Pause(); finished = true; CPU.PrevPc(); return; diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp index bdf9a1e4de..a42590bbdc 100644 --- a/rpcs3/Gui/InterpreterDisAsm.cpp +++ b/rpcs3/Gui/InterpreterDisAsm.cpp @@ -186,7 +186,7 @@ void InterpreterDisAsmFrame::ShowAddr(const u64 addr) wxColour colour; - if((!CPU.IsRunned() || !Emu.IsRunned()) && PC == CPU.PC) + if((!CPU.IsRunning() || !Emu.IsRunning()) && PC == CPU.PC) { colour = wxColour("Green"); } @@ -429,7 +429,7 @@ void InterpreterDisAsmFrame::Task() { CPU.ExecOnce(); } - while(CPU.IsRunned() && Emu.IsRunned() && !TestDestroy() && !IsBreakPoint(CPU.PC) && dump_status == dump_enable); + while(CPU.IsRunning() && Emu.IsRunning() && !TestDestroy() && !IsBreakPoint(CPU.PC) && dump_status == dump_enable); } catch(const wxString& e) { diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index e629d2cdba..16080e7293 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -112,7 +112,7 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event)) { bool stoped = false; - if(Emu.IsRunned()) + if(Emu.IsRunning()) { Emu.Pause(); stoped = true; @@ -187,7 +187,7 @@ void MainFrame::BootElf(wxCommandEvent& WXUNUSED(event)) { bool stoped = false; - if(Emu.IsRunned()) + if(Emu.IsRunning()) { Emu.Pause(); stoped = true; @@ -216,7 +216,7 @@ void MainFrame::BootSelf(wxCommandEvent& WXUNUSED(event)) { bool stoped = false; - if(Emu.IsRunned()) + if(Emu.IsRunning()) { Emu.Pause(); stoped = true; @@ -251,7 +251,7 @@ void MainFrame::Pause(wxCommandEvent& WXUNUSED(event)) { Emu.Resume(); } - else if(Emu.IsRunned()) + else if(Emu.IsRunning()) { Emu.Pause(); } @@ -273,7 +273,7 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) bool paused = false; - if(Emu.IsRunned()) + if(Emu.IsRunning()) { Emu.Pause(); paused = true; @@ -377,7 +377,7 @@ void MainFrame::UpdateUI(wxCommandEvent& event) { event.Skip(); - bool is_runned, is_stopped, is_ready; + bool is_running, is_stopped, is_ready; if(event.GetEventType() == wxEVT_DBG_COMMAND) { @@ -385,40 +385,40 @@ void MainFrame::UpdateUI(wxCommandEvent& event) { case DID_START_EMU: case DID_STARTED_EMU: - is_runned = true; + is_running = true; is_stopped = false; is_ready = false; break; case DID_STOP_EMU: case DID_STOPED_EMU: - is_runned = false; + is_running = false; is_stopped = true; is_ready = false; break; case DID_PAUSE_EMU: case DID_PAUSED_EMU: - is_runned = false; + is_running = false; is_stopped = false; is_ready = false; break; case DID_RESUME_EMU: case DID_RESUMED_EMU: - is_runned = true; + is_running = true; is_stopped = false; is_ready = false; break; case DID_READY_EMU: - is_runned = false; + is_running = false; is_stopped = false; is_ready = true; break; default: - is_runned = Emu.IsRunned(); + is_running = Emu.IsRunning(); is_stopped = Emu.IsStopped(); is_ready = Emu.IsReady(); break; @@ -426,7 +426,7 @@ void MainFrame::UpdateUI(wxCommandEvent& event) } else { - is_runned = Emu.IsRunned(); + is_running = Emu.IsRunning(); is_stopped = Emu.IsStopped(); is_ready = Emu.IsReady(); } @@ -436,7 +436,7 @@ void MainFrame::UpdateUI(wxCommandEvent& event) wxMenuItem& stop = *menubar.FindItem( id_sys_stop ); wxMenuItem& send_exit = *menubar.FindItem( id_sys_send_exit ); - pause.SetText(is_runned ? "Pause\tCtrl + P" : is_ready ? "Start\tCtrl + C" : "Resume\tCtrl + C"); + pause.SetText(is_running ? "Pause\tCtrl + P" : is_ready ? "Start\tCtrl + C" : "Resume\tCtrl + C"); pause.Enable(!is_stopped); stop.Enable(!is_stopped); //send_exit.Enable(false); @@ -502,7 +502,7 @@ void MainFrame::OnKeyDown(wxKeyEvent& event) switch(event.GetKeyCode()) { case 'C': case 'c': if(Emu.IsPaused()) Emu.Resume(); else if(Emu.IsReady()) Emu.Run(); return; - case 'P': case 'p': if(Emu.IsRunned()) Emu.Pause(); return; + case 'P': case 'p': if(Emu.IsRunning()) Emu.Pause(); return; case 'S': case 's': if(!Emu.IsStopped()) Emu.Stop(); return; case 'R': case 'r': if(!Emu.m_path.IsEmpty()) {Emu.Stop(); Emu.Run();} return; } diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 8633a2be22..b575624b77 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -179,7 +179,7 @@ static void safe_realloc(T* ptr, uint new_size) enum Status { - Runned, + Running, Paused, Stopped, Ready,