From 30a5e31b66a8c1255f661c8c3338164faa545f95 Mon Sep 17 00:00:00 2001
From: Kingcom <sorgts@googlemail.com>
Date: Wed, 30 Jul 2014 19:01:48 +0200
Subject: [PATCH] Show the cycles passed in the debugger

---
 pcsx2/gui/Debugger/DisassemblyDialog.cpp | 20 ++++++++++++++++++++
 pcsx2/gui/Debugger/DisassemblyDialog.h   |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
index 5cdd8591c9..7b365c24f9 100644
--- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
@@ -80,7 +80,12 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu)
 	// create register list and disassembly section
 	wxBoxSizer* middleSizer = new wxBoxSizer(wxHORIZONTAL);
 
+	wxBoxSizer* miscStuffSizer = new wxBoxSizer(wxHORIZONTAL);
+	cyclesText = new wxStaticText(this,wxID_ANY,L"");
+	miscStuffSizer->Add(cyclesText,0,wxLEFT|wxTOP|wxBOTTOM,2);
+
 	wxBoxSizer* registerSizer = new wxBoxSizer(wxVERTICAL);
+	registerSizer->Add(miscStuffSizer,0);
 	registerSizer->Add(registerList,1);
 	
 	middleSizer->Add(registerSizer,0,wxEXPAND|wxRIGHT,2);
@@ -96,6 +101,9 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu)
 	mainSizer->Add(bottomTabs,1,wxEXPAND);
 
 	mainSizer->Layout();
+
+	lastCycles = 0;
+	loadCycles();
 }
 
 void CpuTabPage::setBottomTabPage(wxWindow* win)
@@ -116,6 +124,15 @@ void CpuTabPage::update()
 	Refresh();
 }
 
+void CpuTabPage::loadCycles()
+{
+	u32 cycles = cpu->getCycles();
+
+	wchar_t str[64];
+	swprintf(str,64,L"Ctr:  %u",cycles-lastCycles);
+	cyclesText->SetLabel(str);
+	lastCycles = cycles;
+}
 
 DisassemblyDialog::DisassemblyDialog(wxWindow* parent):
 	wxFrame( parent, wxID_ANY, L"Debugger", wxDefaultPosition,wxDefaultSize,wxRESIZE_BORDER|wxCLOSE_BOX|wxCAPTION|wxSYSTEM_MENU ),
@@ -456,6 +473,9 @@ void DisassemblyDialog::setDebugMode(bool debugMode, bool switchPC)
 					currentCpu->getDisassembly()->SetFocus();
 				CBreakPoints::SetBreakpointTriggered(false);
 			}
+
+			if (currentCpu != NULL)
+				currentCpu->loadCycles();
 		} else {
 			breakRunButton->SetLabel(L"Break");
 
diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.h b/pcsx2/gui/Debugger/DisassemblyDialog.h
index f6c81e112c..920d99a534 100644
--- a/pcsx2/gui/Debugger/DisassemblyDialog.h
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.h
@@ -41,6 +41,7 @@ public:
 	wxNotebook* getBottomTabs() { return bottomTabs; };
 	void update();
 	void showMemoryView() { setBottomTabPage(memory); };
+	void loadCycles();
 private:
 	void setBottomTabPage(wxWindow* win);
 	DebugInterface* cpu;
@@ -49,6 +50,8 @@ private:
 	CtrlMemView* memory;
 	wxNotebook* bottomTabs;
 	BreakpointList* breakpointList;
+	wxStaticText* cyclesText;
+	u32 lastCycles;
 };
 
 class DisassemblyDialog : public wxFrame