Move TraceBuffer from CoreComm to IDebugable and refactor accordingly

BizHawk.Client.EmuHawk/MainForm.Events.cs

@@ -1103,7 +1103,7 @@ namespace BizHawk.Client.EmuHawk
 			TAStudioMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["TAStudio"].Bindings;
 			VirtualPadMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Virtual Pad"].Bindings;
 			TraceLoggerMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Trace Logger"].Bindings;
-			TraceLoggerMenuItem.Enabled = Global.Emulator.CoreComm.CpuTraceAvailable;
+			TraceLoggerMenuItem.Enabled = Global.Emulator.CpuTraceAvailable();
 
 			TAStudioMenuItem.Enabled = Global.Emulator.HasSavestates() && Global.Emulator.CanPollInput();
 

BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.cs

@@ -9,6 +9,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Atari.Atari2600;
+using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -111,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
 
 			// TODO: some kind of method like PauseAndRelinquishControl() which will set a flag preventing unpausing by the user, and then a ResumeControl() method that is done on close
 			//GlobalWin.MainForm.PauseEmulator();
-			Global.CoreComm.Tracer.Enabled = true;
+			(_core as IDebuggable).Tracer.Enabled = true;
 
 			if (Global.Config.Atari2600DebuggerSettings.UseWindowPosition)
 			{
@@ -145,8 +146,8 @@ namespace BizHawk.Client.EmuHawk
 		private void Shutdown()
 		{
 			//TODO: add a Mainform.ResumeControl() call
-			Global.CoreComm.Tracer.TakeContents();
-			Global.CoreComm.Tracer.Enabled = false;
+			(_core as IDebuggable).Tracer.TakeContents();
+			(_core as IDebuggable).Tracer.Enabled = false;
 		}
 
 		public void Restart()
@@ -214,7 +215,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void UpdateTraceLog()
 		{
-			var instructions = Global.CoreComm.Tracer.TakeContents().Split('\n');
+			var instructions = (_core as IDebuggable).Tracer.TakeContents().Split('\n');
 			if (!string.IsNullOrWhiteSpace(instructions[0]))
 			{
 				_instructions.AddRange(instructions.Where(str => !string.IsNullOrEmpty(str)));

BizHawk.Client.EmuHawk/tools/ToolManager.cs

@@ -464,7 +464,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public void LoadTraceLogger()
 		{
-			if (Global.Emulator.CoreComm.CpuTraceAvailable)
+			if (Global.Emulator.CpuTraceAvailable())
 			{
 				Load<TraceLogger>();
 			}

BizHawk.Client.EmuHawk/tools/TraceLogger.cs

@@ -6,13 +6,18 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
+using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Common.IEmulatorExtensions;
 using BizHawk.Client.Common;
 using BizHawk.Client.EmuHawk.WinFormExtensions;
 
+
 namespace BizHawk.Client.EmuHawk
 {
 	public partial class TraceLogger : Form, IToolForm
 	{
+		private readonly ITracer Tracer;
+
 		// Refresh rate slider
 		// Make faster, such as not saving to disk until the logging is stopped, dont' add to Instructions list every frame, etc
 		private readonly List<string> _instructions = new List<string>();
@@ -30,6 +35,15 @@ namespace BizHawk.Client.EmuHawk
 
 			TopMost = Global.Config.TraceLoggerSettings.TopMost;
 			Closing += (o, e) => SaveConfigSettings();
+
+			if (Global.Emulator.CpuTraceAvailable())
+			{
+				Tracer = Global.Emulator.GetDebugger().Tracer;
+			}
+			else
+			{
+				Close();
+			}
 		}
 
 		public bool UpdateBefore
@@ -44,7 +58,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SaveConfigSettings()
 		{
-			Global.CoreComm.Tracer.Enabled = false;
+			Tracer.Enabled = false;
 			Global.Config.TraceLoggerSettings.Wndx = Location.X;
 			Global.Config.TraceLoggerSettings.Wndy = Location.Y;
 			Global.Config.TraceLoggerSettings.Width = Size.Width;
@@ -73,7 +87,7 @@ namespace BizHawk.Client.EmuHawk
 
 			ClearList();
 			LoggingEnabled.Checked = true;
-			Global.CoreComm.Tracer.Enabled = true;
+			Tracer.Enabled = true;
 			SetTracerBoxTitle();
 			Restart();
 		}
@@ -109,7 +123,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				if (Global.Emulator.CoreComm.CpuTraceAvailable)
+				if (Global.Emulator.CpuTraceAvailable())
 				{
 					ClearList();
 					TraceView.Columns[0].Text = Global.Emulator.CoreComm.TraceHeader;
@@ -132,13 +146,13 @@ namespace BizHawk.Client.EmuHawk
 		{
 			using (var sw = new StreamWriter(_logFile.FullName, true))
 			{
-				sw.Write(Global.CoreComm.Tracer.TakeContents());
+				sw.Write(Tracer.TakeContents());
 			}
 		}
 
 		private void LogToWindow()
 		{
-			var instructions = Global.CoreComm.Tracer.TakeContents().Split('\n');
+			var instructions = Tracer.TakeContents().Split('\n');
 			if (!string.IsNullOrWhiteSpace(instructions[0]))
 			{
 				_instructions.AddRange(instructions);
@@ -154,7 +168,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SetTracerBoxTitle()
 		{
-			if (Global.CoreComm.Tracer.Enabled)
+			if (Tracer.Enabled)
 			{
 				if (ToFileRadio.Checked)
 				{
@@ -351,7 +365,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void LoggingEnabled_CheckedChanged(object sender, EventArgs e)
 		{
-			Global.CoreComm.Tracer.Enabled = LoggingEnabled.Checked;
+			Tracer.Enabled = LoggingEnabled.Checked;
 			SetTracerBoxTitle();
 		}
 

BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj

@@ -55,6 +55,7 @@
     <Compile Include="Base Implementations\NullController.cs" />
     <Compile Include="Base Implementations\NullEmulator.cs" />
     <Compile Include="Base Implementations\NullSound.cs" />
+    <Compile Include="Base Implementations\TraceBuffer.cs" />
     <Compile Include="CoreAttributes.cs" />
     <Compile Include="CoreComms.cs" />
     <Compile Include="Database\CRC32.cs" />
@@ -78,6 +79,7 @@
     <Compile Include="Interfaces\ISoundProvider.cs" />
     <Compile Include="Interfaces\IStatable.cs" />
     <Compile Include="Interfaces\ISyncSoundProvider.cs" />
+    <Compile Include="Interfaces\ITracer.cs" />
     <Compile Include="Interfaces\IVideoProvider.cs" />
     <Compile Include="MemoryDomain.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

BizHawk.Emulation.Common/CoreComms.cs

@@ -9,11 +9,6 @@ namespace BizHawk.Emulation.Common
 	{
 		public ICoreFileProvider CoreFileProvider;
 
-		/// <summary>
-		/// if this is set, then the cpu should dump trace info to CpuTraceStream
-		/// </summary>
-		public TraceBuffer Tracer = new TraceBuffer();
-
 		public MemoryCallbackSystem MemoryCallbackSystem = new MemoryCallbackSystem();
 
 		public double VsyncRate
@@ -32,8 +27,6 @@ namespace BizHawk.Emulation.Common
 
 		public int ScreenLogicalOffsetX, ScreenLogicalOffsetY;
 
-		public bool CpuTraceAvailable = false;
-
 		public string TraceHeader = "Instructions";
 
 		// size hint to a/v out resizer.  this probably belongs in VideoProvider?  but it's somewhat different than VirtualWidth...
@@ -69,53 +62,6 @@ namespace BizHawk.Emulation.Common
 		public Func<bool> DispSnowyNullEmulator;
 	}
 
-	public class TraceBuffer
-	{
-		public string TakeContents()
-		{
-			string s = buffer.ToString();
-			buffer.Clear();
-			return s;
-		}
-
-		public string Contents
-		{
-			get
-			{
-				return buffer.ToString();
-			}
-		}
-
-		public void Put(string content)
-		{
-			if (logging)
-			{
-				buffer.AppendLine(content);
-			}
-		}
-
-		public TraceBuffer()
-		{
-			buffer = new StringBuilder();
-		}
-
-		public bool Enabled
-		{
-			get
-			{
-				return logging;
-			}
-
-			set
-			{
-				logging = value;
-			}
-		}
-
-		private readonly StringBuilder buffer;
-		private bool logging;
-	}
-
 	public class MemoryCallbackSystem
 	{
 		private readonly List<Action> _reads = new List<Action>();

BizHawk.Emulation.Common/Extensions.cs

@@ -37,6 +37,36 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 			return core == null || core is NullEmulator;
 		}
 
+		public static bool CpuTraceAvailable(this IEmulator core)
+		{
+			// TODO: this is a pretty ugly way to handle this
+			var debuggable = (IDebuggable)core.ServiceProvider.GetService<IDebuggable>();
+			if (debuggable != null)
+			{
+				try
+				{
+					var tracer = debuggable.Tracer;
+					return true;
+				}
+				catch(NotImplementedException)
+				{
+					return false;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool CanDebug(this IEmulator core)
+		{
+			return core.ServiceProvider.HasService<IDebuggable>();
+		}
+
+		public static IDebuggable GetDebugger(this IEmulator core)
+		{
+			return (IDebuggable)core.ServiceProvider.GetService<IDebuggable>();
+		}
+
 		// TODO: a better place for these
 		public static bool IsImplemented(this MethodInfo info)
 		{

BizHawk.Emulation.Common/Interfaces/IDebuggable.cs

@@ -16,5 +16,7 @@ namespace BizHawk.Emulation.Common
 		/// <param name="register"></param>
 		/// <param name="value"></param>
 		void SetCpuRegister(string register, int value);
+
+		ITracer Tracer { get; }
 	}
 }

BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs

@@ -119,5 +119,11 @@ namespace BizHawk.Emulation.Cores.Calculators
 					break;
 			}
 		}
+
+		public ITracer Tracer
+		{
+			[FeatureNotImplemented]
+			get { throw new NotImplementedException(); }
+		}
 	}
 }

BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs

@@ -126,6 +126,12 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 					break;
 			}
 		}
+
+		public ITracer Tracer
+		{
+			[FeatureNotImplemented]
+			get { throw new NotImplementedException(); }
+		}
 	}
 
 	static public class C64Util

BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs

@@ -414,9 +414,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			_tia.Execute(1);
 			_tia.Execute(1);
 			M6532.Timer.Tick();
-			if (CoreComm.Tracer.Enabled)
+			if (Tracer.Enabled)
 			{
-				CoreComm.Tracer.Put(Cpu.TraceState());
+				Tracer.Put(Cpu.TraceState());
 			}
 			Cpu.ExecuteOne();
 			_mapper.ClockCpu();

BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs

@@ -55,5 +55,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 					break;
 			}
 		}
+
+		public ITracer Tracer { get; private set; }
 	}
 }

BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs

@@ -24,6 +24,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 		[CoreConstructor("A26")]
 		public Atari2600(CoreComm comm, GameInfo game, byte[] rom, object settings, object syncSettings)
 		{
+			Tracer = new TraceBuffer();
 			ServiceProvider = new BasicServiceProvider(this);
 			InputCallbacks = new InputCallbackSystem();
 			Ram = new byte[128];
@@ -31,7 +32,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			Settings = (A2600Settings)settings ?? new A2600Settings();
 			SyncSettings = (A2600SyncSettings)syncSettings ?? new A2600SyncSettings();
 
-			CoreComm.CpuTraceAvailable = true;
 			Rom = rom;
 			_game = game;
 

BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs

@@ -53,5 +53,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
 					break;
 			}
 		}
+
+		public ITracer Tracer
+		{
+			[FeatureNotImplemented]
+			get { throw new NotImplementedException(); }
+		}
 	}
 }

BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs

@@ -66,6 +66,12 @@ namespace BizHawk.Emulation.Cores.ColecoVision
 		private readonly InputCallbackSystem _inputCallbacks = new InputCallbackSystem();
 		public IInputCallbackSystem InputCallbacks { get { return _inputCallbacks; } }
 
+		public ITracer Tracer
+		{
+			[FeatureNotImplemented]
+			get { throw new NotImplementedException(); }
+		}
+
 		public MemoryDomainList MemoryDomains { get { return memoryDomains; } }
 		MemoryDomainList memoryDomains;
 		const ushort RamSizeMask = 0x03FF;

BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs

@@ -48,10 +48,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 		public GBA(CoreComm comm, byte[] file)
 		{
 			ServiceProvider = new BasicServiceProvider(this);
+			Tracer = new TraceBuffer();
 			CoreComm = comm;
+
 			comm.VsyncNum = 262144;
 			comm.VsyncDen = 4389;
-			comm.CpuTraceAvailable = true;
 			comm.TraceHeader = "   -Addr--- -Opcode- -Instruction------------------- -R0----- -R1----- -R2----- -R3----- -R4----- -R5----- -R6----- -R7----- -R8----- -R9----- -R10---- -R11---- -R12---- -R13(SP) -R14(LR) -R15(PC) -CPSR--- -SPSR---";
 			comm.NominalWidth = 240;
 			comm.NominalHeight = 160;
@@ -80,7 +81,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 			if (Controller["Power"])
 				LibMeteor.libmeteor_hardreset();
 			// due to the design of the tracing api, we have to poll whether it's active each frame
-			LibMeteor.libmeteor_settracecallback(CoreComm.Tracer.Enabled ? tracecallback : null);
+			LibMeteor.libmeteor_settracecallback(Tracer.Enabled ? tracecallback : null);
 			if (!coredead)
 				LibMeteor.libmeteor_frameadvance();
 			if (IsLagFrame)
@@ -96,6 +97,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 		// TODO: optimize managed to unmanaged using the ActiveChanged event
 		public IInputCallbackSystem InputCallbacks { [FeatureNotImplemented]get { return _inputCallbacks; } }
 
+
+		public ITracer Tracer { get; private set; }
+
 		public string SystemId { get { return "GBA"; } }
 		public bool DeterministicEmulation { get { return true; } }
 
@@ -416,7 +420,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 
 		void Trace(string msg)
 		{
-			CoreComm.Tracer.Put(msg);
+			Tracer.Put(msg);
 		}
 
 		GBAGPUMemoryAreas IGBAGPUViewable.GetMemoryAreas()

BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs

@@ -65,6 +65,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 				if (!LibVBANext.LoadRom(Core, file, (uint)file.Length, biosfile, (uint)biosfile.Length, FES))
 					throw new InvalidOperationException("LoadRom() returned false!");
 
+				Tracer = new TraceBuffer();
+
 				CoreComm.VsyncNum = 262144;
 				CoreComm.VsyncDen = 4389;
 				CoreComm.NominalWidth = 240;
@@ -79,8 +81,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 				InitRegisters();
 				InitCallbacks();
 
-				CoreComm.CpuTraceAvailable = true;
-
 				// todo: hook me up as a setting
 				SetupColors();
 			}
@@ -117,6 +117,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 		// TODO: optimize managed to unmanaged using the ActiveChanged event
 		public IInputCallbackSystem InputCallbacks { [FeatureNotImplemented]get { return _inputCallbacks; } }
 
+		public ITracer Tracer { get; private set; }
+
 		public string SystemId { get { return "GBA"; } }
 
 		public bool DeterministicEmulation { get; private set; }
@@ -284,7 +286,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 			fetchcb = new LibVBANext.AddressCallback((addr) => CoreComm.MemoryCallbackSystem.CallExecute(addr));
 			readcb = new LibVBANext.AddressCallback((addr) => CoreComm.MemoryCallbackSystem.CallRead(addr));
 			writecb = new LibVBANext.AddressCallback((addr) => CoreComm.MemoryCallbackSystem.CallWrite(addr));
-			tracecb = new LibVBANext.TraceCallback((addr, opcode) => CoreComm.Tracer.Put(Trace(addr, opcode)));
+			tracecb = new LibVBANext.TraceCallback((addr, opcode) => Tracer.Put(Trace(addr, opcode)));
 			_inputCallbacks.ActiveChanged += SyncPadCallback;
 		}
 
@@ -305,7 +307,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 			LibVBANext.SetFetchCallback(Core, CoreComm.MemoryCallbackSystem.HasExecutes ? fetchcb : null);
 			LibVBANext.SetReadCallback(Core, CoreComm.MemoryCallbackSystem.HasReads ? readcb : null);
 			LibVBANext.SetWriteCallback(Core, CoreComm.MemoryCallbackSystem.HasWrites ? writecb : null);
-			LibVBANext.SetTraceCallback(Core, CoreComm.Tracer.Enabled ? tracecb : null);
+			LibVBANext.SetTraceCallback(Core, Tracer.Enabled ? tracecb : null);
 		}
 
 		LibVBANext.StandardCallback scanlinecb;

BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs

@@ -139,13 +139,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 		public Gameboy(CoreComm comm, GameInfo game, byte[] file, object Settings, object SyncSettings, bool deterministic)
 		{
 			ServiceProvider = new BasicServiceProvider(this);
+			Tracer = new TraceBuffer();
 			CoreComm = comm;
 
 			comm.VsyncNum = 262144;
 			comm.VsyncDen = 4389;
 			comm.RomStatusAnnotation = null;
 			comm.RomStatusDetails = null;
-			comm.CpuTraceAvailable = true;
 			comm.NominalWidth = 160;
 			comm.NominalHeight = 144;
 
@@ -274,6 +274,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 			throw new NotImplementedException();
 		}
 
+		public ITracer Tracer { get; private set; }
+
 		/// <summary>
 		/// true if the emulator is currently emulating CGB
 		/// </summary>
@@ -316,7 +318,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 				LibGambatte.gambatte_reset(GambatteState, GetCurrentTime());
 
 			RefreshMemoryCallbacks();
-			if (CoreComm.Tracer.Enabled)
+			if (Tracer.Enabled)
 				tracecb = MakeTrace;
 			else
 				tracecb = null;
@@ -675,7 +677,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 			System.Runtime.InteropServices.Marshal.Copy(_s, s, 0, 13);
 			ushort unused;
 
-			CoreComm.Tracer.Put(string.Format(
+			Tracer.Put(string.Format(
 				"{13} SP:{2:x2} A:{3:x2} B:{4:x2} C:{5:x2} D:{6:x2} E:{7:x2} F:{8:x2} H:{9:x2} L:{10:x2} {11} Cy:{0}",
 				s[0],
 				s[1] & 0xffff,

BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs

@@ -65,7 +65,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 			comm.VsyncDen = L.CoreComm.VsyncDen;
 			comm.RomStatusAnnotation = null;
 			comm.RomStatusDetails = "LEFT:\r\n" + L.CoreComm.RomStatusDetails + "RIGHT:\r\n" + R.CoreComm.RomStatusDetails;
-			comm.CpuTraceAvailable = false; // TODO
 			comm.NominalWidth = L.CoreComm.NominalWidth + R.CoreComm.NominalWidth;
 			comm.NominalHeight = L.CoreComm.NominalHeight;
 			comm.UsesLinkCable = true;
@@ -88,6 +87,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 		private InputCallbackSystem _inputCallbacks = new InputCallbackSystem();
 		public IInputCallbackSystem InputCallbacks { get { return _inputCallbacks; } }
 
+		public ITracer Tracer
+		{
+			[FeatureNotImplemented]
+			get { throw new NotImplementedException(); }
+		}
+
 		public IVideoProvider VideoProvider { get { return this; } }
 		public ISoundProvider SoundProvider { get { return null; } }
 		public ISyncSoundProvider SyncSoundProvider { get { return this; } }

BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs

@@ -58,5 +58,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 		{
 			throw new NotImplementedException();
 		}
+
+		public ITracer Tracer
+		{
+			[FeatureNotImplemented]
+			get
+			{
+				throw new NotImplementedException();
+			}
+		}
 	}
 }

BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs

@@ -245,8 +245,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 		bool hardResetSignal;
 		public void FrameAdvance(bool render, bool rendersound)
 		{
-			if (CoreComm.Tracer.Enabled)
-				cpu.TraceCallback = (s) => CoreComm.Tracer.Put(s);
+			if (Tracer.Enabled)
+				cpu.TraceCallback = (s) => Tracer.Put(s);
 			else
 				cpu.TraceCallback = null;
 

BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs

@@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			this.SyncSettings = (NESSyncSettings)SyncSettings ?? new NESSyncSettings();
 			this.ControllerSettings = this.SyncSettings.Controls;
 			CoreComm = comm;
-			CoreComm.CpuTraceAvailable = true;
+			Tracer = new TraceBuffer();
 			BootGodDB.Initialize();
 			videoProvider = new MyVideoProvider(this);
 			Init(game, rom, fdsbios);
@@ -925,6 +925,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			}
 		}
 
+		public ITracer Tracer { get; private set; }
+
 		NESSettings Settings = new NESSettings();
 		NESSyncSettings SyncSettings = new NESSyncSettings();
 

BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs

@@ -393,6 +393,15 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
 			throw new NotImplementedException();
 		}
 
+		public ITracer Tracer
+		{
+			[FeatureNotImplemented]
+			get
+			{
+				throw new NotImplementedException();
+			}
+		}
+
 		#endregion
 
 		public IInputCallbackSystem InputCallbacks { [FeatureNotImplemented]get { throw new NotImplementedException(); } }

BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs

@@ -146,7 +146,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 				CoreComm.VsyncDen = 4 * 341 * 312;
 			}
 
-			CoreComm.CpuTraceAvailable = true;
+			Tracer = new TraceBuffer();
 
 			api.CMD_power();
 
@@ -249,6 +249,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 		// TODO: optimize managed to unmanaged using the ActiveChanged event
 		public IInputCallbackSystem InputCallbacks { [FeatureNotImplemented]get { return _inputCallbacks; } }
 
+		public ITracer Tracer { get; private set; }
+
 		[FeatureNotImplemented]
 		public void SetCpuRegister(string register, int value)
 		{
@@ -348,7 +350,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 
 		void snes_trace(string msg)
 		{
-			CoreComm.Tracer.Put(msg);
+			Tracer.Put(msg);
 		}
 
 		public SnesColors.ColorType CurrPalette { get; private set; }
@@ -596,7 +598,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 				savestatebuff = ms.ToArray();
 			}
 
-			if (!nocallbacks && CoreComm.Tracer.Enabled)
+			if (!nocallbacks && Tracer.Enabled)
 				api.QUERY_set_trace_callback(tracecb);
 			else
 				api.QUERY_set_trace_callback(null);

BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs

@@ -69,8 +69,8 @@ namespace BizHawk.Emulation.Cores.PCEngine
 		public PCEngine(CoreComm comm, GameInfo game, byte[] rom, object Settings, object syncSettings)
 		{
 			ServiceProvider = new BasicServiceProvider(this);
+			Tracer = new TraceBuffer();
 			CoreComm = comm;
-			CoreComm.CpuTraceAvailable = true;
 
 			switch (game.System)
 			{
@@ -93,10 +93,12 @@ namespace BizHawk.Emulation.Cores.PCEngine
 
 		public string BoardName { get { return null; } }
 
+		public ITracer Tracer { get; private set; }
+
 		public PCEngine(CoreComm comm, GameInfo game, Disc disc, object Settings, object syncSettings)
 		{
 			CoreComm = comm;
-			CoreComm.CpuTraceAvailable = true;
+			Tracer = new TraceBuffer();
 			CoreComm.UsesDriveLed = true;
 			systemid = "PCECD";
 			Type = NecSystemType.TurboCD;
@@ -156,7 +158,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
 			PSG = new HuC6280PSG();
 			SCSI = new ScsiCDBus(this, disc);
 
-			Cpu.Logger = (s) => CoreComm.Tracer.Put(s);
+			Cpu.Logger = (s) => Tracer.Put(s);
 
 			if (TurboGrafx)
 			{
@@ -217,7 +219,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
 				RomData = rom;
 				RomLength = RomData.Length;
 				// user request: current value of the SF2MapperLatch on the tracelogger
-				Cpu.Logger = (s) => CoreComm.Tracer.Put(string.Format("{0:X1}:{1}", SF2MapperLatch, s));
+				Cpu.Logger = (s) => Tracer.Put(string.Format("{0:X1}:{1}", SF2MapperLatch, s));
 			}
 			else
 			{
@@ -317,7 +319,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
 			CheckSpriteLimit();
 			PSG.BeginFrame(Cpu.TotalExecutedCycles);
 
-			Cpu.Debug = CoreComm.Tracer.Enabled;
+			Cpu.Debug = Tracer.Enabled;
 
 			if (SuperGrafx)
 				VPC.ExecFrame(render);

BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs

@@ -292,6 +292,15 @@ namespace BizHawk.Emulation.Cores.Sega.Genesis
 			throw new NotImplementedException();
 		}
 
+		public ITracer Tracer
+		{
+			[FeatureNotImplemented]
+			get
+			{
+				throw new NotImplementedException();
+			}
+		}
+
 		int vdpcallback(int level) // Musashi handler
 		{
 			InterruptCallback(level);

BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs

@@ -104,7 +104,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 			IsGameGear = game.System == "GG";
 			IsSG1000 = game.System == "SG";
 			RomData = rom;
-			CoreComm.CpuTraceAvailable = true;
+			Tracer = new TraceBuffer();
 			
 			if (RomData.Length % BankSize != 0)
 				Array.Resize(ref RomData, ((RomData.Length / BankSize) + 1) * BankSize);
@@ -213,6 +213,8 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 
 		public IEmulatorServiceProvider ServiceProvider { get; private set; }
 
+		public ITracer Tracer { get; private set; }
+
 		string DetermineRegion(string gameRegion)
 		{
 			if (gameRegion == null)
@@ -321,12 +323,12 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 			lagged = true;
 			Frame++;
 			PSG.BeginFrame(Cpu.TotalExecutedCycles);
-			Cpu.Debug = CoreComm.Tracer.Enabled;
+			Cpu.Debug = Tracer.Enabled;
 			if (!IsGameGear)
 				PSG.StereoPanning = Settings.ForceStereoSeparation ? ForceStereoByte : (byte) 0xFF;
 
 			if (Cpu.Debug && Cpu.Logger == null) // TODO, lets not do this on each frame. But lets refactor CoreComm/CoreComm first
-				Cpu.Logger = (s) => CoreComm.Tracer.Put(s);
+				Cpu.Logger = (s) => Tracer.Put(s);
 
 			if (IsGameGear == false)
 				Cpu.NonMaskableInterrupt = Controller["Pause"];

BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs

@@ -387,6 +387,16 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 
 		public IInputCallbackSystem InputCallbacks { get { return _inputCallbacks; } }
 
+		private readonly TraceBuffer _tracer = new TraceBuffer();
+
+		public ITracer Tracer
+		{
+			get
+			{
+				return _tracer;
+			}
+		}
+
 		#endregion
 
 		// TODO: use render and rendersound

BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs

@@ -132,6 +132,15 @@ namespace BizHawk.Emulation.Cores.WonderSwan
 
 		public IEmulatorServiceProvider ServiceProvider { get; private set; }
 
+		public ITracer Tracer
+		{
+			[FeatureNotImplemented]
+			get
+			{
+				throw new NotImplementedException();
+			}
+		}
+
 		public void Dispose()
 		{
 			if (Core != IntPtr.Zero)