summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra_qt/callstack.cpp36
-rw-r--r--src/citra_qt/citra_qt.vcxproj35
-rw-r--r--src/citra_qt/citra_qt.vcxproj.filters60
-rw-r--r--src/citra_qt/debugger/callstack.cpp66
-rw-r--r--src/citra_qt/debugger/callstack.hxx (renamed from src/citra_qt/callstack.hxx)7
-rw-r--r--src/citra_qt/debugger/callstack.ui (renamed from src/citra_qt/callstack.ui)0
-rw-r--r--src/citra_qt/debugger/disassembler.cpp (renamed from src/citra_qt/disasm.cpp)52
-rw-r--r--src/citra_qt/debugger/disassembler.hxx (renamed from src/citra_qt/disasm.hxx)6
-rw-r--r--src/citra_qt/debugger/disassembler.ui88
-rw-r--r--src/citra_qt/debugger/ramview.cpp (renamed from src/citra_qt/ramview.cpp)0
-rw-r--r--src/citra_qt/debugger/ramview.hxx (renamed from src/citra_qt/ramview.hxx)0
-rw-r--r--src/citra_qt/debugger/registers.cpp (renamed from src/citra_qt/cpu_regs.cpp)8
-rw-r--r--src/citra_qt/debugger/registers.hxx (renamed from src/citra_qt/cpu_regs.hxx)8
-rw-r--r--src/citra_qt/debugger/registers.ui (renamed from src/citra_qt/cpu_regs.ui)0
-rw-r--r--src/citra_qt/disasm.ui78
-rw-r--r--src/citra_qt/main.cpp39
-rw-r--r--src/citra_qt/main.hxx11
-rw-r--r--src/citra_qt/ui_disassembler.h (renamed from src/citra_qt/ui_disasm.h)16
-rw-r--r--src/citra_qt/ui_registers.h (renamed from src/citra_qt/ui_cpu_regs.h)8
19 files changed, 285 insertions, 233 deletions
diff --git a/src/citra_qt/callstack.cpp b/src/citra_qt/callstack.cpp
deleted file mode 100644
index 2d62cb0d0..000000000
--- a/src/citra_qt/callstack.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <QStandardItemModel>
-#include "callstack.hxx"
-
-//#include "debugger/debugger.h"
-
-GCallstackView::GCallstackView(QWidget* parent): QDockWidget(parent)
-{
- ui.setupUi(this);
-
- callstack_model = new QStandardItemModel(this);
- callstack_model->setColumnCount(3);
- callstack_model->setHeaderData(0, Qt::Horizontal, "Depth");
- callstack_model->setHeaderData(1, Qt::Horizontal, "Address");
- callstack_model->setHeaderData(2, Qt::Horizontal, "Function Name");
- ui.treeView->setModel(callstack_model);
-
- // TODO: Make single clicking a callstack entry jump to the corresponding disassembly position
-}
-
-void GCallstackView::OnCPUStepped()
-{
- /*
- Debugger::Callstack callstack;
- Debugger::GetCallstack(callstack);
- callstack_model->setRowCount(callstack.size());
-
- for (int i = 0; i < callstack.size(); ++i)
- for (Debugger::CallstackIterator it = callstack.begin(); it != callstack.end(); ++it)
- {
- Debugger::CallstackEntry entry = callstack[i];
- callstack_model->setItem(i, 0, new QStandardItem(QString("%1").arg(i+1)));
- callstack_model->setItem(i, 1, new QStandardItem(QString("0x%1").arg(entry.addr, 8, 16, QLatin1Char('0'))));
- callstack_model->setItem(i, 2, new QStandardItem(QString::fromStdString(entry.name)));
- }
- */
-} \ No newline at end of file
diff --git a/src/citra_qt/citra_qt.vcxproj b/src/citra_qt/citra_qt.vcxproj
index 735f06e5b..3f24bbfbf 100644
--- a/src/citra_qt/citra_qt.vcxproj
+++ b/src/citra_qt/citra_qt.vcxproj
@@ -127,27 +127,25 @@
<ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp" />
<ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp" />
<ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp" />
- <ClCompile Include="bootmanager.cpp" />
- <ClCompile Include="callstack.cpp" />
<ClCompile Include="config\controller_config.cpp" />
<ClCompile Include="config\controller_config_util.cpp" />
- <ClCompile Include="cpu_regs.cpp" />
- <ClCompile Include="disasm.cpp" />
+ <ClCompile Include="debugger\callstack.cpp" />
+ <ClCompile Include="debugger\registers.cpp" />
+ <ClCompile Include="debugger\disassembler.cpp" />
+ <ClCompile Include="debugger\ramview.cpp" />
+ <ClCompile Include="bootmanager.cpp" />
<ClCompile Include="hotkeys.cpp" />
<ClCompile Include="main.cpp" />
- <ClCompile Include="ramview.cpp" />
</ItemGroup>
<ItemGroup>
<MOC Include="..\..\externals\qhexedit\commands.h" />
<MOC Include="..\..\externals\qhexedit\qhexedit.h" />
<MOC Include="..\..\externals\qhexedit\qhexedit_p.h" />
<MOC Include="..\..\externals\qhexedit\xbytearray.h" />
- <MOC Include="config\controller_config.hxx" />
- <MOC Include="config\controller_config_util.hxx" />
- <MOC Include="callstack.hxx" />
- <MOC Include="cpu_regs.hxx" />
- <MOC Include="disasm.hxx" />
- <MOC Include="ramview.hxx" />
+ <MOC Include="debugger\callstack.hxx" />
+ <MOC Include="debugger\registers.hxx" />
+ <MOC Include="debugger\disassembler.hxx" />
+ <MOC Include="debugger\ramview.hxx" />
<MOC Include="bootmanager.hxx" />
<MOC Include="hotkeys.hxx" />
<MOC Include="main.hxx" />
@@ -164,25 +162,16 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="callstack.hxx" />
<ClInclude Include="config\controller_config.hxx" />
<ClInclude Include="config\controller_config_util.hxx" />
- <ClInclude Include="cpu_regs.hxx" />
- <ClInclude Include="disasm.hxx" />
- <ClInclude Include="ramview.hxx" />
- <ClInclude Include="ui_callstack.h" />
<ClInclude Include="ui_controller_config.h" />
- <ClInclude Include="ui_cpu_regs.h" />
- <ClInclude Include="ui_disasm.h" />
- <ClInclude Include="ui_hotkeys.h" />
- <ClInclude Include="ui_main.h" />
<ClInclude Include="version.h" />
</ItemGroup>
<ItemGroup>
- <UIC Include="callstack.ui" />
<UIC Include="config\controller_config.ui" />
- <UIC Include="cpu_regs.ui" />
- <UIC Include="disasm.ui" />
+ <UIC Include="debugger\callstack.ui" />
+ <UIC Include="debugger\registers.ui" />
+ <UIC Include="debugger\disassembler.ui" />
<UIC Include="hotkeys.ui" />
<UIC Include="main.ui" />
</ItemGroup>
diff --git a/src/citra_qt/citra_qt.vcxproj.filters b/src/citra_qt/citra_qt.vcxproj.filters
index 5b292c120..2b3838e29 100644
--- a/src/citra_qt/citra_qt.vcxproj.filters
+++ b/src/citra_qt/citra_qt.vcxproj.filters
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <Filter Include="debugger">
- <UniqueIdentifier>{1b8f77c1-61e8-4a9f-95f8-8d1c53015ad8}</UniqueIdentifier>
- </Filter>
<Filter Include="qhexedit">
<UniqueIdentifier>{dede739c-939b-4147-9e72-4a326b97d237}</UniqueIdentifier>
</Filter>
<Filter Include="config">
<UniqueIdentifier>{80178741-d3ab-4031-892c-ec58490ea8bf}</UniqueIdentifier>
</Filter>
+ <Filter Include="debugger">
+ <UniqueIdentifier>{9495d0e7-87d6-4fe1-92f1-cfa1bbec7025}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\externals\qhexedit\commands.cpp">
@@ -33,16 +33,16 @@
<ClCompile Include="config\controller_config_util.cpp">
<Filter>config</Filter>
</ClCompile>
- <ClCompile Include="cpu_regs.cpp">
+ <ClCompile Include="debugger\callstack.cpp">
<Filter>debugger</Filter>
</ClCompile>
- <ClCompile Include="disasm.cpp">
+ <ClCompile Include="debugger\ramview.cpp">
<Filter>debugger</Filter>
</ClCompile>
- <ClCompile Include="ramview.cpp">
+ <ClCompile Include="debugger\disassembler.cpp">
<Filter>debugger</Filter>
</ClCompile>
- <ClCompile Include="callstack.cpp">
+ <ClCompile Include="debugger\registers.cpp">
<Filter>debugger</Filter>
</ClCompile>
</ItemGroup>
@@ -59,12 +59,23 @@
<MOC Include="..\..\externals\qhexedit\qhexedit.h">
<Filter>qhexedit</Filter>
</MOC>
+ <MOC Include="bootmanager.hxx" />
+ <MOC Include="hotkeys.hxx" />
+ <MOC Include="main.hxx" />
+ <MOC Include="debugger\callstack.hxx">
+ <Filter>debugger</Filter>
+ </MOC>
+ <MOC Include="debugger\ramview.hxx">
+ <Filter>debugger</Filter>
+ </MOC>
+ <MOC Include="debugger\disassembler.hxx">
+ <Filter>debugger</Filter>
+ </MOC>
+ <MOC Include="debugger\registers.hxx">
+ <Filter>debugger</Filter>
+ </MOC>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="hotkeys.hxx" />
- <ClInclude Include="ui_hotkeys.h" />
- <ClInclude Include="main.hxx" />
- <ClInclude Include="ui_main.h" />
<ClInclude Include="version.h" />
<ClInclude Include="config\controller_config.hxx">
<Filter>config</Filter>
@@ -72,27 +83,6 @@
<ClInclude Include="config\controller_config_util.hxx">
<Filter>config</Filter>
</ClInclude>
- <ClInclude Include="cpu_regs.hxx">
- <Filter>debugger</Filter>
- </ClInclude>
- <ClInclude Include="disasm.hxx">
- <Filter>debugger</Filter>
- </ClInclude>
- <ClInclude Include="ramview.hxx">
- <Filter>debugger</Filter>
- </ClInclude>
- <ClInclude Include="ui_callstack.h">
- <Filter>debugger</Filter>
- </ClInclude>
- <ClInclude Include="ui_cpu_regs.h">
- <Filter>debugger</Filter>
- </ClInclude>
- <ClInclude Include="ui_disasm.h">
- <Filter>debugger</Filter>
- </ClInclude>
- <ClInclude Include="callstack.hxx">
- <Filter>debugger</Filter>
- </ClInclude>
<ClInclude Include="ui_controller_config.h">
<Filter>config</Filter>
</ClInclude>
@@ -103,13 +93,13 @@
<UIC Include="config\controller_config.ui">
<Filter>config</Filter>
</UIC>
- <UIC Include="callstack.ui">
+ <UIC Include="debugger\callstack.ui">
<Filter>debugger</Filter>
</UIC>
- <UIC Include="cpu_regs.ui">
+ <UIC Include="debugger\disassembler.ui">
<Filter>debugger</Filter>
</UIC>
- <UIC Include="disasm.ui">
+ <UIC Include="debugger\registers.ui">
<Filter>debugger</Filter>
</UIC>
</ItemGroup>
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp
new file mode 100644
index 000000000..f59f2d8c8
--- /dev/null
+++ b/src/citra_qt/debugger/callstack.cpp
@@ -0,0 +1,66 @@
+#include <QStandardItemModel>
+
+#include "callstack.hxx"
+
+#include "core/core.h"
+#include "core/arm/arm_interface.h"
+#include "core/mem_map.h"
+#include "common/symbols.h"
+#include "core/arm/disassembler/arm_disasm.h"
+
+CallstackWidget::CallstackWidget(QWidget* parent): QDockWidget(parent)
+{
+ ui.setupUi(this);
+
+ callstack_model = new QStandardItemModel(this);
+ callstack_model->setColumnCount(4);
+ callstack_model->setHeaderData(0, Qt::Horizontal, "Stack pointer");
+ callstack_model->setHeaderData(2, Qt::Horizontal, "Return address");
+ callstack_model->setHeaderData(1, Qt::Horizontal, "Call address");
+ callstack_model->setHeaderData(3, Qt::Horizontal, "Function");
+ ui.treeView->setModel(callstack_model);
+}
+
+void CallstackWidget::OnCPUStepped()
+{
+ ARM_Disasm* disasm = new ARM_Disasm();
+ ARM_Interface* app_core = Core::g_app_core;
+
+ u32 sp = app_core->GetReg(13); //stack pointer
+ u32 addr, ret_addr, call_addr, func_addr;
+
+ int counter = 0;
+ for (int addr = 0x10000000; addr >= sp; addr -= 4)
+ {
+ ret_addr = Memory::Read32(addr);
+ call_addr = ret_addr - 4; //get call address???
+
+ /* TODO (mattvail) clean me, move to debugger interface */
+ u32 insn = Memory::Read32(call_addr);
+ if (disasm->decode(insn) == OP_BL)
+ {
+ std::string name;
+ // ripped from disasm
+ uint8_t cond = (insn >> 28) & 0xf;
+ uint32_t i_offset = insn & 0xffffff;
+ // Sign-extend the 24-bit offset
+ if ((i_offset >> 23) & 1)
+ i_offset |= 0xff000000;
+
+ // Pre-compute the left-shift and the prefetch offset
+ i_offset <<= 2;
+ i_offset += 8;
+ func_addr = call_addr + i_offset;
+
+ callstack_model->setItem(counter, 0, new QStandardItem(QString("0x%1").arg(addr, 8, 16, QLatin1Char('0'))));
+ callstack_model->setItem(counter, 1, new QStandardItem(QString("0x%1").arg(ret_addr, 8, 16, QLatin1Char('0'))));
+ callstack_model->setItem(counter, 2, new QStandardItem(QString("0x%1").arg(call_addr, 8, 16, QLatin1Char('0'))));
+
+ name = Symbols::HasSymbol(func_addr) ? Symbols::GetSymbol(func_addr).name : "unknown";
+ callstack_model->setItem(counter, 3, new QStandardItem(QString("%1_%2").arg(QString::fromStdString(name))
+ .arg(QString("0x%1").arg(func_addr, 8, 16, QLatin1Char('0')))));
+
+ counter++;
+ }
+ }
+} \ No newline at end of file
diff --git a/src/citra_qt/callstack.hxx b/src/citra_qt/debugger/callstack.hxx
index 4df1b96d5..3ad2af28b 100644
--- a/src/citra_qt/callstack.hxx
+++ b/src/citra_qt/debugger/callstack.hxx
@@ -1,15 +1,14 @@
#include <QDockWidget>
-#include "ui_callstack.h"
-#include "common/platform.h"
+#include "../ui_callstack.h"
class QStandardItemModel;
-class GCallstackView : public QDockWidget
+class CallstackWidget : public QDockWidget
{
Q_OBJECT
public:
- GCallstackView(QWidget* parent = 0);
+ CallstackWidget(QWidget* parent = 0);
public slots:
void OnCPUStepped();
diff --git a/src/citra_qt/callstack.ui b/src/citra_qt/debugger/callstack.ui
index b3c4db632..b3c4db632 100644
--- a/src/citra_qt/callstack.ui
+++ b/src/citra_qt/debugger/callstack.ui
diff --git a/src/citra_qt/disasm.cpp b/src/citra_qt/debugger/disassembler.cpp
index 5f3a6058a..cc4cb13fa 100644
--- a/src/citra_qt/disasm.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -1,9 +1,9 @@
#include <QtGui>
-#include "ui_disasm.h"
-#include "disasm.hxx"
-#include "bootmanager.hxx"
-#include "hotkeys.hxx"
+#include "disassembler.hxx"
+
+#include "../bootmanager.hxx"
+#include "../hotkeys.hxx"
#include "common/common.h"
#include "core/mem_map.h"
@@ -14,7 +14,7 @@
#include "core/arm/interpreter/armdefs.h"
#include "core/arm/disassembler/arm_disasm.h"
-GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread)
+DisassemblerWidget::DisassemblerWidget(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread)
{
disasm_ui.setupUi(this);
@@ -23,7 +23,7 @@ GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(p
model = new QStandardItemModel(this);
model->setColumnCount(3);
disasm_ui.treeView->setModel(model);
-
+ disasm_ui.tableView->setModel(model);
RegisterHotkey("Disassembler", "Start/Stop", QKeySequence(Qt::Key_F5), Qt::ApplicationShortcut);
RegisterHotkey("Disassembler", "Step", QKeySequence(Qt::Key_F10), Qt::ApplicationShortcut);
RegisterHotkey("Disassembler", "Step into", QKeySequence(Qt::Key_F11), Qt::ApplicationShortcut);
@@ -40,7 +40,7 @@ GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(p
connect(GetHotkey("Disassembler", "Set Breakpoint", this), SIGNAL(activated()), this, SLOT(OnSetBreakpoint()));
}
-void GDisAsmView::Init()
+void DisassemblerWidget::Init()
{
ARM_Disasm* disasm = new ARM_Disasm();
@@ -64,13 +64,20 @@ void GDisAsmView::Init()
}
disasm_ui.treeView->resizeColumnToContents(0);
disasm_ui.treeView->resizeColumnToContents(1);
-
+ disasm_ui.treeView->resizeColumnToContents(2);
+ disasm_ui.tableView->resizeColumnToContents(0);
+ disasm_ui.tableView->resizeColumnToContents(1);
+ disasm_ui.tableView->resizeColumnToContents(2);
+
QModelIndex model_index = model->index(0, 0);
disasm_ui.treeView->scrollTo(model_index);
disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+
+ disasm_ui.tableView->scrollTo(model_index);
+ disasm_ui.tableView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
}
-void GDisAsmView::OnSetBreakpoint()
+void DisassemblerWidget::OnSetBreakpoint()
{
int selected_row = SelectedRow();
@@ -92,33 +99,33 @@ void GDisAsmView::OnSetBreakpoint()
}
}
-void GDisAsmView::OnContinue()
+void DisassemblerWidget::OnContinue()
{
emu_thread.SetCpuRunning(true);
}
-void GDisAsmView::OnStep()
+void DisassemblerWidget::OnStep()
{
OnStepInto(); // change later
}
-void GDisAsmView::OnStepInto()
+void DisassemblerWidget::OnStepInto()
{
emu_thread.SetCpuRunning(false);
emu_thread.ExecStep();
}
-void GDisAsmView::OnPause()
+void DisassemblerWidget::OnPause()
{
emu_thread.SetCpuRunning(false);
}
-void GDisAsmView::OnToggleStartStop()
+void DisassemblerWidget::OnToggleStartStop()
{
emu_thread.SetCpuRunning(!emu_thread.IsCpuRunning());
}
-void GDisAsmView::OnCPUStepped()
+void DisassemblerWidget::OnCPUStepped()
{
ARMword next_instr = Core::g_app_core->GetPC();
@@ -131,13 +138,24 @@ void GDisAsmView::OnCPUStepped()
QModelIndex model_index = model->index(index, 0);
disasm_ui.treeView->scrollTo(model_index);
disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+
+ disasm_ui.tableView->scrollTo(model_index);
+ disasm_ui.tableView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+ disasm_ui.tableView->selectionModel()->select(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
}
-int GDisAsmView::SelectedRow()
+int DisassemblerWidget::SelectedRow()
{
QModelIndex index = disasm_ui.treeView->selectionModel()->currentIndex();
if (!index.isValid())
return -1;
return model->itemFromIndex(disasm_ui.treeView->selectionModel()->currentIndex())->row();
-} \ No newline at end of file
+}
+/*
+void DisassemblerWidget::paintEvent()
+{
+ QPainter painter(this);
+ painter.drawRect(10, 10, 50, 50);
+}
+*/ \ No newline at end of file
diff --git a/src/citra_qt/disasm.hxx b/src/citra_qt/debugger/disassembler.hxx
index 0c5a37cac..e5b152d20 100644
--- a/src/citra_qt/disasm.hxx
+++ b/src/citra_qt/debugger/disassembler.hxx
@@ -1,5 +1,5 @@
#include <QDockWidget>
-#include "ui_disasm.h"
+#include "../ui_disassembler.h"
#include "common/common.h"
#include "common/break_points.h"
@@ -8,12 +8,12 @@ class QAction;
class QStandardItemModel;
class EmuThread;
-class GDisAsmView : public QDockWidget
+class DisassemblerWidget : public QDockWidget
{
Q_OBJECT
public:
- GDisAsmView(QWidget* parent, EmuThread& emu_thread);
+ DisassemblerWidget(QWidget* parent, EmuThread& emu_thread);
void Init();
diff --git a/src/citra_qt/debugger/disassembler.ui b/src/citra_qt/debugger/disassembler.ui
new file mode 100644
index 000000000..e65b0aa9b
--- /dev/null
+++ b/src/citra_qt/debugger/disassembler.ui
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DockWidget</class>
+ <widget class="QDockWidget" name="DockWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>430</width>
+ <height>401</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Disassembly</string>
+ </property>
+ <widget class="QWidget" name="dockWidgetContents">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="button_step">
+ <property name="text">
+ <string>Step</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="button_pause">
+ <property name="text">
+ <string>Pause</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="button_continue">
+ <property name="text">
+ <string>Continue</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton">
+ <property name="text">
+ <string>Step Into</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="button_breakpoint">
+ <property name="text">
+ <string>Set Breakpoint</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QTreeView" name="treeView">
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="indentation">
+ <number>20</number>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <attribute name="headerVisible">
+ <bool>false</bool>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTableView" name="tableView">
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <attribute name="headerVisible">
+ <bool>false</bool>
+ </attribute>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/citra_qt/ramview.cpp b/src/citra_qt/debugger/ramview.cpp
index 3f899b95e..3f899b95e 100644
--- a/src/citra_qt/ramview.cpp
+++ b/src/citra_qt/debugger/ramview.cpp
diff --git a/src/citra_qt/ramview.hxx b/src/citra_qt/debugger/ramview.hxx
index 1db1546aa..1db1546aa 100644
--- a/src/citra_qt/ramview.hxx
+++ b/src/citra_qt/debugger/ramview.hxx
diff --git a/src/citra_qt/cpu_regs.cpp b/src/citra_qt/debugger/registers.cpp
index 7e54e18b0..96ceed480 100644
--- a/src/citra_qt/cpu_regs.cpp
+++ b/src/citra_qt/debugger/registers.cpp
@@ -1,9 +1,9 @@
-#include "cpu_regs.hxx"
+#include "registers.hxx"
#include "core/core.h"
-#include "core/arm/interpreter/armdefs.h"
+#include "core/arm/arm_interface.h"
-GARM11RegsView::GARM11RegsView(QWidget* parent) : QDockWidget(parent)
+RegistersWidget::RegistersWidget(QWidget* parent) : QDockWidget(parent)
{
cpu_regs_ui.setupUi(this);
@@ -37,7 +37,7 @@ GARM11RegsView::GARM11RegsView(QWidget* parent) : QDockWidget(parent)
CSPR->addChild(new QTreeWidgetItem(QStringList("N")));
}
-void GARM11RegsView::OnCPUStepped()
+void RegistersWidget::OnCPUStepped()
{
ARM_Interface* app_core = Core::g_app_core;
diff --git a/src/citra_qt/cpu_regs.hxx b/src/citra_qt/debugger/registers.hxx
index 27c194bde..318d95820 100644
--- a/src/citra_qt/cpu_regs.hxx
+++ b/src/citra_qt/debugger/registers.hxx
@@ -1,18 +1,16 @@
-#include "ui_cpu_regs.h"
+#include "../ui_registers.h"
#include <QDockWidget>
#include <QTreeWidgetItem>
-//#include "ui_gekko_regs.h"
-
class QTreeWidget;
-class GARM11RegsView : public QDockWidget
+class RegistersWidget : public QDockWidget
{
Q_OBJECT
public:
- GARM11RegsView(QWidget* parent = NULL);
+ RegistersWidget(QWidget* parent = NULL);
public slots:
void OnCPUStepped();
diff --git a/src/citra_qt/cpu_regs.ui b/src/citra_qt/debugger/registers.ui
index 6537c9cd6..6537c9cd6 100644
--- a/src/citra_qt/cpu_regs.ui
+++ b/src/citra_qt/debugger/registers.ui
diff --git a/src/citra_qt/disasm.ui b/src/citra_qt/disasm.ui
deleted file mode 100644
index fb3845164..000000000
--- a/src/citra_qt/disasm.ui
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DockWidget</class>
- <widget class="QDockWidget" name="DockWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>430</width>
- <height>401</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Disassembly</string>
- </property>
- <widget class="QWidget" name="dockWidgetContents">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QPushButton" name="button_step">
- <property name="text">
- <string>Step</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="button_pause">
- <property name="text">
- <string>Pause</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="button_continue">
- <property name="text">
- <string>Continue</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton">
- <property name="text">
- <string>Step Into</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="button_breakpoint">
- <property name="text">
- <string>Set Breakpoint</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QTreeView" name="treeView">
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="indentation">
- <number>20</number>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <attribute name="headerVisible">
- <bool>false</bool>
- </attribute>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 08fd03b24..f9bf6e881 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -15,10 +15,10 @@
#include "hotkeys.hxx"
//debugger
-#include "disasm.hxx"
-#include "cpu_regs.hxx"
-#include "callstack.hxx"
-#include "ramview.hxx"
+#include "debugger/disassembler.hxx"
+#include "debugger/registers.hxx"
+#include "debugger/callstack.hxx"
+#include "debugger/ramview.hxx"
#include "core/system.h"
#include "core/loader.h"
@@ -36,17 +36,22 @@ GMainWindow::GMainWindow()
ui.horizontalLayout->addWidget(render_window);
//render_window->hide();
- disasm = new GDisAsmView(this, render_window->GetEmuThread());
- addDockWidget(Qt::BottomDockWidgetArea, disasm);
- disasm->hide();
+ disasmWidget = new DisassemblerWidget(this, render_window->GetEmuThread());
+ addDockWidget(Qt::BottomDockWidgetArea, disasmWidget);
+ disasmWidget->hide();
- arm_regs = new GARM11RegsView(this);
- addDockWidget(Qt::RightDockWidgetArea, arm_regs);
- arm_regs->hide();
+ registersWidget = new RegistersWidget(this);
+ addDockWidget(Qt::RightDockWidgetArea, registersWidget);
+ registersWidget->hide();
+
+ callstackWidget = new CallstackWidget(this);
+ addDockWidget(Qt::RightDockWidgetArea, callstackWidget);
+ callstackWidget->hide();
QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging"));
- debug_menu->addAction(disasm->toggleViewAction());
- debug_menu->addAction(arm_regs->toggleViewAction());
+ debug_menu->addAction(disasmWidget->toggleViewAction());
+ debug_menu->addAction(registersWidget->toggleViewAction());
+ debug_menu->addAction(callstackWidget->toggleViewAction());
// Set default UI state
// geometry: 55% of the window contents are in the upper screen half, 45% in the lower half
@@ -78,8 +83,9 @@ GMainWindow::GMainWindow()
connect(ui.action_Hotkeys, SIGNAL(triggered()), this, SLOT(OnOpenHotkeysDialog()));
// BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views before the CPU continues
- connect(&render_window->GetEmuThread(), SIGNAL(CPUStepped()), disasm, SLOT(OnCPUStepped()), Qt::BlockingQueuedConnection);
- connect(&render_window->GetEmuThread(), SIGNAL(CPUStepped()), arm_regs, SLOT(OnCPUStepped()), Qt::BlockingQueuedConnection);
+ connect(&render_window->GetEmuThread(), SIGNAL(CPUStepped()), disasmWidget, SLOT(OnCPUStepped()), Qt::BlockingQueuedConnection);
+ connect(&render_window->GetEmuThread(), SIGNAL(CPUStepped()), registersWidget, SLOT(OnCPUStepped()), Qt::BlockingQueuedConnection);
+ connect(&render_window->GetEmuThread(), SIGNAL(CPUStepped()), callstackWidget, SLOT(OnCPUStepped()), Qt::BlockingQueuedConnection);
// Setup hotkeys
RegisterHotkey("Main Window", "Load Image", QKeySequence::Open);
@@ -124,8 +130,9 @@ void GMainWindow::BootGame(const char* filename)
ERROR_LOG(BOOT, "Failed to load ROM: %s", error_str.c_str());
}
- disasm->Init();
- arm_regs->OnCPUStepped();
+ disasmWidget->Init();
+ registersWidget->OnCPUStepped();
+ callstackWidget->OnCPUStepped();
render_window->GetEmuThread().start();
}
diff --git a/src/citra_qt/main.hxx b/src/citra_qt/main.hxx
index 401705698..77d08f072 100644
--- a/src/citra_qt/main.hxx
+++ b/src/citra_qt/main.hxx
@@ -7,8 +7,9 @@
class GImageInfo;
class GRenderWindow;
-class GDisAsmView;
-class GARM11RegsView;
+class DisassemblerWidget;
+class RegistersWidget;
+class CallstackWidget;
class GMainWindow : public QMainWindow
{
@@ -44,8 +45,10 @@ private:
Ui::MainWindow ui;
GRenderWindow* render_window;
- GDisAsmView* disasm;
- GARM11RegsView* arm_regs;
+
+ DisassemblerWidget* disasmWidget;
+ RegistersWidget* registersWidget;
+ CallstackWidget* callstackWidget;
};
#endif // _CITRA_QT_MAIN_HXX_
diff --git a/src/citra_qt/ui_disasm.h b/src/citra_qt/ui_disassembler.h
index 697a224cb..a0230fe9c 100644
--- a/src/citra_qt/ui_disasm.h
+++ b/src/citra_qt/ui_disassembler.h
@@ -1,13 +1,13 @@
/********************************************************************************
-** Form generated from reading UI file 'disasm.ui'
+** Form generated from reading UI file 'disassembler.ui'
**
** Created by: Qt User Interface Compiler version 4.8.5
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
-#ifndef UI_DISASM_H
-#define UI_DISASM_H
+#ifndef UI_DISASSEMBLER_H
+#define UI_DISASSEMBLER_H
#include <QtCore/QVariant>
#include <QtGui/QAction>
@@ -17,6 +17,7 @@
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QPushButton>
+#include <QtGui/QTableView>
#include <QtGui/QTreeView>
#include <QtGui/QVBoxLayout>
#include <QtGui/QWidget>
@@ -35,6 +36,7 @@ public:
QPushButton *pushButton;
QPushButton *button_breakpoint;
QTreeView *treeView;
+ QTableView *tableView;
void setupUi(QDockWidget *DockWidget)
{
@@ -84,6 +86,12 @@ public:
verticalLayout->addWidget(treeView);
+ tableView = new QTableView(dockWidgetContents);
+ tableView->setObjectName(QString::fromUtf8("tableView"));
+ tableView->setAlternatingRowColors(true);
+
+ verticalLayout->addWidget(tableView);
+
DockWidget->setWidget(dockWidgetContents);
retranslateUi(DockWidget);
@@ -109,4 +117,4 @@ namespace Ui {
QT_END_NAMESPACE
-#endif // UI_DISASM_H
+#endif // UI_DISASSEMBLER_H
diff --git a/src/citra_qt/ui_cpu_regs.h b/src/citra_qt/ui_registers.h
index b8a80b3f2..3111cd09e 100644
--- a/src/citra_qt/ui_cpu_regs.h
+++ b/src/citra_qt/ui_registers.h
@@ -1,13 +1,13 @@
/********************************************************************************
-** Form generated from reading UI file 'cpu_regs.ui'
+** Form generated from reading UI file 'registers.ui'
**
** Created by: Qt User Interface Compiler version 4.8.5
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
-#ifndef UI_CPU_REGS_H
-#define UI_CPU_REGS_H
+#ifndef UI_REGISTERS_H
+#define UI_REGISTERS_H
#include <QtCore/QVariant>
#include <QtGui/QAction>
@@ -66,4 +66,4 @@ namespace Ui {
QT_END_NAMESPACE
-#endif // UI_CPU_REGS_H
+#endif // UI_REGISTERS_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 16:16:18 +0100