Debugger: Added DMC sample tracking to CDL files + a highlight option for it in the memory viewer

Author: SourMesen

Core/Debugger.cpp

@@ -417,6 +417,13 @@ bool Debugger::PrivateProcessRamOperation(MemoryOperationType type, uint16_t &ad
 {
 	OperationInfo operationInfo { addr, (int16_t)value, type };
 
+	bool isDmcRead = false;
+	if(type == MemoryOperationType::DmcRead) {
+		//Used to flag the data in the CDL file
+		isDmcRead = true;
+		type = MemoryOperationType::Read;
+	}
+
 	ProcessCpuOperation(addr, value, type);
 
 	if(type == MemoryOperationType::ExecOpCode) {
@@ -471,6 +478,9 @@ bool Debugger::PrivateProcessRamOperation(MemoryOperationType type, uint16_t &ad
 			_codeDataLogger->SetFlag(absoluteAddr, CdlPrgFlags::Code);
 		} else if(type == MemoryOperationType::Read) {
 			_codeDataLogger->SetFlag(absoluteAddr, CdlPrgFlags::Data);
+			if(isDmcRead) {
+				_codeDataLogger->SetFlag(absoluteAddr, CdlPrgFlags::PcmData);
+			}
 		}
 	} else if(addr < 0x2000 || absoluteRamAddr >= 0) {
 		if(type == MemoryOperationType::Write) {

Core/DeltaModulationChannel.cpp

@@ -60,7 +60,7 @@ void DeltaModulationChannel::StartDmcTransfer()
 void DeltaModulationChannel::FillReadBuffer()
 {
 	if(_bytesRemaining > 0) {
-		_readBuffer = _memoryManager->Read(_currentAddr);
+		_readBuffer = _memoryManager->Read(_currentAddr, MemoryOperationType::DmcRead);
 		_bufferEmpty = false;
 
 		_currentAddr++;

Core/Types.h

@@ -15,7 +15,8 @@ enum class MemoryOperationType
 	ExecOpCode = 2,
 	ExecOperand = 3,
 	PpuRenderingRead = 4,
-	DummyRead = 5
+	DummyRead = 5,
+	DmcRead = 6
 };
 
 struct State

GUI.NET/Config/DebugInfo.cs

@@ -138,12 +138,14 @@ public class DebugInfo
 		public bool RamHighlightChrReadBytes = false;
 		public bool RamHighlightCodeBytes = false;
 		public bool RamHighlightDataBytes = false;
+		public bool RamHighlightDmcDataBytes = false;
 		public XmlColor RamReadColor = Color.Blue;
 		public XmlColor RamWriteColor = Color.Red;
 		public XmlColor RamExecColor = Color.Green;
 		public XmlColor RamLabelledByteColor = Color.LightPink;
 		public XmlColor RamCodeByteColor = Color.DarkSeaGreen;
 		public XmlColor RamDataByteColor = Color.LightSteelBlue;
+		public XmlColor RamDmcDataByteColor = Color.Gold;
 		public XmlColor RamChrDrawnByteColor = Color.DarkSeaGreen;
 		public XmlColor RamChrReadByteColor = Color.LightSteelBlue;
 

GUI.NET/Debugger/ByteColorProvider.cs

@@ -25,11 +25,12 @@ public class ByteColorProvider : IByteColorProvider
 		bool _hideReadBytes;
 		bool _hideWrittenBytes;
 		bool _hideExecutedBytes;
+		bool _highlightDmcDataBytes;
 		bool _highlightDataBytes;
 		bool _highlightCodeBytes;
 		bool _highlightLabelledBytes;
 
-		public ByteColorProvider(DebugMemoryType memoryType, bool showExec, bool showWrite, bool showRead, int framesToFade, bool hideUnusedBytes, bool hideReadBytes, bool hideWrittenBytes, bool hideExecutedBytes, bool highlightDataBytes, bool highlightCodeBytes, bool highlightLabelledBytes)
+		public ByteColorProvider(DebugMemoryType memoryType, bool showExec, bool showWrite, bool showRead, int framesToFade, bool hideUnusedBytes, bool hideReadBytes, bool hideWrittenBytes, bool hideExecutedBytes, bool highlightDmcDataBytes, bool highlightDataBytes, bool highlightCodeBytes, bool highlightLabelledBytes)
 		{
 			_memoryType = memoryType;
 			_showExec = showExec;
@@ -40,6 +41,7 @@ public ByteColorProvider(DebugMemoryType memoryType, bool showExec, bool showWri
 			_hideReadBytes = hideReadBytes;
 			_hideWrittenBytes = hideWrittenBytes;
 			_hideExecutedBytes = hideExecutedBytes;
+			_highlightDmcDataBytes = highlightDmcDataBytes;
 			_highlightDataBytes = highlightDataBytes;
 			_highlightCodeBytes = highlightCodeBytes;
 			_highlightLabelledBytes = highlightLabelledBytes;
@@ -59,7 +61,7 @@ public void Prepare(long firstByteIndex, long lastByteIndex)
 			_execCounts = InteropEmu.DebugGetMemoryAccessCountsEx((UInt32)firstByteIndex, (UInt32)(lastByteIndex - firstByteIndex + 1), _memoryType, MemoryOperationType.Exec);
 
 			_cdlData = null;
-			if(_highlightDataBytes || _highlightCodeBytes || _highlightLabelledBytes) {
+			if(_highlightDmcDataBytes || _highlightDataBytes || _highlightCodeBytes || _highlightLabelledBytes) {
 				switch(_memoryType) {
 					case DebugMemoryType.ChrRom:
 					case DebugMemoryType.PpuMemory:
@@ -115,6 +117,9 @@ public Color GetByteColor(long firstByteIndex, long byteIndex, out Color bgColor
 				} else if((_cdlData[index] & 0x01) != 0 && _highlightCodeBytes) {
 					//Code
 					bgColor = ConfigManager.Config.DebugInfo.RamCodeByteColor;
+				} else if((_cdlData[index] & 0x40) != 0 && _highlightDmcDataBytes) {
+					//DMC channel Data
+					bgColor = ConfigManager.Config.DebugInfo.RamDmcDataByteColor;
 				} else if((_cdlData[index] & 0x02) != 0 && _highlightDataBytes) {
 					//Data
 					bgColor = ConfigManager.Config.DebugInfo.RamDataByteColor;

GUI.NET/Debugger/frmMemoryViewer.Designer.cs

@@ -51,6 +51,7 @@ protected override void OnLoad(EventArgs e)
 			this.mnuHighlightChrReadBytes.Checked = ConfigManager.Config.DebugInfo.RamHighlightChrReadBytes;
 			this.mnuHighlightCodeBytes.Checked = ConfigManager.Config.DebugInfo.RamHighlightCodeBytes;
 			this.mnuHighlightDataBytes.Checked = ConfigManager.Config.DebugInfo.RamHighlightDataBytes;
+			this.mnuHighlightDmcDataBytes.Checked = ConfigManager.Config.DebugInfo.RamHighlightDmcDataBytes;
 
 			this.UpdateFadeOptions();
 
@@ -133,6 +134,7 @@ private void UpdateByteColorProvider()
 						mnuHideReadBytes.Checked,
 						mnuHideWrittenBytes.Checked,
 						mnuHideExecutedBytes.Checked,
+						mnuHighlightDmcDataBytes.Checked,
 						mnuHighlightDataBytes.Checked,
 						mnuHighlightCodeBytes.Checked,
 						mnuHighlightLabelledBytes.Checked
@@ -239,6 +241,7 @@ private void UpdateConfig()
 			ConfigManager.Config.DebugInfo.RamHighlightChrReadBytes = this.mnuHighlightChrReadBytes.Checked;
 			ConfigManager.Config.DebugInfo.RamHighlightCodeBytes = this.mnuHighlightCodeBytes.Checked;
 			ConfigManager.Config.DebugInfo.RamHighlightDataBytes = this.mnuHighlightDataBytes.Checked;
+			ConfigManager.Config.DebugInfo.RamHighlightDmcDataBytes = this.mnuHighlightDmcDataBytes.Checked;
 
 			ConfigManager.ApplyChanges();
 		}