ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fix for jump address line function in debugger. Logic change to only show address look ahead for addresses seen in operand part of assembly line.

This commit is contained in:
mjbudd77 2021-07-23 22:40:10 -04:00
parent 558a76ccc2
commit f0b3754d45
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/drivers/Qt/ConsoleDebugger.cpp
View File

@ -3115,7 +3115,7 @@ int QAsmView::getAsmLineFromAddr(int addr)
if ( asmEntry[line]->addr < addr )
{
nextLine = line + 1;
if ( asmEntry[line]->addr > asmEntry[nextLine]->addr )
if ( asmEntry[nextLine]->addr > addr )
{
break;
}
@ -3124,7 +3124,7 @@ int QAsmView::getAsmLineFromAddr(int addr)
else if ( asmEntry[line]->addr > addr )
{
nextLine = line - 1;
if ( asmEntry[line]->addr < asmEntry[nextLine]->addr )
if ( asmEntry[nextLine]->addr < addr )
{
break;
}
@ -4883,10 +4883,10 @@ bool QAsmView::event(QEvent *event)
asmEntry[line]->addr, asmEntry[line]->bank, asmEntry[line]->rom );
}
static_cast<asmLookAheadPopup*>(fceuCustomToolTipShow( helpEvent, new asmLookAheadPopup(asmEntry[line]->addr, this) ));
//QToolTip::showText(helpEvent->globalPos(), tr(stmp), this );
QToolTip::hideText();
event->ignore();
//static_cast<asmLookAheadPopup*>(fceuCustomToolTipShow( helpEvent, new asmLookAheadPopup(asmEntry[line]->addr, this) ));
QToolTip::showText(helpEvent->globalPos(), tr(stmp), this );
//QToolTip::hideText();
//event->ignore();
}
else if ( showOperandAddrDesc )
{
@ -5705,11 +5705,14 @@ void QAsmView::drawAsmLine( QPainter *painter, int x, int y, const char *txt )
// Opcode Area
painter->setPen( opcodeColor );
while ( (i<operandLinePos) && (txt[i] != 0) )
if ( txt[i] != ' ' ) // Skip over undefined opcodes
{
c[0] = txt[i];
painter->drawText( x, y, tr(c) );
i++; x += pxCharWidth;
while ( (i<operandLinePos) && (txt[i] != 0) )
{
c[0] = txt[i];
painter->drawText( x, y, tr(c) );
i++; x += pxCharWidth;
}
}
// Operand Area