PCSX2/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-10-12 02:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Fix some infinite loops

Browse Source
This commit is contained in:
chaoticgd
2025-11-17 07:17:57 +01:00
committed by lightningterror
parent 780c599b49
commit 4209900351
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2-qt/Debugger/DisassemblyView.cpp
+6 -6
View File
@@ -424,7 +424,7 @@ void DisassemblyView::paintEvent(QPaintEvent* event)
bool alternate = m_visibleStart % 8;
// Draw visible disassembly rows
for (u32 i = 0; i <= m_visibleRows; i++)
for (u32 i = 0; i < m_visibleRows + 1; i++)
{
// Address of instruction being displayed on row
const u32 rowAddress = (i * 4) + m_visibleStart;
@@ -977,18 +977,18 @@ QColor DisassemblyView::GetAddressFunctionColor(u32 address)
QString DisassemblyView::FetchSelectionInfo(SelectionInfo selInfo)
{
QString infoBlock;
for (u32 i = m_selectedAddressStart; i <= m_selectedAddressEnd; i += 4)
for (u64 i = m_selectedAddressStart; i <= m_selectedAddressEnd; i += 4)
{
if (i != m_selectedAddressStart)
infoBlock += '\n';
if (selInfo == SelectionInfo::ADDRESS)
{
infoBlock += FilledQStringFromValue(i, 16);
infoBlock += FilledQStringFromValue(static_cast<u32>(i), 16);
}
else if (selInfo == SelectionInfo::INSTRUCTIONTEXT)
{
DisassemblyLineInfo line;
m_disassemblyManager.getLine(i, true, line);
m_disassemblyManager.getLine(static_cast<u32>(i), true, line);
infoBlock += QString("%1 %2").arg(line.name.c_str()).arg(line.params.c_str());
}
else // INSTRUCTIONHEX
@@ -1075,9 +1075,9 @@ void DisassemblyView::setInstructions(u32 start, u32 end, u32 value)
bool DisassemblyView::AddressCanRestore(u32 start, u32 end)
{
for (u32 i = start; i <= end; i += 4)
for (u64 i = start; i <= end; i += 4)
{
if (this->m_nopedInstructions.find(i) != this->m_nopedInstructions.end())
if (this->m_nopedInstructions.find(static_cast<u32>(i)) != this->m_nopedInstructions.end())
{
return true;
}
pcsx2/DebugTools/MIPSAnalyst.cpp
+3 -1
View File
@@ -186,7 +186,9 @@ namespace MIPSAnalyst
bool suspectedNoReturn = false;
u32 addr;
for (addr = startAddr; addr <= endAddr; addr += 4) {
for (u64 i = startAddr; i <= endAddr; i += 4) {
addr = static_cast<u32>(i);
// Use pre-existing symbol map info if available. May be more reliable.
ccc::FunctionHandle existing_symbol_handle = database.functions.first_handle_from_starting_address(addr);
const ccc::Function* existing_symbol = database.functions.symbol_from_handle(existing_symbol_handle);