diff options
Diffstat (limited to 'src/citra_qt/debugger')
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 7 | ||||
| -rw-r--r-- | src/citra_qt/debugger/callstack.h | 3 | ||||
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 7 | ||||
| -rw-r--r-- | src/citra_qt/debugger/disassembler.h | 3 | ||||
| -rw-r--r-- | src/citra_qt/debugger/registers.cpp | 7 | ||||
| -rw-r--r-- | src/citra_qt/debugger/registers.h | 3 |
6 files changed, 24 insertions, 6 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index bcc5d2143..ab317a723 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp | |||
| @@ -25,7 +25,7 @@ CallstackWidget::CallstackWidget(QWidget* parent): QDockWidget(parent) | |||
| 25 | ui.treeView->setModel(callstack_model); | 25 | ui.treeView->setModel(callstack_model); |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | void CallstackWidget::OnCPUStepped() | 28 | void CallstackWidget::OnDebugModeEntered() |
| 29 | { | 29 | { |
| 30 | ARM_Disasm* disasm = new ARM_Disasm(); | 30 | ARM_Disasm* disasm = new ARM_Disasm(); |
| 31 | ARM_Interface* app_core = Core::g_app_core; | 31 | ARM_Interface* app_core = Core::g_app_core; |
| @@ -68,3 +68,8 @@ void CallstackWidget::OnCPUStepped() | |||
| 68 | } | 68 | } |
| 69 | } | 69 | } |
| 70 | } | 70 | } |
| 71 | |||
| 72 | void CallstackWidget::OnDebugModeLeft() | ||
| 73 | { | ||
| 74 | |||
| 75 | } | ||
diff --git a/src/citra_qt/debugger/callstack.h b/src/citra_qt/debugger/callstack.h index 4f4f74823..fb390f5c3 100644 --- a/src/citra_qt/debugger/callstack.h +++ b/src/citra_qt/debugger/callstack.h | |||
| @@ -15,7 +15,8 @@ public: | |||
| 15 | CallstackWidget(QWidget* parent = 0); | 15 | CallstackWidget(QWidget* parent = 0); |
| 16 | 16 | ||
| 17 | public slots: | 17 | public slots: |
| 18 | void OnCPUStepped(); | 18 | void OnDebugModeEntered(); |
| 19 | void OnDebugModeLeft(); | ||
| 19 | 20 | ||
| 20 | private: | 21 | private: |
| 21 | Ui::CallStack ui; | 22 | Ui::CallStack ui; |
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 8db73752f..3a1940015 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp | |||
| @@ -234,7 +234,7 @@ void DisassemblerWidget::OnToggleStartStop() | |||
| 234 | emu_thread.SetCpuRunning(!emu_thread.IsCpuRunning()); | 234 | emu_thread.SetCpuRunning(!emu_thread.IsCpuRunning()); |
| 235 | } | 235 | } |
| 236 | 236 | ||
| 237 | void DisassemblerWidget::OnCPUStepped() | 237 | void DisassemblerWidget::OnDebugModeEntered() |
| 238 | { | 238 | { |
| 239 | ARMword next_instr = Core::g_app_core->GetPC(); | 239 | ARMword next_instr = Core::g_app_core->GetPC(); |
| 240 | 240 | ||
| @@ -251,6 +251,11 @@ void DisassemblerWidget::OnCPUStepped() | |||
| 251 | disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); | 251 | disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | void DisassemblerWidget::OnDebugModeLeft() | ||
| 255 | { | ||
| 256 | |||
| 257 | } | ||
| 258 | |||
| 254 | int DisassemblerWidget::SelectedRow() | 259 | int DisassemblerWidget::SelectedRow() |
| 255 | { | 260 | { |
| 256 | QModelIndex index = disasm_ui.treeView->selectionModel()->currentIndex(); | 261 | QModelIndex index = disasm_ui.treeView->selectionModel()->currentIndex(); |
diff --git a/src/citra_qt/debugger/disassembler.h b/src/citra_qt/debugger/disassembler.h index 6d3cef108..0deccc240 100644 --- a/src/citra_qt/debugger/disassembler.h +++ b/src/citra_qt/debugger/disassembler.h | |||
| @@ -61,7 +61,8 @@ public slots: | |||
| 61 | void OnPause(); | 61 | void OnPause(); |
| 62 | void OnToggleStartStop(); | 62 | void OnToggleStartStop(); |
| 63 | 63 | ||
| 64 | void OnCPUStepped(); | 64 | void OnDebugModeEntered(); |
| 65 | void OnDebugModeLeft(); | ||
| 65 | 66 | ||
| 66 | private: | 67 | private: |
| 67 | // returns -1 if no row is selected | 68 | // returns -1 if no row is selected |
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index e982dfb3f..ab3666156 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp | |||
| @@ -41,7 +41,7 @@ RegistersWidget::RegistersWidget(QWidget* parent) : QDockWidget(parent) | |||
| 41 | CSPR->addChild(new QTreeWidgetItem(QStringList("N"))); | 41 | CSPR->addChild(new QTreeWidgetItem(QStringList("N"))); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | void RegistersWidget::OnCPUStepped() | 44 | void RegistersWidget::OnDebugModeEntered() |
| 45 | { | 45 | { |
| 46 | ARM_Interface* app_core = Core::g_app_core; | 46 | ARM_Interface* app_core = Core::g_app_core; |
| 47 | 47 | ||
| @@ -65,3 +65,8 @@ void RegistersWidget::OnCPUStepped() | |||
| 65 | CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1)); // Z - Zero | 65 | CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1)); // Z - Zero |
| 66 | CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1)); // N - Negative/Less than | 66 | CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1)); // N - Negative/Less than |
| 67 | } | 67 | } |
| 68 | |||
| 69 | void RegistersWidget::OnDebugModeLeft() | ||
| 70 | { | ||
| 71 | |||
| 72 | } | ||
diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h index ac8429f2b..bf8955625 100644 --- a/src/citra_qt/debugger/registers.h +++ b/src/citra_qt/debugger/registers.h | |||
| @@ -17,7 +17,8 @@ public: | |||
| 17 | RegistersWidget(QWidget* parent = NULL); | 17 | RegistersWidget(QWidget* parent = NULL); |
| 18 | 18 | ||
| 19 | public slots: | 19 | public slots: |
| 20 | void OnCPUStepped(); | 20 | void OnDebugModeEntered(); |
| 21 | void OnDebugModeLeft(); | ||
| 21 | 22 | ||
| 22 | private: | 23 | private: |
| 23 | Ui::ARMRegisters cpu_regs_ui; | 24 | Ui::ARMRegisters cpu_regs_ui; |