starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-05-21 07:26:42 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

Qt: Restore disassembly register previews in debugger

Browse Source 
Probably got lost when I added branch lines.
This commit is contained in:
Stenzek
2025-12-31 20:41:27 +10:00
parent 67bb75250b
commit 45dd5001cd
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/duckstation-qt/debuggercodeview.cpp
View File

@@ -2,6 +2,7 @@
// SPDX-License-Identifier: CC-BY-NC-ND-4.0 // SPDX-License-Identifier: CC-BY-NC-ND-4.0
#include "debuggercodeview.h" #include "debuggercodeview.h"
#include "qtutils.h"
#include "core/bus.h" #include "core/bus.h"
#include "core/cpu_core.h" #include "core/cpu_core.h"
@@ -344,6 +345,7 @@ void DebuggerCodeView::drawInstruction(QPainter& painter, VirtualMemoryAddress a
x += ADDRESS_COLUMN_WIDTH; x += ADDRESS_COLUMN_WIDTH;
// Draw instruction bytes // Draw instruction bytes
SmallString str;
if (u32 instruction_bits; CPU::SafeReadInstruction(address, &instruction_bits)) if (u32 instruction_bits; CPU::SafeReadInstruction(address, &instruction_bits))
{ {
const QString bytes_text = QString::asprintf("%08X", instruction_bits); const QString bytes_text = QString::asprintf("%08X", instruction_bits);
@@ -351,9 +353,8 @@ void DebuggerCodeView::drawInstruction(QPainter& painter, VirtualMemoryAddress a
painter.drawText(x, y, bytes_text); painter.drawText(x, y, bytes_text);
x += BYTES_COLUMN_WIDTH; x += BYTES_COLUMN_WIDTH;
SmallString str;
CPU::DisassembleInstruction(&str, address, instruction_bits); CPU::DisassembleInstruction(&str, address, instruction_bits);
const QString disasm_text = QString::fromUtf8(str.c_str(), static_cast<int>(str.length())); const QString disasm_text = QtUtils::StringViewToQString(str);
painter.setPen(instruction_color); painter.setPen(instruction_color);
// Highlight registers and immediates in the disassembly // Highlight registers and immediates in the disassembly
@@ -379,6 +380,17 @@ void DebuggerCodeView::drawInstruction(QPainter& painter, VirtualMemoryAddress a
start_pos = end_pos; start_pos = end_pos;
} }
if (is_pc)
{
str.clear();
CPU::DisassembleInstructionComment(&str, address, instruction_bits);
if (!str.empty())
{
painter.setPen(address_color);
painter.drawText(COMMENT_COLUMN_START, y, QtUtils::StringViewToQString(str));
}
}
} }
else else
{ {