dahjah/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2025-12-16 04:08:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Debugger: Move position of paste instruction text in context menu

Browse Source
This commit is contained in:
sean 2025-09-27 09:56:26 -04:00 committed by Ty
parent 51ee8f4015
commit 36157402c8
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
pcsx2-qt/Debugger/DisassemblyView.cpp
View File

@ -21,6 +21,7 @@
#include <QtWidgets/QInputDialog>
#include <QtWidgets/QMessageBox>
#include "SymbolTree/NewSymbolDialogs.h"
#include "common/StringUtil.h"
using namespace QtUtils;
@ -106,6 +107,32 @@ void DisassemblyView::contextCopyInstructionText()
QGuiApplication::clipboard()->setText(FetchSelectionInfo(SelectionInfo::INSTRUCTIONTEXT));
}
void DisassemblyView::contextPasteInstructionText()
{
if (!cpu().isCpuPaused())
{
QMessageBox::warning(this, tr("Assemble Error"), tr("Unable to change assembly while core is running"));
return;
}
QString clipboardText = QApplication::clipboard()->text();
std::vector<std::string> newInstructions = StringUtil::splitOnNewLine(clipboardText.toLocal8Bit().constData());
int newInstructionsSize = newInstructions.size();
for (int instructionIdx = 0; instructionIdx < newInstructionsSize; instructionIdx++)
{
u32 replaceAddress = m_selectedAddressStart + instructionIdx * 4;
u32 encodedInstruction;
std::string errorText;
bool valid = MipsAssembleOpcode(newInstructions[instructionIdx].c_str(), &cpu(), replaceAddress, encodedInstruction, errorText);
if (!valid)
{
QMessageBox::warning(this, tr("Assemble Error"), QString::fromStdString(errorText));
return;
}
setInstructions(replaceAddress, replaceAddress, encodedInstruction);
}
}
void DisassemblyView::contextAssembleInstruction()
{
if (!cpu().isCpuPaused())
@ -135,31 +162,6 @@ void DisassemblyView::contextAssembleInstruction()
setInstructions(m_selectedAddressStart, m_selectedAddressEnd, encodedInstruction);
}
void DisassemblyView::contextPasteInstructionText()
{
if (!cpu().isCpuPaused())
{
QMessageBox::warning(this, tr("Assemble Error"), tr("Unable to change assembly while core is running"));
return;
}
std::vector<std::string> newInstructions = StringUtil::splitOnNewLine(QApplication::clipboard()->text());
for (int instructionIdx = 0; instructionIdx < newInstructions.size(); instructionIdx++)
{
u32 replaceAddress = m_selectedAddressStart + instructionIdx * 4;
u32 encodedInstruction;
std::string errorText;
bool valid = MipsAssembleOpcode(newInstructions[instructionIdx].c_str(), &cpu(), replaceAddress, encodedInstruction, errorText);
if (!valid)
{
QMessageBox::warning(this, tr("Assemble Error"), QString::fromStdString(errorText));
return;
}
setInstructions(replaceAddress, replaceAddress + 4, encodedInstruction);
}
}
void DisassemblyView::contextNoopInstruction()
{
setInstructions(m_selectedAddressStart, m_selectedAddressEnd, 0);
@ -731,6 +733,9 @@ void DisassemblyView::openContextMenu(QPoint pos)
connect(copy_function_name_action, &QAction::triggered, this, &DisassemblyView::contextCopyFunctionName);
}
QAction* paste_instruction_text_action = menu->addAction(tr("Paste Instruction Text"));
connect(paste_instruction_text_action, &QAction::triggered, this, &DisassemblyView::contextPasteInstructionText);
menu->addSeparator();
if (AddressCanRestore(m_selectedAddressStart, m_selectedAddressEnd))

1
pcsx2-qt/Debugger/DisassemblyView.h
View File

@ -43,6 +43,7 @@ public slots:
void contextCopyInstructionHex();
void contextCopyInstructionText();
void contextCopyFunctionName();
void contextPasteInstructionText();
void contextAssembleInstruction();
void contextNoopInstruction();
void contextRestoreInstruction();