aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/citra_qt/src/disasm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra_qt/src/disasm.cpp')
-rw-r--r--src/citra_qt/src/disasm.cpp126
1 files changed, 59 insertions, 67 deletions
diff --git a/src/citra_qt/src/disasm.cpp b/src/citra_qt/src/disasm.cpp
index 6e4087b2..2d1c61a7 100644
--- a/src/citra_qt/src/disasm.cpp
+++ b/src/citra_qt/src/disasm.cpp
@@ -8,12 +8,11 @@
#include "common.h"
#include "mem_map.h"
+#include "core.h"
#include "break_points.h"
-//#include "powerpc/cpu_core_regs.h"
+#include "arm/armdefs.h"
#include "arm/disassembler/arm_disasm.h"
-//#include "powerpc/interpreter/cpu_int.h"
-
GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread)
{
disasm_ui.setupUi(this);
@@ -21,50 +20,83 @@ GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(p
breakpoints = new BreakPoints();
model = new QStandardItemModel(this);
- model->setColumnCount(3);
+ model->setColumnCount(2);
disasm_ui.treeView->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);
-// RegisterHotkey("Disassembler", "Pause", QKeySequence(Qt::Key_F5), Qt::ApplicationShortcut);
- RegisterHotkey("Disassembler", "Continue", QKeySequence(Qt::Key_F5), Qt::ApplicationShortcut);
RegisterHotkey("Disassembler", "Set Breakpoint", QKeySequence(Qt::Key_F9), Qt::ApplicationShortcut);
connect(disasm_ui.button_breakpoint, SIGNAL(clicked()), this, SLOT(OnSetBreakpoint()));
connect(disasm_ui.button_step, SIGNAL(clicked()), this, SLOT(OnStep()));
connect(disasm_ui.button_pause, SIGNAL(clicked()), this, SLOT(OnPause()));
connect(disasm_ui.button_continue, SIGNAL(clicked()), this, SLOT(OnContinue()));
+
+ connect(GetHotkey("Disassembler", "Start/Stop", this), SIGNAL(activated()), this, SLOT(OnToggleStartStop()));
connect(GetHotkey("Disassembler", "Step", this), SIGNAL(activated()), this, SLOT(OnStep()));
connect(GetHotkey("Disassembler", "Step into", this), SIGNAL(activated()), this, SLOT(OnStepInto()));
-// connect(GetHotkey("Disassembler", "Pause", this), SIGNAL(activated()), this, SLOT(OnPause()));
- connect(GetHotkey("Disassembler", "Continue", this), SIGNAL(activated()), this, SLOT(OnContinue()));
connect(GetHotkey("Disassembler", "Set Breakpoint", this), SIGNAL(activated()), this, SLOT(OnSetBreakpoint()));
}
+void GDisAsmView::Init()
+{
+ ARMul_State* state = Core::GetState();
+ Arm* disasm = new Arm();
+
+ base_addr = state->pc;
+ unsigned int curInstAddr = base_addr;
+ char result[255];
+
+ for (int i = 0; i < 10000; i++) // fixed for now
+ {
+ disasm->disasm(curInstAddr, Memory::Read32(curInstAddr), result);
+ model->setItem(i, 0, new QStandardItem(QString("0x%1").arg((uint)(curInstAddr), 8, 16, QLatin1Char('0'))));
+ model->setItem(i, 1, new QStandardItem(QString(result)));
+ curInstAddr += 4;
+ }
+ disasm_ui.treeView->resizeColumnToContents(0);
+ disasm_ui.treeView->resizeColumnToContents(1);
+
+ QModelIndex model_index = model->index(0, 0);
+ disasm_ui.treeView->scrollTo(model_index);
+ disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+}
+
void GDisAsmView::OnSetBreakpoint()
{
- if (SelectedRow() == -1)
+ int selected_row = SelectedRow();
+
+ if (selected_row == -1)
return;
- u32 address = base_addr + 4 * SelectedRow();
+ u32 address = base_addr + (selected_row * 4);
if (breakpoints->IsAddressBreakPoint(address))
{
breakpoints->Remove(address);
- model->item(SelectedRow(), 0)->setBackground(QBrush());
- model->item(SelectedRow(), 1)->setBackground(QBrush());
- model->item(SelectedRow(), 2)->setBackground(QBrush());
+ model->item(selected_row, 0)->setBackground(QBrush());
+ model->item(selected_row, 1)->setBackground(QBrush());
}
else
{
breakpoints->Add(address);
- model->item(SelectedRow(), 0)->setBackground(Qt::red);
- model->item(SelectedRow(), 1)->setBackground(Qt::red);
- model->item(SelectedRow(), 2)->setBackground(Qt::red);
+ model->item(selected_row, 0)->setBackground(QBrush(QColor(0xFF, 0x99, 0x99)));
+ model->item(selected_row, 1)->setBackground(QBrush(QColor(0xFF, 0x99, 0x99)));
}
}
+void GDisAsmView::OnContinue()
+{
+ emu_thread.SetCpuRunning(true);
+}
+
void GDisAsmView::OnStep()
{
+ OnStepInto(); // change later
+}
+
+void GDisAsmView::OnStepInto()
+{
emu_thread.SetCpuRunning(false);
emu_thread.ExecStep();
}
@@ -74,64 +106,24 @@ void GDisAsmView::OnPause()
emu_thread.SetCpuRunning(false);
}
-void GDisAsmView::OnContinue()
+void GDisAsmView::OnToggleStartStop()
{
- emu_thread.SetCpuRunning(true);
+ emu_thread.SetCpuRunning(!emu_thread.IsCpuRunning());
}
void GDisAsmView::OnCPUStepped()
{
- /*
- base_addr = ireg.PC - 52;
- unsigned int curInstAddr = base_addr;
- int counter = 0;
- QModelIndex cur_instr_index;
- model->setRowCount(100);
- while(true)
- {
- u32 opcode = *(u32*)(&Mem_RAM[curInstAddr & RAM_MASK]);
-
- char out1[64];
- char out2[128];
- u32 out3 = 0;
- memset(out1, 0, sizeof(out1));
- memset(out2, 0, sizeof(out2));
-
- // NOTE: out3 (nextInstAddr) seems to be bugged, better don't use it...
- DisassembleGekko(out1, out2, opcode, curInstAddr, &out3);
- model->setItem(counter, 0, new QStandardItem(QString("0x%1").arg((uint)curInstAddr, 8, 16, QLatin1Char('0'))));
- model->setItem(counter, 1, new QStandardItem(QString(out1)));
- model->setItem(counter, 2, new QStandardItem(QString(out2)));
-
- if (ireg.PC == curInstAddr)
- {
- model->item(counter, 0)->setBackground(Qt::yellow);
- model->item(counter, 1)->setBackground(Qt::yellow);
- model->item(counter, 2)->setBackground(Qt::yellow);
- cur_instr_index = model->index(counter, 0);
- }
- else if (Debugger::IsBreakpoint(curInstAddr))
- {
- model->item(counter, 0)->setBackground(Qt::red);
- model->item(counter, 1)->setBackground(Qt::red);
- model->item(counter, 2)->setBackground(Qt::red);
- }
- else
- {
- model->item(counter, 0)->setBackground(QBrush());
- model->item(counter, 1)->setBackground(QBrush());
- model->item(counter, 2)->setBackground(QBrush());
- }
- curInstAddr += 4;
+ ARMword next_instr = Core::GetState()->pc;
- ++counter;
- if (counter >= 100) break;
+ if (breakpoints->IsAddressBreakPoint(next_instr))
+ {
+ emu_thread.SetCpuRunning(false);
}
- disasm_ui.treeView->resizeColumnToContents(0);
- disasm_ui.treeView->resizeColumnToContents(1);
- disasm_ui.treeView->resizeColumnToContents(2);
- disasm_ui.treeView->scrollTo(cur_instr_index); // QAbstractItemView::PositionAtCenter?
- */
+
+ unsigned int index = (next_instr - base_addr) / 4;
+ QModelIndex model_index = model->index(index, 0);
+ disasm_ui.treeView->scrollTo(model_index);
+ disasm_ui.treeView->selectionModel()->setCurrentIndex(model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
}
int GDisAsmView::SelectedRow()
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 05:21:14 +0000