diff options
author | Kingcom <sorgts@googlemail.com> | 2015-01-07 12:14:23 +0100 |
---|---|---|
committer | Kingcom <sorgts@googlemail.com> | 2015-01-11 21:22:51 +0100 |
commit | 2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f (patch) | |
tree | 110079649f6649195c93b53815aceaab14b183fc /src/citra_qt/debugger | |
parent | Merge pull request #402 from chrisvj/master (diff) | |
download | yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.tar yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.tar.gz yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.tar.bz2 yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.tar.lz yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.tar.xz yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.tar.zst yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.zip |
Diffstat (limited to '')
-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) ui.treeView->setModel(callstack_model); } -void CallstackWidget::OnCPUStepped() +void CallstackWidget::OnDebugModeEntered() { ARM_Disasm* disasm = new ARM_Disasm(); ARM_Interface* app_core = Core::g_app_core; @@ -68,3 +68,8 @@ void CallstackWidget::OnCPUStepped() } } } + +void CallstackWidget::OnDebugModeLeft() +{ + +} 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: CallstackWidget(QWidget* parent = 0); public slots: - void OnCPUStepped(); + void OnDebugModeEntered(); + void OnDebugModeLeft(); private: 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() emu_thread.SetCpuRunning(!emu_thread.IsCpuRunning()); } -void DisassemblerWidget::OnCPUStepped() +void DisassemblerWidget::OnDebugModeEntered() { ARMword next_instr = Core::g_app_core->GetPC(); @@ -251,6 +251,11 @@ void DisassemblerWidget::OnCPUStepped() disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); } +void DisassemblerWidget::OnDebugModeLeft() +{ + +} + int DisassemblerWidget::SelectedRow() { 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: void OnPause(); void OnToggleStartStop(); - void OnCPUStepped(); + void OnDebugModeEntered(); + void OnDebugModeLeft(); private: // 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) CSPR->addChild(new QTreeWidgetItem(QStringList("N"))); } -void RegistersWidget::OnCPUStepped() +void RegistersWidget::OnDebugModeEntered() { ARM_Interface* app_core = Core::g_app_core; @@ -65,3 +65,8 @@ void RegistersWidget::OnCPUStepped() CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1)); // Z - Zero CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1)); // N - Negative/Less than } + +void RegistersWidget::OnDebugModeLeft() +{ + +} 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: RegistersWidget(QWidget* parent = NULL); public slots: - void OnCPUStepped(); + void OnDebugModeEntered(); + void OnDebugModeLeft(); private: Ui::ARMRegisters cpu_regs_ui; |