ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show the cycles passed in the debugger

This commit is contained in:
Kingcom 2014-07-30 19:01:48 +02:00
parent 6f101c0a0c
commit 30a5e31b66
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcsx2/gui/Debugger/DisassemblyDialog.cpp
View File

@ -80,7 +80,12 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu)
// create register list and disassembly section // create register list and disassembly section
wxBoxSizer* middleSizer = new wxBoxSizer(wxHORIZONTAL); 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); wxBoxSizer* registerSizer = new wxBoxSizer(wxVERTICAL);
registerSizer->Add(miscStuffSizer,0);
registerSizer->Add(registerList,1); registerSizer->Add(registerList,1);
middleSizer->Add(registerSizer,0,wxEXPAND|wxRIGHT,2); middleSizer->Add(registerSizer,0,wxEXPAND|wxRIGHT,2);
@ -96,6 +101,9 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu)
mainSizer->Add(bottomTabs,1,wxEXPAND); mainSizer->Add(bottomTabs,1,wxEXPAND);
mainSizer->Layout(); mainSizer->Layout();
lastCycles = 0;
loadCycles();
} }
void CpuTabPage::setBottomTabPage(wxWindow* win) void CpuTabPage::setBottomTabPage(wxWindow* win)
@ -116,6 +124,15 @@ void CpuTabPage::update()
Refresh(); 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): DisassemblyDialog::DisassemblyDialog(wxWindow* parent):
wxFrame( parent, wxID_ANY, L"Debugger", wxDefaultPosition,wxDefaultSize,wxRESIZE_BORDER|wxCLOSE_BOX|wxCAPTION|wxSYSTEM_MENU ), 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(); currentCpu->getDisassembly()->SetFocus();
CBreakPoints::SetBreakpointTriggered(false); CBreakPoints::SetBreakpointTriggered(false);
} }
if (currentCpu != NULL)
currentCpu->loadCycles();
} else { } else {
breakRunButton->SetLabel(L"Break"); breakRunButton->SetLabel(L"Break");

3
pcsx2/gui/Debugger/DisassemblyDialog.h
View File

@ -41,6 +41,7 @@ public:
wxNotebook* getBottomTabs() { return bottomTabs; }; wxNotebook* getBottomTabs() { return bottomTabs; };
void update(); void update();
void showMemoryView() { setBottomTabPage(memory); }; void showMemoryView() { setBottomTabPage(memory); };
void loadCycles();
private: private:
void setBottomTabPage(wxWindow* win); void setBottomTabPage(wxWindow* win);
DebugInterface* cpu; DebugInterface* cpu;
@ -49,6 +50,8 @@ private:
CtrlMemView* memory; CtrlMemView* memory;
wxNotebook* bottomTabs; wxNotebook* bottomTabs;
BreakpointList* breakpointList; BreakpointList* breakpointList;
wxStaticText* cyclesText;
u32 lastCycles;
}; };
class DisassemblyDialog : public wxFrame class DisassemblyDialog : public wxFrame