summaryrefslogtreecommitdiff
path: root/src/citra_qt/debugger
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra_qt/debugger')
-rw-r--r--src/citra_qt/debugger/disassembler.cpp9
-rw-r--r--src/citra_qt/debugger/disassembler.h9
-rw-r--r--src/citra_qt/debugger/disassembler.ui117
-rw-r--r--src/citra_qt/debugger/graphics_framebuffer.cpp4
4 files changed, 68 insertions, 71 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index c61ace925..54d21dc90 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -17,16 +17,9 @@
17#include "core/arm/skyeye_common/armdefs.h" 17#include "core/arm/skyeye_common/armdefs.h"
18#include "core/arm/disassembler/arm_disasm.h" 18#include "core/arm/disassembler/arm_disasm.h"
19 19
20DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractItemModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
21 20
22} 21DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
23
24QModelIndex DisassemblerModel::index(int row, int column, const QModelIndex& parent) const {
25 return createIndex(row, column);
26}
27 22
28QModelIndex DisassemblerModel::parent(const QModelIndex& child) const {
29 return QModelIndex();
30} 23}
31 24
32int DisassemblerModel::columnCount(const QModelIndex& parent) const { 25int DisassemblerModel::columnCount(const QModelIndex& parent) const {
diff --git a/src/citra_qt/debugger/disassembler.h b/src/citra_qt/debugger/disassembler.h
index 0deccc240..5e19d7c51 100644
--- a/src/citra_qt/debugger/disassembler.h
+++ b/src/citra_qt/debugger/disassembler.h
@@ -2,8 +2,11 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <QAbstractItemModel> 5#pragma once
6
7#include <QAbstractListModel>
6#include <QDockWidget> 8#include <QDockWidget>
9
7#include "ui_disassembler.h" 10#include "ui_disassembler.h"
8 11
9#include "common/common.h" 12#include "common/common.h"
@@ -12,15 +15,13 @@
12class QAction; 15class QAction;
13class EmuThread; 16class EmuThread;
14 17
15class DisassemblerModel : public QAbstractItemModel 18class DisassemblerModel : public QAbstractListModel
16{ 19{
17 Q_OBJECT 20 Q_OBJECT
18 21
19public: 22public:
20 DisassemblerModel(QObject* parent); 23 DisassemblerModel(QObject* parent);
21 24
22 QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
23 QModelIndex parent(const QModelIndex& child) const override;
24 int columnCount(const QModelIndex& parent = QModelIndex()) const override; 25 int columnCount(const QModelIndex& parent = QModelIndex()) const override;
25 int rowCount(const QModelIndex& parent = QModelIndex()) const override; 26 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
26 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; 27 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
diff --git a/src/citra_qt/debugger/disassembler.ui b/src/citra_qt/debugger/disassembler.ui
index bd0752aa4..5ca6dc5d2 100644
--- a/src/citra_qt/debugger/disassembler.ui
+++ b/src/citra_qt/debugger/disassembler.ui
@@ -13,63 +13,66 @@
13 <property name="windowTitle"> 13 <property name="windowTitle">
14 <string>Disassembly</string> 14 <string>Disassembly</string>
15 </property> 15 </property>
16 <widget class="QWidget" name="dockWidgetContents"> 16 <widget class="QWidget" name="dockWidgetContents">
17 <layout class="QVBoxLayout" name="verticalLayout"> 17 <layout class="QVBoxLayout" name="verticalLayout">
18 <item> 18 <item>
19 <layout class="QHBoxLayout" name="horizontalLayout"> 19 <layout class="QHBoxLayout" name="horizontalLayout">
20 <item> 20 <item>
21 <widget class="QPushButton" name="button_step"> 21 <widget class="QPushButton" name="button_step">
22 <property name="text"> 22 <property name="text">
23 <string>Step</string> 23 <string>Step</string>
24 </property> 24 </property>
25 </widget> 25 </widget>
26 </item> 26 </item>
27 <item> 27 <item>
28 <widget class="QPushButton" name="button_pause"> 28 <widget class="QPushButton" name="button_pause">
29 <property name="text"> 29 <property name="text">
30 <string>Pause</string> 30 <string>Pause</string>
31 </property> 31 </property>
32 </widget> 32 </widget>
33 </item> 33 </item>
34 <item> 34 <item>
35 <widget class="QPushButton" name="button_continue"> 35 <widget class="QPushButton" name="button_continue">
36 <property name="text"> 36 <property name="text">
37 <string>Continue</string> 37 <string>Continue</string>
38 </property> 38 </property>
39 </widget> 39 </widget>
40 </item> 40 </item>
41 <item> 41 <item>
42 <widget class="QPushButton" name="pushButton"> 42 <widget class="QPushButton" name="pushButton">
43 <property name="text"> 43 <property name="text">
44 <string>Step Into</string> 44 <string>Step Into</string>
45 </property> 45 </property>
46 </widget> 46 </widget>
47 </item> 47 </item>
48 <item> 48 <item>
49 <widget class="QPushButton" name="button_breakpoint"> 49 <widget class="QPushButton" name="button_breakpoint">
50 <property name="text"> 50 <property name="text">
51 <string>Set Breakpoint</string> 51 <string>Set Breakpoint</string>
52 </property> 52 </property>
53 </widget> 53 </widget>
54 </item> 54 </item>
55 </layout> 55 </layout>
56 </item> 56 </item>
57 <item> 57 <item>
58 <widget class="QTreeView" name="treeView"> 58 <widget class="QTreeView" name="treeView">
59 <property name="alternatingRowColors"> 59 <property name="alternatingRowColors">
60 <bool>true</bool> 60 <bool>true</bool>
61 </property> 61 </property>
62 <property name="indentation"> 62 <property name="indentation">
63 <number>20</number> 63 <number>20</number>
64 </property> 64 </property>
65 <property name="rootIsDecorated"> 65 <property name="rootIsDecorated">
66 <bool>false</bool> 66 <bool>false</bool>
67 </property> 67 </property>
68 <attribute name="headerVisible"> 68 <property name="uniformRowHeights">
69 <bool>false</bool> 69 <bool>true</bool>
70 </attribute> 70 </property>
71 </widget> 71 <attribute name="headerVisible">
72 </item> 72 <bool>false</bool>
73 </attribute>
74 </widget>
75 </item>
73 </layout> 76 </layout>
74 </widget> 77 </widget>
75 </widget> 78 </widget>
diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp
index a9423d6c7..43c59738f 100644
--- a/src/citra_qt/debugger/graphics_framebuffer.cpp
+++ b/src/citra_qt/debugger/graphics_framebuffer.cpp
@@ -170,8 +170,8 @@ void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value)
170 170
171void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value) 171void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value)
172{ 172{
173 if (framebuffer_height != new_value) { 173 if (framebuffer_height != static_cast<unsigned>(new_value)) {
174 framebuffer_height = new_value; 174 framebuffer_height = static_cast<unsigned>(new_value);
175 175
176 framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom)); 176 framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom));
177 emit Update(); 177 emit Update();
HIC SVNT DRACONES