Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14658 from VampireFlower/patch-instruction-assemble

Browse Source 
[Debugger]: Assemble instructions in the patch instruction dialog
This commit is contained in:
Admiral H. Curtiss
2026-06-28 16:31:46 +02:00
committed by GitHub
parent d034d41fcc 7ce4db1c7d
commit be33a68335
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinQt/Debugger/PatchInstructionDialog.cpp
+37 -6
View File
@@ -9,7 +9,9 @@
#include <QPushButton> #include <QPushButton>
#include <QVBoxLayout> #include <QVBoxLayout>
#include "Common/Assembler/GekkoAssembler.h"
#include "Common/GekkoDisassembler.h" #include "Common/GekkoDisassembler.h"
#include "Common/Swap.h"
PatchInstructionDialog::PatchInstructionDialog(QWidget* parent, u32 address, u32 value) PatchInstructionDialog::PatchInstructionDialog(QWidget* parent, u32 address, u32 value)
: QDialog(parent), m_address(address) : QDialog(parent), m_address(address)
@@ -49,14 +51,43 @@ void PatchInstructionDialog::ConnectWidgets()
void PatchInstructionDialog::OnEditChanged() void PatchInstructionDialog::OnEditChanged()
{ {
bool good; const QString input = m_input_edit->text();
m_code = m_input_edit->text().toUInt(&good, 16);
m_button_box->button(QDialogButtonBox::Ok)->setEnabled(good); bool legal = false;
bool is_hex = false;
m_preview_label->setText( QString preview = QStringLiteral("(ill)\t---");
tr("Instruction: %1")
.arg(QString::fromStdString(Common::GekkoDisassembler::Disassemble(m_code, m_address)))); const u32 hex_code = input.toUInt(&is_hex, 16);
if (is_hex)
{
legal = true;
m_code = hex_code;
preview = QString::fromStdString(Common::GekkoDisassembler::Disassemble(hex_code, m_address));
}
else // Try to parse as a single instruction
{
const auto asm_result = Common::GekkoAssembler::Assemble(input.toStdString(), m_address);
if (!Common::GekkoAssembler::IsFailure(asm_result))
{
const auto& blocks = Common::GekkoAssembler::GetT(asm_result);
if (!blocks.empty())
{
legal = true;
m_code = Common::swap32(blocks[0].instructions.data());
preview = QStringLiteral("%1").arg(m_code, 8, 16, QLatin1Char('0'));
}
}
}
m_button_box->button(QDialogButtonBox::Ok)->setEnabled(legal);
m_preview_label->setText(tr("Instruction: %1").arg(preview));
} }
u32 PatchInstructionDialog::GetCode() const u32 PatchInstructionDialog::GetCode() const