diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 15d8156d52..ecf7ca4de9 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -662,6 +662,12 @@
PCEBGViewer.cs
+
+ Form
+
+
+ PCECDL.cs
+
Form
@@ -1085,6 +1091,9 @@
PCEBGViewer.cs
+
+ PCECDL.cs
+
PCETileViewer.cs
diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index 68143fa423..c9c5a697ec 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -238,6 +238,7 @@
this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator();
this.SMSGraphicsSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GGGameGenieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.SMSVDPViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.TI83SubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.KeypadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
@@ -342,7 +343,7 @@
this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.SMSVDPViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.codeDataLoggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainformMenu.SuspendLayout();
this.MainStatusBar.SuspendLayout();
this.MainFormContextMenu.SuspendLayout();
@@ -1991,6 +1992,7 @@
this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.PCEBGViewerMenuItem,
this.PCEtileViewerToolStripMenuItem,
+ this.codeDataLoggerToolStripMenuItem,
this.toolStripSeparator25,
this.PCEAlwaysPerformSpriteLimitMenuItem,
this.PCEAlwaysEqualizeVolumesMenuItem,
@@ -2127,6 +2129,13 @@
this.GGGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder";
this.GGGameGenieMenuItem.Click += new System.EventHandler(this.GGGameGenieMenuItem_Click);
//
+ // SMSVDPViewerToolStripMenuItem
+ //
+ this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem";
+ this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
+ this.SMSVDPViewerToolStripMenuItem.Text = "&VDP Viewer";
+ this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SMSVDPViewerToolStripMenuItem_Click);
+ //
// TI83SubMenu
//
this.TI83SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -2986,12 +2995,12 @@
this.ShowMenuContextMenuItem.Text = "Show Menu";
this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click);
//
- // SMSVDPViewerToolStripMenuItem
+ // codeDataLoggerToolStripMenuItem
//
- this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem";
- this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
- this.SMSVDPViewerToolStripMenuItem.Text = "&VDP Viewer";
- this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SMSVDPViewerToolStripMenuItem_Click);
+ this.codeDataLoggerToolStripMenuItem.Name = "codeDataLoggerToolStripMenuItem";
+ this.codeDataLoggerToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+ this.codeDataLoggerToolStripMenuItem.Text = "Code-Data Logger";
+ this.codeDataLoggerToolStripMenuItem.Click += new System.EventHandler(this.codeDataLoggerToolStripMenuItem_Click);
//
// MainForm
//
@@ -3348,6 +3357,7 @@
private System.Windows.Forms.ToolStripMenuItem DisplayConfigMenuItem;
private System.Windows.Forms.ToolStripMenuItem PCEtileViewerToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem SMSVDPViewerToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem codeDataLoggerToolStripMenuItem;
}
}
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 9d12430187..e60621df5b 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3062,5 +3062,10 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load();
}
+ private void codeDataLoggerToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ GlobalWin.Tools.Load();
+ }
+
}
}
diff --git a/BizHawk.Client.EmuHawk/MainForm.resx b/BizHawk.Client.EmuHawk/MainForm.resx
index 411c7abe1c..3972d114b5 100644
--- a/BizHawk.Client.EmuHawk/MainForm.resx
+++ b/BizHawk.Client.EmuHawk/MainForm.resx
@@ -124,7 +124,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsAAAA7AAWrWiQkAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjExR/NC
+ YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjExR/NC
NwAAAaRJREFUOE+dk0FLAlEUhd9/kgwFMUQMhMEIhJLIhVCRDIRhAznEIEYtlBiQYApBSGQw2xhBlhLE
zCLQTa3bt2nd8tR5pFTaLLxwuJd7vgNv3syIv+Xz+fA9TpSX96s0TZsAp+0862fAM3xpN5DNZpHL5VAo
FFAqlVCpVFCtVsEgxZk7emTIMsOsyGQyGAwGM4lZkU6n4bouVg4aCO1cQDGusXbyiA1rIMWZO3pkyEYi
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs
new file mode 100644
index 0000000000..7d0dedfbd0
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.Designer.cs
@@ -0,0 +1,156 @@
+namespace BizHawk.Client.EmuHawk
+{
+ partial class PCECDL
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.checkBox1 = new System.Windows.Forms.CheckBox();
+ this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+ this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.unionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.menuStrip1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // checkBox1
+ //
+ this.checkBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.checkBox1.AutoSize = true;
+ this.checkBox1.Location = new System.Drawing.Point(12, 244);
+ this.checkBox1.Name = "checkBox1";
+ this.checkBox1.Size = new System.Drawing.Size(101, 17);
+ this.checkBox1.TabIndex = 1;
+ this.checkBox1.Text = "Loging is Active";
+ this.checkBox1.UseVisualStyleBackColor = true;
+ this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
+ //
+ // menuStrip1
+ //
+ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.fileToolStripMenuItem});
+ this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip1.Name = "menuStrip1";
+ this.menuStrip1.Size = new System.Drawing.Size(292, 24);
+ this.menuStrip1.TabIndex = 2;
+ this.menuStrip1.Text = "menuStrip1";
+ //
+ // fileToolStripMenuItem
+ //
+ this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.newToolStripMenuItem,
+ this.clearToolStripMenuItem,
+ this.loadToolStripMenuItem,
+ this.saveToolStripMenuItem,
+ this.unionToolStripMenuItem});
+ this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+ this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
+ this.fileToolStripMenuItem.Text = "&File";
+ //
+ // clearToolStripMenuItem
+ //
+ this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
+ this.clearToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.clearToolStripMenuItem.Text = "&Clear";
+ this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click);
+ //
+ // loadToolStripMenuItem
+ //
+ this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+ this.loadToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.loadToolStripMenuItem.Text = "&Load...";
+ this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click);
+ //
+ // saveToolStripMenuItem
+ //
+ this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+ this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.saveToolStripMenuItem.Text = "&Save...";
+ this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
+ //
+ // unionToolStripMenuItem
+ //
+ this.unionToolStripMenuItem.Name = "unionToolStripMenuItem";
+ this.unionToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.unionToolStripMenuItem.Text = "&Union...";
+ this.unionToolStripMenuItem.Click += new System.EventHandler(this.unionToolStripMenuItem_Click);
+ //
+ // newToolStripMenuItem
+ //
+ this.newToolStripMenuItem.Name = "newToolStripMenuItem";
+ this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.newToolStripMenuItem.Text = "&New";
+ this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
+ //
+ // textBox1
+ //
+ this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBox1.Location = new System.Drawing.Point(0, 27);
+ this.textBox1.Multiline = true;
+ this.textBox1.Name = "textBox1";
+ this.textBox1.ReadOnly = true;
+ this.textBox1.Size = new System.Drawing.Size(292, 211);
+ this.textBox1.TabIndex = 3;
+ //
+ // PCECDL
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(292, 273);
+ this.Controls.Add(this.textBox1);
+ this.Controls.Add(this.checkBox1);
+ this.Controls.Add(this.menuStrip1);
+ this.MainMenuStrip = this.menuStrip1;
+ this.Name = "PCECDL";
+ this.Text = "PCE Code Data Logger";
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PCECDL_FormClosing);
+ this.menuStrip1.ResumeLayout(false);
+ this.menuStrip1.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.CheckBox checkBox1;
+ private System.Windows.Forms.MenuStrip menuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem unionToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem;
+ private System.Windows.Forms.TextBox textBox1;
+
+ }
+}
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs
new file mode 100644
index 0000000000..8aeb7809f4
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs
@@ -0,0 +1,196 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using BizHawk.Client.Common;
+
+using BizHawk.Emulation.Cores.PCEngine;
+using BizHawk.Emulation.Cores.Components.H6280;
+
+using System.IO;
+
+namespace BizHawk.Client.EmuHawk
+{
+ public partial class PCECDL : Form, IToolForm
+ {
+ PCEngine emu;
+ CodeDataLog CDL;
+
+ public PCECDL()
+ {
+ InitializeComponent();
+ Restart();
+ }
+
+ public void UpdateValues()
+ {
+ UpdateDisplay();
+ }
+
+ public void Restart()
+ {
+ if (Global.Emulator is PCEngine)
+ {
+ emu = (PCEngine)Global.Emulator;
+ checkBox1.Checked = emu.Cpu.CDLLoggingActive;
+ CDL = emu.Cpu.CDL;
+ UpdateDisplay();
+ }
+ else
+ {
+ emu = null;
+ Close();
+ }
+ }
+
+ void UpdateDisplay()
+ {
+ List Lines = new List();
+ if (CDL == null)
+ {
+ Lines.Add("No CDL loaded.");
+ }
+ else
+ {
+ Lines.Add("CDL contains the following domains:");
+ foreach (var kvp in CDL)
+ {
+ int total = 0;
+ unsafe
+ {
+ fixed (byte* data = kvp.Value)
+ {
+ byte* src = data;
+ byte* end = data + kvp.Value.Length;
+ while (src < end)
+ {
+ if (*src++ != 0)
+ total++;
+ }
+ }
+ }
+ Lines.Add(string.Format("Domain {0} Size {1} Mapped {2}%", kvp.Key, kvp.Value.Length, total / (float) kvp.Value.Length * 100f));
+ }
+ }
+ textBox1.Lines = Lines.ToArray();
+ }
+
+ public bool AskSave()
+ {
+ return true;
+ }
+
+ public bool UpdateBefore
+ {
+ get { return false; }
+ }
+
+ private void newToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var result = MessageBox.Show(this, "OK to create new CDL?", "Query", MessageBoxButtons.YesNo);
+ if (result == DialogResult.Yes)
+ {
+ CDL = CodeDataLog.Create(emu.Cpu.Mappings);
+ emu.Cpu.CDL = CDL;
+ UpdateDisplay();
+ }
+ }
+
+ private void loadToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var result = MessageBox.Show(this, "OK to load new CDL?", "Query", MessageBoxButtons.YesNo);
+ if (result == DialogResult.Yes)
+ {
+ var ofd = new OpenFileDialog();
+ result = ofd.ShowDialog(this);
+ if (result == DialogResult.OK)
+ {
+ using (FileStream fs = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read))
+ {
+ CDL = CodeDataLog.Load(fs);
+ emu.Cpu.CDL = CDL;
+ UpdateDisplay();
+ }
+ }
+ }
+ }
+
+ private void saveToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (CDL == null)
+ {
+ MessageBox.Show(this, "Cannot save with no CDL loaded!", "Alert");
+ }
+ else
+ {
+ var sfd = new SaveFileDialog();
+ var result = sfd.ShowDialog(this);
+ if (result == DialogResult.OK)
+ {
+ using (FileStream fs = new FileStream(sfd.FileName, FileMode.Create, FileAccess.Write))
+ {
+ CDL.Save(fs);
+ }
+ }
+ }
+ }
+
+ private void unionToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (CDL == null)
+ {
+ MessageBox.Show(this, "Cannot union with no CDL loaded!", "Alert");
+ }
+ else
+ {
+ var ofd = new OpenFileDialog();
+ var result = ofd.ShowDialog(this);
+ if (result == DialogResult.OK)
+ {
+ using (FileStream fs = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read))
+ {
+ var newCDL = CodeDataLog.Load(fs);
+ CDL.LogicalOrFrom(newCDL);
+ UpdateDisplay();
+ }
+ }
+ }
+ }
+
+ private void PCECDL_FormClosing(object sender, FormClosingEventArgs e)
+ {
+
+ }
+
+ private void clearToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (CDL == null)
+ {
+ MessageBox.Show(this, "Cannot clear with no CDL loaded!", "Alert");
+ }
+ else
+ {
+ var result = MessageBox.Show(this, "OK to clear CDL?", "Query", MessageBoxButtons.YesNo);
+ if (result == DialogResult.Yes)
+ {
+ CDL.ClearData();
+ UpdateDisplay();
+ }
+ }
+ }
+
+ private void checkBox1_CheckedChanged(object sender, EventArgs e)
+ {
+ if (checkBox1.Checked && CDL == null)
+ {
+ MessageBox.Show(this, "Cannot log with no CDL loaded!", "Alert");
+ checkBox1.Checked = false;
+ }
+ emu.Cpu.CDLLoggingActive = checkBox1.Checked;
+ }
+ }
+}
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.resx b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.resx
new file mode 100644
index 0000000000..0f6d8eb42b
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs
index b113a2c866..6cad4266d8 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs
@@ -94,9 +94,9 @@ namespace BizHawk.Emulation.Cores.Components.H6280
}
public MemMapping[] Mappings; // = new MemMapping[256];
+ public CodeDataLog CDL = null;
- public CodeDataLog CDL;
-
+ public bool CDLLoggingActive = false;
[Flags]
enum CDLUsage : byte
diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
index 7802075082..5e9c019eea 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
@@ -60,6 +60,7 @@ namespace BizHawk.Emulation.Cores.Components.H6280
if (Debug) Logger(State());
CoreComm.MemoryCallbackSystem.CallExecute(PC);
+ if (CDLLoggingActive) CDLOpcode();
byte opcode = ReadMemory(PC++);
switch (opcode)
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
index 41b8d872f1..17257fc367 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
@@ -236,6 +236,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
Cpu.ResetPC();
SetupMemoryDomains();
SetupStateBuff();
+ InitCDLMappings();
}
int _lagcount = 0;
diff --git a/CpuCoreGenerator/HuC6280/CoreGenerator.cs b/CpuCoreGenerator/HuC6280/CoreGenerator.cs
index f24247d0fe..0d954ac068 100644
--- a/CpuCoreGenerator/HuC6280/CoreGenerator.cs
+++ b/CpuCoreGenerator/HuC6280/CoreGenerator.cs
@@ -495,6 +495,7 @@ namespace HuC6280
w.WriteLine();
w.WriteLine(" if (Debug) Logger(State());");
w.WriteLine(" CoreComm.MemoryCallbackSystem.CallExecute(PC);");
+ w.WriteLine(" if (CDLLoggingActive) CDLOpcode();");
w.WriteLine();
w.WriteLine(" byte opcode = ReadMemory(PC++);");
w.WriteLine(" switch (opcode)");