empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disk: improve DebugTrackWOZ() func

Browse source
This commit is contained in:
tomcw 2021-02-20 12:32:29 +00:00
parent 0bb34bfb48
commit 2cd2f013e6
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
source/Disk.cpp
View file

@ -1360,6 +1360,7 @@ void Disk2InterfaceCard::DataShiftWriteWOZ(WORD pc, WORD addr, ULONG uExecutedCy
#ifdef _DEBUG #ifdef _DEBUG
// Dump nibbles from current position bitstream wraps to same position // Dump nibbles from current position bitstream wraps to same position
// NB. Need to define LOG_DISK_NIBBLES_READ so that GetReadD5AAxxDetectedString() works.
void Disk2InterfaceCard::DumpTrackWOZ(FloppyDisk floppy) // pass a copy of m_floppy void Disk2InterfaceCard::DumpTrackWOZ(FloppyDisk floppy) // pass a copy of m_floppy
{ {
FormatTrack formatTrack(true); FormatTrack formatTrack(true);
@ -1368,7 +1369,7 @@ void Disk2InterfaceCard::DumpTrackWOZ(FloppyDisk floppy) // pass a copy of m_flo
UINT zeroCount = 0; UINT zeroCount = 0;
UINT nibbleCount = 0; UINT nibbleCount = 0;
const UINT startBitOffset = 0; const UINT startBitOffset = 0; // NB. may need to tweak this offset, since the bistream is a circular buffer
floppy.m_bitOffset = startBitOffset; floppy.m_bitOffset = startBitOffset;
floppy.m_byte = floppy.m_bitOffset / 8; floppy.m_byte = floppy.m_bitOffset / 8;
@ -1376,10 +1377,10 @@ void Disk2InterfaceCard::DumpTrackWOZ(FloppyDisk floppy) // pass a copy of m_flo
floppy.m_bitMask = 1 << remainder; floppy.m_bitMask = 1 << remainder;
bool newLine = true; bool newLine = true;
TCHAR str[20];
while (1) while (1)
{ {
TCHAR str[10];
if (newLine) if (newLine)
{ {
newLine = false; newLine = false;
@ -1390,22 +1391,9 @@ void Disk2InterfaceCard::DumpTrackWOZ(FloppyDisk floppy) // pass a copy of m_flo
BYTE n = floppy.m_trackimage[floppy.m_byte]; BYTE n = floppy.m_trackimage[floppy.m_byte];
BYTE outputBit = (n & floppy.m_bitMask) ? 1 : 0; BYTE outputBit = (n & floppy.m_bitMask) ? 1 : 0;
floppy.m_bitMask >>= 1; IncBitStream(floppy);
if (!floppy.m_bitMask)
{
floppy.m_bitMask = 1 << 7;
floppy.m_byte++;
}
floppy.m_bitOffset++; if (startBitOffset == floppy.m_bitOffset) // done complete track?
if (floppy.m_bitOffset == floppy.m_bitCount)
{
floppy.m_bitMask = 1 << 7;
floppy.m_bitOffset = 0;
floppy.m_byte = 0;
}
if (startBitOffset == floppy.m_bitOffset)
break; break;
if (shiftReg == 0 && outputBit == 0) if (shiftReg == 0 && outputBit == 0)
@ -1445,6 +1433,21 @@ void Disk2InterfaceCard::DumpTrackWOZ(FloppyDisk floppy) // pass a copy of m_flo
zeroCount = 0; zeroCount = 0;
} }
// Output any remaining zeroCount
if (zeroCount)
{
char syncBits = zeroCount <= 9 ? '0'+zeroCount : '+';
StringCbPrintf(str, sizeof(str), "(%c)", syncBits);
OutputDebugString(str);
}
// Output any partial nibble
if (shiftReg)
{
StringCbPrintf(str, sizeof(str), "%02X/Partial Nibble", shiftReg);
OutputDebugString(str);
}
// Output any remaining "read D5AAxx detected" // Output any remaining "read D5AAxx detected"
if (nibbleCount % 32) if (nibbleCount % 32)
{ {