diff --git a/Core/Debugger.cpp b/Core/Debugger.cpp index 03be8943..dc733b52 100644 --- a/Core/Debugger.cpp +++ b/Core/Debugger.cpp @@ -912,6 +912,10 @@ bool Debugger::ProcessRamOperation(MemoryOperationType type, uint16_t &addr, uin } } else if(addr >= 0x4018 && _mapper->IsWriteRegister(addr)) { _eventManager->AddDebugEvent(DebugEventType::MapperRegisterWrite, addr, value); + } else if(addr >= 0x4000 && addr <= 0x4015 || addr == 0x4017) { + _eventManager->AddDebugEvent(DebugEventType::ApuRegisterWrite, addr, value); + } else if(addr == 0x4016) { + _eventManager->AddDebugEvent(DebugEventType::ControlRegisterWrite, addr, value); } if(_frozenAddresses[addr]) { @@ -922,6 +926,10 @@ bool Debugger::ProcessRamOperation(MemoryOperationType type, uint16_t &addr, uin _eventManager->AddDebugEvent(DebugEventType::PpuRegisterRead, addr, value); } else if(addr >= 0x4018 && _mapper->IsReadRegister(addr)) { _eventManager->AddDebugEvent(DebugEventType::MapperRegisterRead, addr, value); + } else if(addr >= 0x4000 && addr <= 0x4015) { + _eventManager->AddDebugEvent(DebugEventType::ApuRegisterRead, addr, value); + } else if(addr == 0x4016 || addr == 0x4017) { + _eventManager->AddDebugEvent(DebugEventType::ControlRegisterRead, addr, value); } //Ignore dummy read/writes and do not change counters while using the step back feature diff --git a/Core/DebuggerTypes.h b/Core/DebuggerTypes.h index faa6ab6e..5f5e7a17 100644 --- a/Core/DebuggerTypes.h +++ b/Core/DebuggerTypes.h @@ -163,6 +163,10 @@ enum class DebugEventType : uint8_t PpuRegisterRead, MapperRegisterWrite, MapperRegisterRead, + ApuRegisterWrite, + ApuRegisterRead, + ControlRegisterWrite, + ControlRegisterRead, Nmi, Irq, SpriteZeroHit, diff --git a/Core/EventManager.cpp b/Core/EventManager.cpp index c9f73364..78f99994 100644 --- a/Core/EventManager.cpp +++ b/Core/EventManager.cpp @@ -107,6 +107,26 @@ void EventManager::DrawEvent(DebugEventInfo &evt, bool drawBackground, uint32_t color = options.MapperRegisterReadColor; break; + case DebugEventType::ApuRegisterWrite: + showEvent = options.ShowApuRegisterWrites; + color = options.ApuRegisterWriteColor; + break; + + case DebugEventType::ApuRegisterRead: + showEvent = options.ShowApuRegisterReads; + color = options.ApuRegisterReadColor; + break; + + case DebugEventType::ControlRegisterWrite: + showEvent = options.ShowControlRegisterWrites; + color = options.ControlRegisterWriteColor; + break; + + case DebugEventType::ControlRegisterRead: + showEvent = options.ShowControlRegisterReads; + color = options.ControlRegisterReadColor; + break; + case DebugEventType::PpuRegisterWrite: showEvent = options.ShowPpuRegisterWrites[evt.Address & 0x07]; color = options.PpuRegisterWriteColors[evt.Address & 0x07]; diff --git a/Core/EventManager.h b/Core/EventManager.h index 61ed36bd..44e1cd1c 100644 --- a/Core/EventManager.h +++ b/Core/EventManager.h @@ -61,12 +61,20 @@ struct EventViewerDisplayOptions uint32_t BreakpointColor; uint32_t MapperRegisterReadColor; uint32_t MapperRegisterWriteColor; + uint32_t ApuRegisterReadColor; + uint32_t ApuRegisterWriteColor; + uint32_t ControlRegisterReadColor; + uint32_t ControlRegisterWriteColor; uint32_t PpuRegisterReadColors[8]; uint32_t PpuRegisterWriteColors[8]; bool ShowMapperRegisterWrites; bool ShowMapperRegisterReads; + bool ShowApuRegisterWrites; + bool ShowApuRegisterReads; + bool ShowControlRegisterWrites; + bool ShowControlRegisterReads; bool ShowPpuRegisterWrites[8]; bool ShowPpuRegisterReads[8]; diff --git a/GUI.NET/Config/DebugInfo.cs b/GUI.NET/Config/DebugInfo.cs index ccd8fc19..ccc516a5 100644 --- a/GUI.NET/Config/DebugInfo.cs +++ b/GUI.NET/Config/DebugInfo.cs @@ -169,6 +169,10 @@ namespace Mesen.GUI.Config public bool EventViewerShowPpuRead2007 = true; public bool EventViewerShowMapperRegisterWrites = true; public bool EventViewerShowMapperRegisterReads = true; + public bool EventViewerShowApuRegisterWrites = true; + public bool EventViewerShowApuRegisterReads = true; + public bool EventViewerShowControlRegisterWrites = true; + public bool EventViewerShowControlRegisterReads = true; public bool EventViewerShowNmi = true; public bool EventViewerShowIrq = true; public bool EventViewerShowSpriteZeroHit = true; @@ -179,6 +183,10 @@ namespace Mesen.GUI.Config public XmlColor EventViewerMapperRegisterWriteColor = ColorTranslator.FromHtml("#007597"); public XmlColor EventViewerMapperRegisterReadColor = ColorTranslator.FromHtml("#C92929"); + public XmlColor EventViewerApuRegisterWriteColor = ColorTranslator.FromHtml("#977500"); + public XmlColor EventViewerApuRegisterReadColor = ColorTranslator.FromHtml("#F47522"); + public XmlColor EventViewerControlRegisterWriteColor = ColorTranslator.FromHtml("#009775"); + public XmlColor EventViewerControlRegisterReadColor = ColorTranslator.FromHtml("#29F929"); public XmlColor EventViewerNmiColor = ColorTranslator.FromHtml("#ABADAC"); public XmlColor EventViewerIrqColor = ColorTranslator.FromHtml("#F9FEAC"); public XmlColor EventViewerDmcDmaReadColor = ColorTranslator.FromHtml("#A9FEFC"); diff --git a/GUI.NET/Debugger/Controls/ctrlEventViewerPpuView.cs b/GUI.NET/Debugger/Controls/ctrlEventViewerPpuView.cs index ad7c8ddb..3ff985de 100644 --- a/GUI.NET/Debugger/Controls/ctrlEventViewerPpuView.cs +++ b/GUI.NET/Debugger/Controls/ctrlEventViewerPpuView.cs @@ -215,6 +215,14 @@ namespace Mesen.GUI.Debugger.Controls ShowMapperRegisterReads = cfg.EventViewerShowMapperRegisterReads, MapperRegisterWriteColor = (uint)cfg.EventViewerMapperRegisterWriteColor.Color.ToArgb(), MapperRegisterReadColor = (uint)cfg.EventViewerMapperRegisterReadColor.Color.ToArgb(), + ShowApuRegisterWrites = cfg.EventViewerShowApuRegisterWrites, + ShowApuRegisterReads = cfg.EventViewerShowApuRegisterReads, + ApuRegisterWriteColor = (uint)cfg.EventViewerApuRegisterWriteColor.Color.ToArgb(), + ApuRegisterReadColor = (uint)cfg.EventViewerApuRegisterReadColor.Color.ToArgb(), + ShowControlRegisterWrites = cfg.EventViewerShowControlRegisterWrites, + ShowControlRegisterReads = cfg.EventViewerShowControlRegisterReads, + ControlRegisterWriteColor = (uint)cfg.EventViewerControlRegisterWriteColor.Color.ToArgb(), + ControlRegisterReadColor = (uint)cfg.EventViewerControlRegisterReadColor.Color.ToArgb(), ShowNmi = cfg.EventViewerShowNmi, ShowIrq = cfg.EventViewerShowIrq, ShowDmcDmaReads = cfg.EventViewerShowDmcDmaReads, diff --git a/GUI.NET/Debugger/frmEventViewer.Designer.cs b/GUI.NET/Debugger/frmEventViewer.Designer.cs index d121be99..afa07e70 100644 --- a/GUI.NET/Debugger/frmEventViewer.Designer.cs +++ b/GUI.NET/Debugger/frmEventViewer.Designer.cs @@ -33,6 +33,12 @@ this.ctrlEventViewerPpuView = new Mesen.GUI.Debugger.Controls.ctrlEventViewerPpuView(); this.grpShow = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.picControlRead = new Mesen.GUI.Debugger.ctrlColorPicker(); + this.picControlWrite = new Mesen.GUI.Debugger.ctrlColorPicker(); + this.picApuRead = new Mesen.GUI.Debugger.ctrlColorPicker(); + this.picApuWrite = new Mesen.GUI.Debugger.ctrlColorPicker(); + this.chkShowControlRegisterReads = new System.Windows.Forms.CheckBox(); + this.chkShowControlRegisterWrites = new System.Windows.Forms.CheckBox(); this.chkShowNtscBorders = new System.Windows.Forms.CheckBox(); this.lblPpuWrites = new System.Windows.Forms.Label(); this.chkShowMapperRegisterWrites = new System.Windows.Forms.CheckBox(); @@ -72,6 +78,8 @@ this.picSpriteZeroHit = new Mesen.GUI.Debugger.ctrlColorPicker(); this.picBreakpoint = new Mesen.GUI.Debugger.ctrlColorPicker(); this.picDmcDmaRead = new Mesen.GUI.Debugger.ctrlColorPicker(); + this.chkShowApuRegisterWrites = new System.Windows.Forms.CheckBox(); + this.chkShowApuRegisterReads = new System.Windows.Forms.CheckBox(); this.tpgListView = new System.Windows.Forms.TabPage(); this.ctrlEventViewerListView = new Mesen.GUI.Debugger.Controls.ctrlEventViewerListView(); this.menuStrip1 = new Mesen.GUI.Controls.ctrlMesenMenuStrip(); @@ -95,6 +103,10 @@ this.tpgPpuView.SuspendLayout(); this.grpShow.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picControlRead)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.picControlWrite)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.picApuRead)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.picApuWrite)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picWrite2000)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picWrite2001)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picWrite2003)).BeginInit(); @@ -124,7 +136,7 @@ this.tabMain.Location = new System.Drawing.Point(0, 24); this.tabMain.Name = "tabMain"; this.tabMain.SelectedIndex = 0; - this.tabMain.Size = new System.Drawing.Size(904, 564); + this.tabMain.Size = new System.Drawing.Size(790, 534); this.tabMain.TabIndex = 0; this.tabMain.SelectedIndexChanged += new System.EventHandler(this.tabMain_SelectedIndexChanged); // @@ -135,7 +147,7 @@ this.tpgPpuView.Location = new System.Drawing.Point(4, 22); this.tpgPpuView.Name = "tpgPpuView"; this.tpgPpuView.Padding = new System.Windows.Forms.Padding(3); - this.tpgPpuView.Size = new System.Drawing.Size(896, 538); + this.tpgPpuView.Size = new System.Drawing.Size(782, 508); this.tpgPpuView.TabIndex = 0; this.tpgPpuView.Text = "PPU View"; this.tpgPpuView.UseVisualStyleBackColor = true; @@ -145,16 +157,16 @@ this.ctrlEventViewerPpuView.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlEventViewerPpuView.Location = new System.Drawing.Point(3, 3); this.ctrlEventViewerPpuView.Name = "ctrlEventViewerPpuView"; - this.ctrlEventViewerPpuView.Size = new System.Drawing.Size(685, 532); + this.ctrlEventViewerPpuView.Size = new System.Drawing.Size(571, 502); this.ctrlEventViewerPpuView.TabIndex = 0; // // grpShow // this.grpShow.Controls.Add(this.tableLayoutPanel2); this.grpShow.Dock = System.Windows.Forms.DockStyle.Right; - this.grpShow.Location = new System.Drawing.Point(688, 3); + this.grpShow.Location = new System.Drawing.Point(574, 3); this.grpShow.Name = "grpShow"; - this.grpShow.Size = new System.Drawing.Size(205, 532); + this.grpShow.Size = new System.Drawing.Size(205, 502); this.grpShow.TabIndex = 3; this.grpShow.TabStop = false; this.grpShow.Text = "Show..."; @@ -165,11 +177,17 @@ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 31F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel2.Controls.Add(this.chkShowNtscBorders, 0, 20); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 44F)); + this.tableLayoutPanel2.Controls.Add(this.picControlRead, 3, 14); + this.tableLayoutPanel2.Controls.Add(this.picControlWrite, 3, 13); + this.tableLayoutPanel2.Controls.Add(this.picApuRead, 3, 12); + this.tableLayoutPanel2.Controls.Add(this.picApuWrite, 3, 11); + this.tableLayoutPanel2.Controls.Add(this.chkShowControlRegisterReads, 0, 14); + this.tableLayoutPanel2.Controls.Add(this.chkShowControlRegisterWrites, 0, 13); + this.tableLayoutPanel2.Controls.Add(this.chkShowNtscBorders, 0, 24); this.tableLayoutPanel2.Controls.Add(this.lblPpuWrites, 0, 0); this.tableLayoutPanel2.Controls.Add(this.chkShowMapperRegisterWrites, 0, 9); - this.tableLayoutPanel2.Controls.Add(this.chkShowPreviousFrameEvents, 0, 19); + this.tableLayoutPanel2.Controls.Add(this.chkShowPreviousFrameEvents, 0, 23); this.tableLayoutPanel2.Controls.Add(this.chkWrite2000, 0, 1); this.tableLayoutPanel2.Controls.Add(this.picWrite2000, 1, 1); this.tableLayoutPanel2.Controls.Add(this.chkWrite2001, 0, 2); @@ -195,21 +213,23 @@ this.tableLayoutPanel2.Controls.Add(this.chkShowMapperRegisterReads, 0, 10); this.tableLayoutPanel2.Controls.Add(this.picMapperRead, 3, 10); this.tableLayoutPanel2.Controls.Add(this.picMapperWrite, 3, 9); - this.tableLayoutPanel2.Controls.Add(this.chkShowIrq, 0, 12); - this.tableLayoutPanel2.Controls.Add(this.chkShowNmi, 0, 13); - this.tableLayoutPanel2.Controls.Add(this.chkShowSpriteZero, 0, 14); - this.tableLayoutPanel2.Controls.Add(this.chkBreakpoints, 0, 18); - this.tableLayoutPanel2.Controls.Add(this.chkShowDmcDmaRead, 0, 16); - this.tableLayoutPanel2.Controls.Add(this.picIrq, 3, 12); - this.tableLayoutPanel2.Controls.Add(this.picNmi, 3, 13); - this.tableLayoutPanel2.Controls.Add(this.picSpriteZeroHit, 3, 14); - this.tableLayoutPanel2.Controls.Add(this.picBreakpoint, 3, 18); - this.tableLayoutPanel2.Controls.Add(this.picDmcDmaRead, 3, 16); + this.tableLayoutPanel2.Controls.Add(this.chkShowIrq, 0, 16); + this.tableLayoutPanel2.Controls.Add(this.chkShowNmi, 0, 17); + this.tableLayoutPanel2.Controls.Add(this.chkShowSpriteZero, 0, 18); + this.tableLayoutPanel2.Controls.Add(this.chkBreakpoints, 0, 22); + this.tableLayoutPanel2.Controls.Add(this.chkShowDmcDmaRead, 0, 20); + this.tableLayoutPanel2.Controls.Add(this.picIrq, 3, 16); + this.tableLayoutPanel2.Controls.Add(this.picNmi, 3, 17); + this.tableLayoutPanel2.Controls.Add(this.picSpriteZeroHit, 3, 18); + this.tableLayoutPanel2.Controls.Add(this.picBreakpoint, 3, 22); + this.tableLayoutPanel2.Controls.Add(this.picDmcDmaRead, 3, 20); + this.tableLayoutPanel2.Controls.Add(this.chkShowApuRegisterWrites, 0, 11); + this.tableLayoutPanel2.Controls.Add(this.chkShowApuRegisterReads, 0, 12); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 16); this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 21; + this.tableLayoutPanel2.RowCount = 26; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -230,15 +250,94 @@ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(199, 513); + this.tableLayoutPanel2.Size = new System.Drawing.Size(199, 483); this.tableLayoutPanel2.TabIndex = 2; // + // picControlRead + // + this.picControlRead.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.picControlRead.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.picControlRead.Location = new System.Drawing.Point(158, 302); + this.picControlRead.Name = "picControlRead"; + this.picControlRead.Size = new System.Drawing.Size(14, 14); + this.picControlRead.TabIndex = 75; + this.picControlRead.TabStop = false; + this.picControlRead.BackColorChanged += new System.EventHandler(this.picColor_BackColorChanged); + // + // picControlWrite + // + this.picControlWrite.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.picControlWrite.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.picControlWrite.Location = new System.Drawing.Point(158, 282); + this.picControlWrite.Name = "picControlWrite"; + this.picControlWrite.Size = new System.Drawing.Size(14, 14); + this.picControlWrite.TabIndex = 74; + this.picControlWrite.TabStop = false; + this.picControlWrite.BackColorChanged += new System.EventHandler(this.picColor_BackColorChanged); + // + // picApuRead + // + this.picApuRead.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.picApuRead.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.picApuRead.Location = new System.Drawing.Point(158, 262); + this.picApuRead.Name = "picApuRead"; + this.picApuRead.Size = new System.Drawing.Size(14, 14); + this.picApuRead.TabIndex = 73; + this.picApuRead.TabStop = false; + this.picApuRead.BackColorChanged += new System.EventHandler(this.picColor_BackColorChanged); + // + // picApuWrite + // + this.picApuWrite.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.picApuWrite.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.picApuWrite.Location = new System.Drawing.Point(158, 242); + this.picApuWrite.Name = "picApuWrite"; + this.picApuWrite.Size = new System.Drawing.Size(14, 14); + this.picApuWrite.TabIndex = 72; + this.picApuWrite.TabStop = false; + this.picApuWrite.BackColorChanged += new System.EventHandler(this.picColor_BackColorChanged); + // + // chkShowControlRegisterReads + // + this.chkShowControlRegisterReads.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkShowControlRegisterReads.AutoSize = true; + this.tableLayoutPanel2.SetColumnSpan(this.chkShowControlRegisterReads, 3); + this.chkShowControlRegisterReads.Location = new System.Drawing.Point(3, 300); + this.chkShowControlRegisterReads.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); + this.chkShowControlRegisterReads.Name = "chkShowControlRegisterReads"; + this.chkShowControlRegisterReads.Size = new System.Drawing.Size(135, 17); + this.chkShowControlRegisterReads.TabIndex = 71; + this.chkShowControlRegisterReads.Text = "Control Register Reads"; + this.chkShowControlRegisterReads.UseVisualStyleBackColor = true; + this.chkShowControlRegisterReads.Click += new System.EventHandler(this.chkShowHide_Click); + // + // chkShowControlRegisterWrites + // + this.chkShowControlRegisterWrites.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkShowControlRegisterWrites.AutoSize = true; + this.tableLayoutPanel2.SetColumnSpan(this.chkShowControlRegisterWrites, 3); + this.chkShowControlRegisterWrites.Location = new System.Drawing.Point(3, 280); + this.chkShowControlRegisterWrites.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); + this.chkShowControlRegisterWrites.Name = "chkShowControlRegisterWrites"; + this.chkShowControlRegisterWrites.Size = new System.Drawing.Size(134, 17); + this.chkShowControlRegisterWrites.TabIndex = 70; + this.chkShowControlRegisterWrites.Text = "Control Register Writes"; + this.chkShowControlRegisterWrites.UseVisualStyleBackColor = true; + this.chkShowControlRegisterWrites.Click += new System.EventHandler(this.chkShowHide_Click); + // // chkShowNtscBorders // + this.chkShowNtscBorders.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkShowNtscBorders.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.chkShowNtscBorders, 4); - this.chkShowNtscBorders.Location = new System.Drawing.Point(3, 405); + this.chkShowNtscBorders.Location = new System.Drawing.Point(3, 439); + this.chkShowNtscBorders.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkShowNtscBorders.Name = "chkShowNtscBorders"; this.chkShowNtscBorders.Size = new System.Drawing.Size(123, 17); this.chkShowNtscBorders.TabIndex = 67; @@ -261,9 +360,11 @@ // // chkShowMapperRegisterWrites // + this.chkShowMapperRegisterWrites.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkShowMapperRegisterWrites.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.chkShowMapperRegisterWrites, 3); - this.chkShowMapperRegisterWrites.Location = new System.Drawing.Point(3, 221); + this.chkShowMapperRegisterWrites.Location = new System.Drawing.Point(3, 200); + this.chkShowMapperRegisterWrites.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkShowMapperRegisterWrites.Name = "chkShowMapperRegisterWrites"; this.chkShowMapperRegisterWrites.Size = new System.Drawing.Size(137, 17); this.chkShowMapperRegisterWrites.TabIndex = 6; @@ -273,9 +374,11 @@ // // chkShowPreviousFrameEvents // + this.chkShowPreviousFrameEvents.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkShowPreviousFrameEvents.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.chkShowPreviousFrameEvents, 4); - this.chkShowPreviousFrameEvents.Location = new System.Drawing.Point(3, 382); + this.chkShowPreviousFrameEvents.Location = new System.Drawing.Point(3, 420); + this.chkShowPreviousFrameEvents.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkShowPreviousFrameEvents.Name = "chkShowPreviousFrameEvents"; this.chkShowPreviousFrameEvents.Size = new System.Drawing.Size(167, 17); this.chkShowPreviousFrameEvents.TabIndex = 8; @@ -287,7 +390,8 @@ // this.chkWrite2000.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkWrite2000.AutoSize = true; - this.chkWrite2000.Location = new System.Drawing.Point(3, 23); + this.chkWrite2000.Location = new System.Drawing.Point(3, 21); + this.chkWrite2000.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkWrite2000.Name = "chkWrite2000"; this.chkWrite2000.Size = new System.Drawing.Size(56, 17); this.chkWrite2000.TabIndex = 37; @@ -299,7 +403,7 @@ // this.picWrite2000.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picWrite2000.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picWrite2000.Location = new System.Drawing.Point(65, 24); + this.picWrite2000.Location = new System.Drawing.Point(65, 23); this.picWrite2000.Name = "picWrite2000"; this.picWrite2000.Size = new System.Drawing.Size(14, 14); this.picWrite2000.TabIndex = 38; @@ -310,7 +414,8 @@ // this.chkWrite2001.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkWrite2001.AutoSize = true; - this.chkWrite2001.Location = new System.Drawing.Point(3, 46); + this.chkWrite2001.Location = new System.Drawing.Point(3, 41); + this.chkWrite2001.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkWrite2001.Name = "chkWrite2001"; this.chkWrite2001.Size = new System.Drawing.Size(56, 17); this.chkWrite2001.TabIndex = 39; @@ -322,7 +427,8 @@ // this.chkWrite2003.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkWrite2003.AutoSize = true; - this.chkWrite2003.Location = new System.Drawing.Point(3, 69); + this.chkWrite2003.Location = new System.Drawing.Point(3, 61); + this.chkWrite2003.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkWrite2003.Name = "chkWrite2003"; this.chkWrite2003.Size = new System.Drawing.Size(56, 17); this.chkWrite2003.TabIndex = 40; @@ -334,7 +440,8 @@ // this.chkWrite2004.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkWrite2004.AutoSize = true; - this.chkWrite2004.Location = new System.Drawing.Point(3, 92); + this.chkWrite2004.Location = new System.Drawing.Point(3, 81); + this.chkWrite2004.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkWrite2004.Name = "chkWrite2004"; this.chkWrite2004.Size = new System.Drawing.Size(56, 17); this.chkWrite2004.TabIndex = 41; @@ -346,7 +453,8 @@ // this.chkWrite2005.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkWrite2005.AutoSize = true; - this.chkWrite2005.Location = new System.Drawing.Point(96, 23); + this.chkWrite2005.Location = new System.Drawing.Point(96, 21); + this.chkWrite2005.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkWrite2005.Name = "chkWrite2005"; this.chkWrite2005.Size = new System.Drawing.Size(56, 17); this.chkWrite2005.TabIndex = 42; @@ -356,8 +464,10 @@ // // chkWrite2006 // + this.chkWrite2006.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkWrite2006.AutoSize = true; - this.chkWrite2006.Location = new System.Drawing.Point(96, 46); + this.chkWrite2006.Location = new System.Drawing.Point(96, 41); + this.chkWrite2006.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkWrite2006.Name = "chkWrite2006"; this.chkWrite2006.Size = new System.Drawing.Size(56, 17); this.chkWrite2006.TabIndex = 43; @@ -369,7 +479,8 @@ // this.chkWrite2007.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkWrite2007.AutoSize = true; - this.chkWrite2007.Location = new System.Drawing.Point(96, 69); + this.chkWrite2007.Location = new System.Drawing.Point(96, 61); + this.chkWrite2007.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkWrite2007.Name = "chkWrite2007"; this.chkWrite2007.Size = new System.Drawing.Size(56, 17); this.chkWrite2007.TabIndex = 44; @@ -381,7 +492,7 @@ // this.picWrite2001.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picWrite2001.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picWrite2001.Location = new System.Drawing.Point(65, 47); + this.picWrite2001.Location = new System.Drawing.Point(65, 43); this.picWrite2001.Name = "picWrite2001"; this.picWrite2001.Size = new System.Drawing.Size(14, 14); this.picWrite2001.TabIndex = 45; @@ -392,7 +503,7 @@ // this.picWrite2003.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picWrite2003.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picWrite2003.Location = new System.Drawing.Point(65, 70); + this.picWrite2003.Location = new System.Drawing.Point(65, 63); this.picWrite2003.Name = "picWrite2003"; this.picWrite2003.Size = new System.Drawing.Size(14, 14); this.picWrite2003.TabIndex = 46; @@ -405,7 +516,7 @@ this.lblPpuReads.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.lblPpuReads, 4); this.lblPpuReads.ForeColor = System.Drawing.SystemColors.GrayText; - this.lblPpuReads.Location = new System.Drawing.Point(0, 127); + this.lblPpuReads.Location = new System.Drawing.Point(0, 115); this.lblPpuReads.Margin = new System.Windows.Forms.Padding(0, 0, 3, 2); this.lblPpuReads.Name = "lblPpuReads"; this.lblPpuReads.Size = new System.Drawing.Size(105, 13); @@ -416,7 +527,8 @@ // this.chkRead2002.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkRead2002.AutoSize = true; - this.chkRead2002.Location = new System.Drawing.Point(3, 145); + this.chkRead2002.Location = new System.Drawing.Point(3, 131); + this.chkRead2002.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkRead2002.Name = "chkRead2002"; this.chkRead2002.Size = new System.Drawing.Size(56, 17); this.chkRead2002.TabIndex = 52; @@ -428,7 +540,8 @@ // this.chkRead2004.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkRead2004.AutoSize = true; - this.chkRead2004.Location = new System.Drawing.Point(3, 168); + this.chkRead2004.Location = new System.Drawing.Point(3, 151); + this.chkRead2004.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkRead2004.Name = "chkRead2004"; this.chkRead2004.Size = new System.Drawing.Size(56, 17); this.chkRead2004.TabIndex = 53; @@ -440,7 +553,8 @@ // this.chkRead2007.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkRead2007.AutoSize = true; - this.chkRead2007.Location = new System.Drawing.Point(96, 145); + this.chkRead2007.Location = new System.Drawing.Point(96, 131); + this.chkRead2007.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkRead2007.Name = "chkRead2007"; this.chkRead2007.Size = new System.Drawing.Size(56, 17); this.chkRead2007.TabIndex = 54; @@ -452,7 +566,7 @@ // this.picRead2002.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picRead2002.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picRead2002.Location = new System.Drawing.Point(65, 146); + this.picRead2002.Location = new System.Drawing.Point(65, 133); this.picRead2002.Name = "picRead2002"; this.picRead2002.Size = new System.Drawing.Size(14, 14); this.picRead2002.TabIndex = 55; @@ -463,9 +577,9 @@ // this.picRead2004.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picRead2004.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picRead2004.Location = new System.Drawing.Point(65, 169); + this.picRead2004.Location = new System.Drawing.Point(65, 153); this.picRead2004.Name = "picRead2004"; - this.picRead2004.Size = new System.Drawing.Size(14, 14); + this.picRead2004.Size = new System.Drawing.Size(13, 13); this.picRead2004.TabIndex = 56; this.picRead2004.TabStop = false; this.picRead2004.BackColorChanged += new System.EventHandler(this.picColor_BackColorChanged); @@ -474,7 +588,7 @@ // this.picRead2007.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picRead2007.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picRead2007.Location = new System.Drawing.Point(158, 146); + this.picRead2007.Location = new System.Drawing.Point(158, 133); this.picRead2007.Name = "picRead2007"; this.picRead2007.Size = new System.Drawing.Size(14, 14); this.picRead2007.TabIndex = 57; @@ -485,7 +599,7 @@ // this.picWrite2004.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picWrite2004.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picWrite2004.Location = new System.Drawing.Point(65, 93); + this.picWrite2004.Location = new System.Drawing.Point(65, 83); this.picWrite2004.Name = "picWrite2004"; this.picWrite2004.Size = new System.Drawing.Size(14, 14); this.picWrite2004.TabIndex = 47; @@ -496,7 +610,7 @@ // this.picWrite2005.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picWrite2005.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picWrite2005.Location = new System.Drawing.Point(158, 24); + this.picWrite2005.Location = new System.Drawing.Point(158, 23); this.picWrite2005.Name = "picWrite2005"; this.picWrite2005.Size = new System.Drawing.Size(14, 14); this.picWrite2005.TabIndex = 48; @@ -507,7 +621,7 @@ // this.picWrite2007.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picWrite2007.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picWrite2007.Location = new System.Drawing.Point(158, 70); + this.picWrite2007.Location = new System.Drawing.Point(158, 63); this.picWrite2007.Name = "picWrite2007"; this.picWrite2007.Size = new System.Drawing.Size(14, 14); this.picWrite2007.TabIndex = 50; @@ -518,7 +632,7 @@ // this.picWrite2006.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picWrite2006.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picWrite2006.Location = new System.Drawing.Point(158, 47); + this.picWrite2006.Location = new System.Drawing.Point(158, 43); this.picWrite2006.Name = "picWrite2006"; this.picWrite2006.Size = new System.Drawing.Size(14, 14); this.picWrite2006.TabIndex = 49; @@ -531,7 +645,7 @@ this.label1.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.label1, 4); this.label1.ForeColor = System.Drawing.SystemColors.GrayText; - this.label1.Location = new System.Drawing.Point(0, 203); + this.label1.Location = new System.Drawing.Point(0, 184); this.label1.Margin = new System.Windows.Forms.Padding(0, 0, 3, 2); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(38, 13); @@ -540,9 +654,11 @@ // // chkShowMapperRegisterReads // + this.chkShowMapperRegisterReads.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkShowMapperRegisterReads.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.chkShowMapperRegisterReads, 3); - this.chkShowMapperRegisterReads.Location = new System.Drawing.Point(3, 244); + this.chkShowMapperRegisterReads.Location = new System.Drawing.Point(3, 220); + this.chkShowMapperRegisterReads.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkShowMapperRegisterReads.Name = "chkShowMapperRegisterReads"; this.chkShowMapperRegisterReads.Size = new System.Drawing.Size(138, 17); this.chkShowMapperRegisterReads.TabIndex = 5; @@ -554,7 +670,7 @@ // this.picMapperRead.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picMapperRead.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picMapperRead.Location = new System.Drawing.Point(158, 245); + this.picMapperRead.Location = new System.Drawing.Point(158, 222); this.picMapperRead.Name = "picMapperRead"; this.picMapperRead.Size = new System.Drawing.Size(14, 14); this.picMapperRead.TabIndex = 62; @@ -565,7 +681,7 @@ // this.picMapperWrite.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picMapperWrite.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picMapperWrite.Location = new System.Drawing.Point(158, 222); + this.picMapperWrite.Location = new System.Drawing.Point(158, 202); this.picMapperWrite.Name = "picMapperWrite"; this.picMapperWrite.Size = new System.Drawing.Size(14, 14); this.picMapperWrite.TabIndex = 59; @@ -574,8 +690,10 @@ // // chkShowIrq // + this.chkShowIrq.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkShowIrq.AutoSize = true; - this.chkShowIrq.Location = new System.Drawing.Point(3, 267); + this.chkShowIrq.Location = new System.Drawing.Point(3, 320); + this.chkShowIrq.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkShowIrq.Name = "chkShowIrq"; this.chkShowIrq.Size = new System.Drawing.Size(45, 17); this.chkShowIrq.TabIndex = 2; @@ -585,8 +703,10 @@ // // chkShowNmi // + this.chkShowNmi.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkShowNmi.AutoSize = true; - this.chkShowNmi.Location = new System.Drawing.Point(3, 290); + this.chkShowNmi.Location = new System.Drawing.Point(3, 340); + this.chkShowNmi.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkShowNmi.Name = "chkShowNmi"; this.chkShowNmi.Size = new System.Drawing.Size(46, 17); this.chkShowNmi.TabIndex = 3; @@ -596,9 +716,11 @@ // // chkShowSpriteZero // + this.chkShowSpriteZero.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkShowSpriteZero.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.chkShowSpriteZero, 2); - this.chkShowSpriteZero.Location = new System.Drawing.Point(3, 313); + this.chkShowSpriteZero.Location = new System.Drawing.Point(3, 360); + this.chkShowSpriteZero.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkShowSpriteZero.Name = "chkShowSpriteZero"; this.chkShowSpriteZero.Size = new System.Drawing.Size(78, 17); this.chkShowSpriteZero.TabIndex = 4; @@ -608,9 +730,11 @@ // // chkBreakpoints // + this.chkBreakpoints.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkBreakpoints.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.chkBreakpoints, 3); - this.chkBreakpoints.Location = new System.Drawing.Point(3, 359); + this.chkBreakpoints.Location = new System.Drawing.Point(3, 400); + this.chkBreakpoints.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkBreakpoints.Name = "chkBreakpoints"; this.chkBreakpoints.Size = new System.Drawing.Size(121, 17); this.chkBreakpoints.TabIndex = 7; @@ -620,9 +744,11 @@ // // chkShowDmcDmaRead // + this.chkShowDmcDmaRead.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkShowDmcDmaRead.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.chkShowDmcDmaRead, 3); - this.chkShowDmcDmaRead.Location = new System.Drawing.Point(3, 336); + this.chkShowDmcDmaRead.Location = new System.Drawing.Point(3, 380); + this.chkShowDmcDmaRead.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); this.chkShowDmcDmaRead.Name = "chkShowDmcDmaRead"; this.chkShowDmcDmaRead.Size = new System.Drawing.Size(106, 17); this.chkShowDmcDmaRead.TabIndex = 65; @@ -634,7 +760,7 @@ // this.picIrq.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picIrq.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picIrq.Location = new System.Drawing.Point(158, 268); + this.picIrq.Location = new System.Drawing.Point(158, 322); this.picIrq.Name = "picIrq"; this.picIrq.Size = new System.Drawing.Size(14, 14); this.picIrq.TabIndex = 60; @@ -645,7 +771,7 @@ // this.picNmi.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picNmi.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picNmi.Location = new System.Drawing.Point(158, 291); + this.picNmi.Location = new System.Drawing.Point(158, 342); this.picNmi.Name = "picNmi"; this.picNmi.Size = new System.Drawing.Size(14, 14); this.picNmi.TabIndex = 63; @@ -656,7 +782,7 @@ // this.picSpriteZeroHit.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picSpriteZeroHit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picSpriteZeroHit.Location = new System.Drawing.Point(158, 314); + this.picSpriteZeroHit.Location = new System.Drawing.Point(158, 362); this.picSpriteZeroHit.Name = "picSpriteZeroHit"; this.picSpriteZeroHit.Size = new System.Drawing.Size(14, 14); this.picSpriteZeroHit.TabIndex = 61; @@ -667,7 +793,7 @@ // this.picBreakpoint.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picBreakpoint.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picBreakpoint.Location = new System.Drawing.Point(158, 360); + this.picBreakpoint.Location = new System.Drawing.Point(158, 402); this.picBreakpoint.Name = "picBreakpoint"; this.picBreakpoint.Size = new System.Drawing.Size(14, 14); this.picBreakpoint.TabIndex = 64; @@ -678,20 +804,48 @@ // this.picDmcDmaRead.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picDmcDmaRead.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picDmcDmaRead.Location = new System.Drawing.Point(158, 337); + this.picDmcDmaRead.Location = new System.Drawing.Point(158, 382); this.picDmcDmaRead.Name = "picDmcDmaRead"; this.picDmcDmaRead.Size = new System.Drawing.Size(14, 14); this.picDmcDmaRead.TabIndex = 66; this.picDmcDmaRead.TabStop = false; this.picDmcDmaRead.BackColorChanged += new System.EventHandler(this.picColor_BackColorChanged); // + // chkShowApuRegisterWrites + // + this.chkShowApuRegisterWrites.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkShowApuRegisterWrites.AutoSize = true; + this.tableLayoutPanel2.SetColumnSpan(this.chkShowApuRegisterWrites, 3); + this.chkShowApuRegisterWrites.Location = new System.Drawing.Point(3, 240); + this.chkShowApuRegisterWrites.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); + this.chkShowApuRegisterWrites.Name = "chkShowApuRegisterWrites"; + this.chkShowApuRegisterWrites.Size = new System.Drawing.Size(123, 17); + this.chkShowApuRegisterWrites.TabIndex = 69; + this.chkShowApuRegisterWrites.Text = "APU Register Writes"; + this.chkShowApuRegisterWrites.UseVisualStyleBackColor = true; + this.chkShowApuRegisterWrites.Click += new System.EventHandler(this.chkShowHide_Click); + // + // chkShowApuRegisterReads + // + this.chkShowApuRegisterReads.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkShowApuRegisterReads.AutoSize = true; + this.tableLayoutPanel2.SetColumnSpan(this.chkShowApuRegisterReads, 3); + this.chkShowApuRegisterReads.Location = new System.Drawing.Point(3, 260); + this.chkShowApuRegisterReads.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1); + this.chkShowApuRegisterReads.Name = "chkShowApuRegisterReads"; + this.chkShowApuRegisterReads.Size = new System.Drawing.Size(124, 17); + this.chkShowApuRegisterReads.TabIndex = 68; + this.chkShowApuRegisterReads.Text = "APU Register Reads"; + this.chkShowApuRegisterReads.UseVisualStyleBackColor = true; + this.chkShowApuRegisterReads.Click += new System.EventHandler(this.chkShowHide_Click); + // // tpgListView // this.tpgListView.Controls.Add(this.ctrlEventViewerListView); this.tpgListView.Location = new System.Drawing.Point(4, 22); this.tpgListView.Name = "tpgListView"; this.tpgListView.Padding = new System.Windows.Forms.Padding(3); - this.tpgListView.Size = new System.Drawing.Size(878, 538); + this.tpgListView.Size = new System.Drawing.Size(782, 535); this.tpgListView.TabIndex = 1; this.tpgListView.Text = "List View"; this.tpgListView.UseVisualStyleBackColor = true; @@ -701,7 +855,7 @@ this.ctrlEventViewerListView.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlEventViewerListView.Location = new System.Drawing.Point(3, 3); this.ctrlEventViewerListView.Name = "ctrlEventViewerListView"; - this.ctrlEventViewerListView.Size = new System.Drawing.Size(872, 532); + this.ctrlEventViewerListView.Size = new System.Drawing.Size(776, 529); this.ctrlEventViewerListView.TabIndex = 0; // // menuStrip1 @@ -711,7 +865,7 @@ this.viewToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(904, 24); + this.menuStrip1.Size = new System.Drawing.Size(790, 24); this.menuStrip1.TabIndex = 3; this.menuStrip1.Text = "menuStrip1"; // @@ -841,7 +995,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(904, 588); + this.ClientSize = new System.Drawing.Size(790, 558); this.Controls.Add(this.tabMain); this.Controls.Add(this.menuStrip1); this.Name = "frmEventViewer"; @@ -851,6 +1005,10 @@ this.grpShow.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picControlRead)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.picControlWrite)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.picApuRead)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.picApuWrite)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picWrite2000)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picWrite2001)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picWrite2003)).EndInit(); @@ -941,5 +1099,13 @@ private System.Windows.Forms.ToolStripMenuItem mnuAutoRefreshHigh; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem mnuAutoRefresh; + private ctrlColorPicker picControlRead; + private ctrlColorPicker picControlWrite; + private ctrlColorPicker picApuRead; + private ctrlColorPicker picApuWrite; + private System.Windows.Forms.CheckBox chkShowControlRegisterReads; + private System.Windows.Forms.CheckBox chkShowControlRegisterWrites; + private System.Windows.Forms.CheckBox chkShowApuRegisterWrites; + private System.Windows.Forms.CheckBox chkShowApuRegisterReads; } } \ No newline at end of file diff --git a/GUI.NET/Debugger/frmEventViewer.cs b/GUI.NET/Debugger/frmEventViewer.cs index c5d5d009..d98d2adf 100644 --- a/GUI.NET/Debugger/frmEventViewer.cs +++ b/GUI.NET/Debugger/frmEventViewer.cs @@ -55,6 +55,10 @@ namespace Mesen.GUI.Debugger _binder.AddBinding(nameof(DebugInfo.EventViewerShowSpriteZeroHit), chkShowSpriteZero); _binder.AddBinding(nameof(DebugInfo.EventViewerShowMapperRegisterWrites), chkShowMapperRegisterWrites); _binder.AddBinding(nameof(DebugInfo.EventViewerShowMapperRegisterReads), chkShowMapperRegisterReads); + _binder.AddBinding(nameof(DebugInfo.EventViewerShowApuRegisterWrites), chkShowApuRegisterWrites); + _binder.AddBinding(nameof(DebugInfo.EventViewerShowApuRegisterReads), chkShowApuRegisterReads); + _binder.AddBinding(nameof(DebugInfo.EventViewerShowControlRegisterWrites), chkShowControlRegisterWrites); + _binder.AddBinding(nameof(DebugInfo.EventViewerShowControlRegisterReads), chkShowControlRegisterReads); _binder.AddBinding(nameof(DebugInfo.EventViewerShowDmcDmaReads), chkShowDmcDmaRead); _binder.AddBinding(nameof(DebugInfo.EventViewerShowMarkedBreakpoints), chkBreakpoints); @@ -72,6 +76,10 @@ namespace Mesen.GUI.Debugger _binder.AddBinding(nameof(DebugInfo.EventViewerMapperRegisterWriteColor), picMapperWrite); _binder.AddBinding(nameof(DebugInfo.EventViewerMapperRegisterReadColor), picMapperRead); + _binder.AddBinding(nameof(DebugInfo.EventViewerApuRegisterWriteColor), picApuWrite); + _binder.AddBinding(nameof(DebugInfo.EventViewerApuRegisterReadColor), picApuRead); + _binder.AddBinding(nameof(DebugInfo.EventViewerControlRegisterWriteColor), picControlWrite); + _binder.AddBinding(nameof(DebugInfo.EventViewerControlRegisterReadColor), picControlRead); _binder.AddBinding(nameof(DebugInfo.EventViewerNmiColor), picNmi); _binder.AddBinding(nameof(DebugInfo.EventViewerIrqColor), picIrq); _binder.AddBinding(nameof(DebugInfo.EventViewerSpriteZeroHitColor), picSpriteZeroHit); @@ -220,6 +228,11 @@ namespace Mesen.GUI.Debugger picMapperRead.BackColor = ColorTranslator.FromHtml("#C92929"); picMapperWrite.BackColor = ColorTranslator.FromHtml("#007597"); + picApuWrite.BackColor = ColorTranslator.FromHtml("#977500"); + picApuRead.BackColor = ColorTranslator.FromHtml("#F47522"); + picControlWrite.BackColor = ColorTranslator.FromHtml("#009775"); + picControlRead.BackColor = ColorTranslator.FromHtml("#29F929"); + picNmi.BackColor = ColorTranslator.FromHtml("#ABADAC"); picIrq.BackColor = ColorTranslator.FromHtml("#F9FEAC"); picSpriteZeroHit.BackColor = ColorTranslator.FromHtml("#9F93C6"); diff --git a/GUI.NET/InteropEmu.cs b/GUI.NET/InteropEmu.cs index 213a0164..f362522f 100644 --- a/GUI.NET/InteropEmu.cs +++ b/GUI.NET/InteropEmu.cs @@ -1212,6 +1212,10 @@ namespace Mesen.GUI PpuRegisterRead, MapperRegisterWrite, MapperRegisterRead, + ApuRegisterWrite, + ApuRegisterRead, + ControlRegisterWrite, + ControlRegisterRead, Nmi, Irq, SpriteZeroHit, @@ -2187,6 +2191,10 @@ namespace Mesen.GUI public UInt32 BreakpointColor; public UInt32 MapperRegisterReadColor; public UInt32 MapperRegisterWriteColor; + public UInt32 ApuRegisterReadColor; + public UInt32 ApuRegisterWriteColor; + public UInt32 ControlRegisterReadColor; + public UInt32 ControlRegisterWriteColor; [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)] public UInt32[] PpuRegisterReadColors; @@ -2196,6 +2204,10 @@ namespace Mesen.GUI [MarshalAs(UnmanagedType.I1)] public bool ShowMapperRegisterWrites; [MarshalAs(UnmanagedType.I1)] public bool ShowMapperRegisterReads; + [MarshalAs(UnmanagedType.I1)] public bool ShowApuRegisterWrites; + [MarshalAs(UnmanagedType.I1)] public bool ShowApuRegisterReads; + [MarshalAs(UnmanagedType.I1)] public bool ShowControlRegisterWrites; + [MarshalAs(UnmanagedType.I1)] public bool ShowControlRegisterReads; [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)] public byte[] ShowPpuRegisterWrites;