Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debugger: Memory search increased/decreased/changed + results count #10837

Merged
merged 1 commit into from
Mar 2, 2024
Merged

Debugger: Memory search increased/decreased/changed + results count #10837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pcsx2-qt/Debugger/CpuWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
using namespace QtUtils;
using namespace MipsStackWalk;


CpuWidget::CpuWidget(QWidget* parent, DebugInterface& cpu)
: m_cpu(cpu)
, m_bpModel(cpu)
Expand Down
4 changes: 0 additions & 4 deletions pcsx2-qt/Debugger/CpuWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ class CpuWidget final : public QWidget
CpuWidget(QWidget* parent, DebugInterface& cpu);
~CpuWidget();


// Note: The order of these enum values must reflect the order in thee Search Comparison combobox.

public slots:
void paintEvent(QPaintEvent* event);

Expand Down Expand Up @@ -92,7 +89,6 @@ public slots:
m_ui.memoryviewWidget->update();
};


void saveBreakpointsToDebuggerSettings();
void saveSavedAddressesToDebuggerSettings();

Expand Down
2 changes: 1 addition & 1 deletion pcsx2-qt/Debugger/CpuWidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
<attribute name="title">
<string>Memory Search</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<layout class="QHBoxLayout" name="horizontalLayout_10">
<property name="spacing">
<number>0</number>
</property>
Expand Down
7 changes: 0 additions & 7 deletions pcsx2-qt/Debugger/DisassemblyWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ void DisassemblyWidget::paintEvent(QPaintEvent* event)
std::vector<BranchLine> branchLines = m_disassemblyManager.getBranchLines(m_visibleStart, visibleEnd - m_visibleStart);

s32 branchCount = 0;
s32 skippedBranches = 0;
for (const auto& branchLine : branchLines)
{
if (branchCount == (m_showInstructionOpcode ? 3 : 5))
Expand Down Expand Up @@ -453,12 +452,6 @@ void DisassemblyWidget::paintEvent(QPaintEvent* event)
bottom = (((branchLine.second - m_visibleStart) / 4) * m_rowHeight) + (m_rowHeight / 2);
}

if ((top < 0 && bottom < 0) || (top > winBottom && bottom > winBottom) || (top < 0 && bottom > winBottom) || (top > winBottom && bottom < 0))
{
skippedBranches++;
continue;
}

branchCount++;

if (branchLine.first == m_selectedAddressStart || branchLine.second == m_selectedAddressStart)
Expand Down
Loading
Loading