Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-19 07:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Debugger: Extend watches: 'WA <n> v' to show video scanner address & video data (aux and/or main or shr 4-byte)

Browse Source
This commit is contained in:
tomcw
2022-10-02 16:28:03 +01:00
parent 4fc07b4a7a
commit dfaaa2823e
6 changed files with 180 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Debugger/Debugger_Display.cpp
+55 -15
View File
@@ -2767,7 +2767,7 @@ void DrawWatches (int line)
#if DEBUG_FORCE_DISPLAY // Watch
if (true)
#else
if (g_aWatches[iWatch].bEnabled)
if (g_aWatches[iWatch].bEnabled && g_aWatches[iWatch].eSource == BP_SRC_MEMORY)
#endif
{
RECT rect2 = rect;
@@ -2779,40 +2779,32 @@ void DrawWatches (int line)
DebuggerSetColorFG( DebuggerGetColor( FG_INFO_BULLET ));
PrintTextCursorX( StrFormat( "%X ", iWatch ).c_str(), rect2 );
// DebuggerSetColorFG( DebuggerGetColor( FG_INFO_OPERATOR ));
// PrintTextCursorX( ".", rect2 );
DebuggerSetColorFG( DebuggerGetColor( FG_DISASM_ADDRESS ));
PrintTextCursorX( WordToHexStr( g_aWatches[iWatch].nAddress ).c_str(), rect2 );
DebuggerSetColorFG( DebuggerGetColor( FG_INFO_OPERATOR ));
PrintTextCursorX( ":", rect2 );
BYTE nTarget8 = 0;
//
nTarget8 = (unsigned)*(LPBYTE)(mem+g_aWatches[iWatch].nAddress);
BYTE nTargetL = *(LPBYTE)(mem + g_aWatches[iWatch].nAddress);
DebuggerSetColorFG( DebuggerGetColor( FG_INFO_OPCODE ));
PrintTextCursorX( ByteToHexStr( nTarget8 ).c_str(), rect2 );
PrintTextCursorX( ByteToHexStr( nTargetL ).c_str(), rect2 );
nTarget8 = (unsigned)*(LPBYTE)(mem+g_aWatches[iWatch].nAddress + 1);
BYTE nTargetH = *(LPBYTE)(mem + ((g_aWatches[iWatch].nAddress + 1) & 0xffff));
DebuggerSetColorFG( DebuggerGetColor( FG_INFO_OPCODE ));
PrintTextCursorX( ByteToHexStr( nTarget8 ).c_str(), rect2 );
PrintTextCursorX( ByteToHexStr( nTargetH ).c_str(), rect2 );
DebuggerSetColorFG( DebuggerGetColor( FG_INFO_OPERATOR ));
PrintTextCursorX( "(", rect2 );
WORD nTarget16 = (unsigned)*(LPWORD)(mem+g_aWatches[iWatch].nAddress);
WORD nTarget16 = (((WORD)nTargetH) << 8) | ((WORD)nTargetL);
DebuggerSetColorFG( DebuggerGetColor( FG_INFO_ADDRESS ));
PrintTextCursorX( WordToHexStr( nTarget16 ).c_str(), rect2 );
DebuggerSetColorFG( DebuggerGetColor( FG_INFO_OPERATOR ));
// PrintTextCursorX( ":", rect2 );
PrintTextCursorX( ")", rect2 );
// BYTE nValue8 = *(LPBYTE)(mem + nTarget16);
// DebuggerSetColorFG( DebuggerGetColor( FG_INFO_OPCODE ));
// PrintTextCursorX( ByteToHexStr( nValue8 ).c_str(), rect2 );
rect.top += g_nFontHeight;
rect.bottom += g_nFontHeight;
@@ -2836,6 +2828,54 @@ void DrawWatches (int line)
PrintTextCursorX( ByteToHexStr( nValue8 ).c_str(), rect2 );
}
}
else if (g_aWatches[iWatch].bEnabled && g_aWatches[iWatch].eSource == BP_SRC_VIDEO_SCANNER)
{
uint32_t data;
int dataSize;
g_aWatches[iWatch].nAddress = NTSC_GetScannerAddressAndData(data, dataSize);
RECT rect2 = rect;
DebuggerSetColorBG(DebuggerGetColor(BG_INFO_WATCH));
DebuggerSetColorFG(DebuggerGetColor(FG_INFO_TITLE));
PrintTextCursorX("W", rect2);
DebuggerSetColorFG(DebuggerGetColor(FG_INFO_BULLET));
PrintTextCursorX(StrFormat("%X ", iWatch).c_str(), rect2);
DebuggerSetColorFG(DebuggerGetColor(FG_DISASM_ADDRESS));
PrintTextCursorX(WordToHexStr(g_aWatches[iWatch].nAddress).c_str(), rect2);
DebuggerSetColorFG(DebuggerGetColor(FG_INFO_OPERATOR));
PrintTextCursorX(":", rect2);
DebuggerSetColorFG(DebuggerGetColor(FG_INFO_OPCODE));
if (dataSize == 1)
{
PrintTextCursorX(ByteToHexStr(data).c_str(), rect2);
}
else if (dataSize == 2)
{
PrintTextCursorX("a:", rect2);
PrintTextCursorX(ByteToHexStr(data>>8).c_str(), rect2);
PrintTextCursorX(" m:", rect2);
PrintTextCursorX(ByteToHexStr(data).c_str(), rect2);
}
else
{
_ASSERT(dataSize == 4);
PrintTextCursorX(DWordToHexStr(data).c_str(), rect2);
}
rect.top += g_nFontHeight;
rect.bottom += g_nFontHeight;
}
else
{
rect.top += g_nFontHeight;
rect.bottom += g_nFontHeight;
}
rect.top += g_nFontHeight;
rect.bottom += g_nFontHeight;
}