From 780b3a9daa6a4c4eca9c095ad990334b43cc0dfa Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Thu, 7 Feb 2019 17:57:22 +0100 Subject: Correct display of jump and branch instructions. Signed-off-by: Pavel Pisa --- qtmips_gui/coreview/instructionview.cpp | 2 +- qtmips_gui/programdock.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'qtmips_gui') diff --git a/qtmips_gui/coreview/instructionview.cpp b/qtmips_gui/coreview/instructionview.cpp index 342a1d4..d989b7b 100644 --- a/qtmips_gui/coreview/instructionview.cpp +++ b/qtmips_gui/coreview/instructionview.cpp @@ -67,7 +67,7 @@ void InstructionView::paint(QPainter *painter, const QStyleOptionGraphicsItem *o void InstructionView::instruction_update(const machine::Instruction &i, std::uint32_t inst_addr) { QRectF prev_box = boundingRect(); - text.setText(i.to_str()); + text.setText(i.to_str(inst_addr)); QRectF box = text.boundingRect(); text.setPos(-box.width()/2, GAP); update(prev_box.united(boundingRect())); diff --git a/qtmips_gui/programdock.cpp b/qtmips_gui/programdock.cpp index 192352b..4c379eb 100644 --- a/qtmips_gui/programdock.cpp +++ b/qtmips_gui/programdock.cpp @@ -111,7 +111,7 @@ QList ProgramView::row_widget(std::uint32_t address, QWidget *parent) l->setFont(f); l->setMinimumWidth(60); if (memory != nullptr) - l->setText(machine::Instruction(memory->read_word(address)).to_str()); + l->setText(machine::Instruction(memory->read_word(address)).to_str(address)); widgs.append(l); return widgs; -- cgit v1.2.3