diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs index 06d1cda9b1..8d35f2a7d2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs @@ -26,6 +26,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 [CoreConstructor("A26")] public Atari2600(CoreComm comm, GameInfo game, byte[] rom, object settings, object syncSettings) { + var ser = new BasicServiceProvider(this); + ServiceProvider = ser; + Tracer = new TraceBuffer(); MemoryCallbacks = new MemoryCallbackSystem(); InputCallbacks = new InputCallbackSystem(); @@ -47,11 +50,10 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 RebootCore(); SetupMemoryDomains(); - var ser = new BasicServiceProvider(this); + ser.Register(Cpu); ser.Register(Tracer); ser.Register(_tia); - ServiceProvider = ser; } public IEmulatorServiceProvider ServiceProvider { get; private set; } diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index 030b42ea63..d0104e090b 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs @@ -157,6 +157,9 @@ namespace BizHawk.Emulation.Cores.PCEngine void Init(GameInfo game, byte[] rom) { + var ser = new BasicServiceProvider(this); + ServiceProvider = ser; + Controller = NullController.GetNullController(); Cpu = new HuC6280(this); VCE = new VCE(); @@ -297,14 +300,10 @@ namespace BizHawk.Emulation.Cores.PCEngine Cpu.ResetPC(); SetupMemoryDomains(); - { - var ser = new BasicServiceProvider(this); - ServiceProvider = ser; - Tracer = new TraceBuffer(); - ser.Register(Tracer); - ser.Register(Cpu); - ser.Register((IVideoProvider)VPC ?? VDC1); - } + Tracer = new TraceBuffer(); + ser.Register(Tracer); + ser.Register(Cpu); + ser.Register((IVideoProvider)VPC ?? VDC1); } int lagCount;