Emulation/Mesen2
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen2.git synced 2024-06-22 22:22:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

File reorganization

Browse source
This commit is contained in:
Sour 2021-04-09 21:45:04 -04:00
parent 2a3a955dc3
commit e27e511558
253 changed files with 1114 additions and 1111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

200
Core/Core.vcxproj
View file

@ -43,13 +43,19 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="BaseState.h" />
<ClInclude Include="Debugger\stdafx.h" />
<ClInclude Include="Netplay\stdafx.h" />
<ClInclude Include="Shared\Audio\stdafx.h" />
<ClInclude Include="Shared\BaseState.h" />
<ClInclude Include="Gameboy\GbControlManager.h" />
<ClInclude Include="Gameboy\stdafx.h" />
<ClInclude Include="IAudioProvider.h" />
<ClInclude Include="IControlManager.h" />
<ClInclude Include="Shared\Interfaces\IAudioProvider.h" />
<ClInclude Include="Shared\Interfaces\IControlManager.h" />
<ClInclude Include="MemoryOperationType.h" />
<ClInclude Include="NesDefaultVideoFilter.h" />
<ClInclude Include="Shared\Interfaces\stdafx.h" />
<ClInclude Include="Shared\Movies\stdafx.h" />
<ClInclude Include="Shared\stdafx.h" />
<ClInclude Include="Shared\Video\NesDefaultVideoFilter.h" />
<ClInclude Include="NES\APU\ApuEnvelope.h" />
<ClInclude Include="NES\APU\ApuFrameCounter.h" />
<ClInclude Include="NES\APU\ApuLengthCounter.h" />
@ -83,18 +89,19 @@
<ClInclude Include="NES\Input\StandardController.h" />
<ClInclude Include="NES\stdafx.h" />
<ClInclude Include="NES\APU\TriangleChannel.h" />
<ClInclude Include="Shared\Video\stdafx.h" />
<ClInclude Include="SNES\AluMulDiv.h" />
<ClInclude Include="SNES\Debugger\Assembler.h" />
<ClInclude Include="SNES\BaseCartridge.h" />
<ClInclude Include="BaseControlDevice.h" />
<ClInclude Include="Shared\BaseControlDevice.h" />
<ClInclude Include="SNES\Coprocessors\BaseCoprocessor.h" />
<ClInclude Include="Debugger\BaseEventManager.h" />
<ClInclude Include="BatteryManager.h" />
<ClInclude Include="Shared\BatteryManager.h" />
<ClInclude Include="SNES\Coprocessors\BSX\BsxCart.h" />
<ClInclude Include="SNES\Coprocessors\BSX\BsxMemoryPack.h" />
<ClInclude Include="SNES\Coprocessors\BSX\BsxSatellaview.h" />
<ClInclude Include="SNES\Coprocessors\BSX\BsxStream.h" />
<ClInclude Include="CheatManager.h" />
<ClInclude Include="Shared\CheatManager.h" />
<ClInclude Include="Netplay\ClientConnectionData.h" />
<ClInclude Include="SNES\Cpu.Shared.h" />
<ClInclude Include="SNES\Coprocessors\SA1\CpuBwRamHandler.h" />
@ -105,7 +112,7 @@
<ClInclude Include="SNES\Coprocessors\CX4\Cx4Types.h" />
<ClInclude Include="Debugger\DebugUtilities.h" />
<ClInclude Include="SNES\DmaControllerTypes.h" />
<ClInclude Include="Emulator.h" />
<ClInclude Include="Shared\Emulator.h" />
<ClInclude Include="Gameboy\Gameboy.h" />
<ClInclude Include="Gameboy\Debugger\GameboyDisUtils.h" />
<ClInclude Include="Gameboy\GameboyHeader.h" />
@ -130,7 +137,7 @@
<ClInclude Include="Gameboy\GbTypes.h" />
<ClInclude Include="Gameboy\GbWaveChannel.h" />
<ClInclude Include="Debugger\IAssembler.h" />
<ClInclude Include="IConsole.h" />
<ClInclude Include="Shared\Interfaces\IConsole.h" />
<ClInclude Include="SNES\Debugger\NecDspDebugger.h" />
<ClInclude Include="Netplay\ForceDisconnectMessage.h" />
<ClInclude Include="Netplay\GameClient.h" />
@ -147,13 +154,13 @@
<ClInclude Include="SNES\Coprocessors\GSU\GsuTypes.h" />
<ClInclude Include="Netplay\HandShakeMessage.h" />
<ClInclude Include="Debugger\IDebugger.h" />
<ClInclude Include="InputDataMessage.h" />
<ClInclude Include="InputHud.h" />
<ClInclude Include="Netplay\InputDataMessage.h" />
<ClInclude Include="Shared\InputHud.h" />
<ClInclude Include="SNES\InternalRegisterTypes.h" />
<ClInclude Include="MemoryMappings.h" />
<ClInclude Include="BaseRenderer.h" />
<ClInclude Include="BaseSoundManager.h" />
<ClInclude Include="BaseVideoFilter.h" />
<ClInclude Include="SNES\MemoryMappings.h" />
<ClInclude Include="Shared\Video\BaseRenderer.h" />
<ClInclude Include="Shared\Audio\BaseSoundManager.h" />
<ClInclude Include="Shared\Video\BaseVideoFilter.h" />
<ClInclude Include="FirmwareHelper.h" />
<ClInclude Include="blargg_common.h" />
<ClInclude Include="blargg_config.h" />
@ -165,17 +172,17 @@
<ClInclude Include="SNES\CartTypes.h" />
<ClInclude Include="Debugger\CodeDataLogger.h" />
<ClInclude Include="SNES\Console.h" />
<ClInclude Include="EmulatorLock.h" />
<ClInclude Include="ControlDeviceState.h" />
<ClInclude Include="Shared\EmulatorLock.h" />
<ClInclude Include="Shared\ControlDeviceState.h" />
<ClInclude Include="SNES\ControlManager.h" />
<ClInclude Include="SNES\Cpu.h" />
<ClInclude Include="SNES\Cpu.Instructions.h" />
<ClInclude Include="SNES\Debugger\CpuDisUtils.h" />
<ClInclude Include="Debugger\DebugBreakHelper.h" />
<ClInclude Include="DebugStats.h" />
<ClInclude Include="Shared\Video\DebugStats.h" />
<ClInclude Include="SNES\Debugger\DummyCpu.h" />
<ClInclude Include="SNES\Debugger\DummySpc.h" />
<ClInclude Include="EmuSettings.h" />
<ClInclude Include="Shared\EmuSettings.h" />
<ClInclude Include="SNES\Debugger\EventManager.h" />
<ClInclude Include="EventType.h" />
<ClInclude Include="Debugger\ExpressionEvaluator.h" />
@ -184,63 +191,63 @@
<ClInclude Include="Debugger\LuaCallHelper.h" />
<ClInclude Include="Debugger\LuaScriptingContext.h" />
<ClInclude Include="Debugger\MemoryAccessCounter.h" />
<ClInclude Include="MessageType.h" />
<ClInclude Include="MovieDataMessage.h" />
<ClInclude Include="MovieTypes.h" />
<ClInclude Include="Netplay\MessageType.h" />
<ClInclude Include="Netplay\MovieDataMessage.h" />
<ClInclude Include="Shared\Movies\MovieTypes.h" />
<ClInclude Include="SNES\Coprocessors\MSU1\Msu1.h" />
<ClInclude Include="SNES\Input\Multitap.h" />
<ClInclude Include="MesenMovie.h" />
<ClInclude Include="MovieManager.h" />
<ClInclude Include="MovieRecorder.h" />
<ClInclude Include="Shared\Movies\MesenMovie.h" />
<ClInclude Include="Shared\Movies\MovieManager.h" />
<ClInclude Include="Shared\Movies\MovieRecorder.h" />
<ClInclude Include="SNES\Coprocessors\DSP\NecDsp.h" />
<ClInclude Include="SNES\Debugger\NecDspDisUtils.h" />
<ClInclude Include="SNES\Coprocessors\DSP\NecDspTypes.h" />
<ClInclude Include="Netplay\NetMessage.h" />
<ClInclude Include="NtscFilter.h" />
<ClInclude Include="Shared\Video\NtscFilter.h" />
<ClInclude Include="SNES\Coprocessors\OBC1\Obc1.h" />
<ClInclude Include="PcmReader.h" />
<ClInclude Include="Shared\Audio\PcmReader.h" />
<ClInclude Include="Netplay\PlayerListMessage.h" />
<ClInclude Include="Debugger\PpuTools.h" />
<ClInclude Include="Debugger\Profiler.h" />
<ClInclude Include="RecordedRomTest.h" />
<ClInclude Include="Shared\RecordedRomTest.h" />
<ClInclude Include="SNES\RegisterHandlerB.h" />
<ClInclude Include="SNES\CpuTypes.h" />
<ClInclude Include="Debugger\Debugger.h" />
<ClInclude Include="DebugHud.h" />
<ClInclude Include="Shared\Video\DebugHud.h" />
<ClInclude Include="Debugger\DebugTypes.h" />
<ClInclude Include="DefaultVideoFilter.h" />
<ClInclude Include="Shared\Video\DefaultVideoFilter.h" />
<ClInclude Include="Debugger\Disassembler.h" />
<ClInclude Include="Debugger\DisassemblyInfo.h" />
<ClInclude Include="SNES\DmaController.h" />
<ClInclude Include="DrawCommand.h" />
<ClInclude Include="DrawLineCommand.h" />
<ClInclude Include="DrawPixelCommand.h" />
<ClInclude Include="DrawRectangleCommand.h" />
<ClInclude Include="DrawScreenBufferCommand.h" />
<ClInclude Include="DrawStringCommand.h" />
<ClInclude Include="FrameLimiter.h" />
<ClInclude Include="IAudioDevice.h" />
<ClInclude Include="IInputProvider.h" />
<ClInclude Include="IInputRecorder.h" />
<ClInclude Include="IKeyManager.h" />
<ClInclude Include="IMemoryHandler.h" />
<ClInclude Include="IMessageManager.h" />
<ClInclude Include="INotificationListener.h" />
<ClInclude Include="Shared\Video\DrawCommand.h" />
<ClInclude Include="Shared\Video\DrawLineCommand.h" />
<ClInclude Include="Shared\Video\DrawPixelCommand.h" />
<ClInclude Include="Shared\Video\DrawRectangleCommand.h" />
<ClInclude Include="Shared\Video\DrawScreenBufferCommand.h" />
<ClInclude Include="Shared\Video\DrawStringCommand.h" />
<ClInclude Include="Shared\FrameLimiter.h" />
<ClInclude Include="Shared\Interfaces\IAudioDevice.h" />
<ClInclude Include="Shared\Interfaces\IInputProvider.h" />
<ClInclude Include="Shared\Interfaces\IInputRecorder.h" />
<ClInclude Include="Shared\Interfaces\IKeyManager.h" />
<ClInclude Include="SNES\IMemoryHandler.h" />
<ClInclude Include="Shared\Interfaces\IMessageManager.h" />
<ClInclude Include="Shared\Interfaces\INotificationListener.h" />
<ClInclude Include="SNES\InternalRegisters.h" />
<ClInclude Include="IRenderingDevice.h" />
<ClInclude Include="KeyManager.h" />
<ClInclude Include="Shared\Interfaces\IRenderingDevice.h" />
<ClInclude Include="Shared\KeyManager.h" />
<ClInclude Include="Debugger\MemoryDumper.h" />
<ClInclude Include="SNES\MemoryManager.h" />
<ClInclude Include="MessageManager.h" />
<ClInclude Include="NotificationManager.h" />
<ClInclude Include="Shared\MessageManager.h" />
<ClInclude Include="Shared\NotificationManager.h" />
<ClInclude Include="SNES\Ppu.h" />
<ClInclude Include="SNES\PpuTypes.h" />
<ClInclude Include="RamHandler.h" />
<ClInclude Include="SNES\RamHandler.h" />
<ClInclude Include="SNES\RegisterHandlerA.h" />
<ClInclude Include="RewindData.h" />
<ClInclude Include="RewindManager.h" />
<ClInclude Include="Shared\RewindData.h" />
<ClInclude Include="Shared\RewindManager.h" />
<ClInclude Include="RomFinder.h" />
<ClInclude Include="RomHandler.h" />
<ClInclude Include="SNES\RomHandler.h" />
<ClInclude Include="SNES\Coprocessors\SPC7110\Rtc4513.h" />
<ClInclude Include="SNES\Coprocessors\SA1\Sa1.h" />
<ClInclude Include="SNES\Coprocessors\SA1\Sa1BwRamHandler.h" />
@ -248,9 +255,9 @@
<ClInclude Include="SNES\Coprocessors\SA1\Sa1IRamHandler.h" />
<ClInclude Include="SNES\Coprocessors\SA1\Sa1Types.h" />
<ClInclude Include="SNES\Coprocessors\SA1\Sa1VectorHandler.h" />
<ClInclude Include="SaveStateManager.h" />
<ClInclude Include="SaveStateMessage.h" />
<ClInclude Include="ScaleFilter.h" />
<ClInclude Include="Shared\SaveStateManager.h" />
<ClInclude Include="Netplay\SaveStateMessage.h" />
<ClInclude Include="Shared\Video\ScaleFilter.h" />
<ClInclude Include="Debugger\ScriptHost.h" />
<ClInclude Include="Debugger\ScriptingContext.h" />
<ClInclude Include="Debugger\ScriptManager.h" />
@ -260,13 +267,13 @@
<ClInclude Include="SNES\Coprocessors\SDD1\Sdd1Types.h" />
<ClInclude Include="Netplay\SelectControllerMessage.h" />
<ClInclude Include="Netplay\ServerInformationMessage.h" />
<ClInclude Include="SettingTypes.h" />
<ClInclude Include="ShortcutKeyHandler.h" />
<ClInclude Include="Shared\SettingTypes.h" />
<ClInclude Include="Shared\ShortcutKeyHandler.h" />
<ClInclude Include="SNES\Input\SnesController.h" />
<ClInclude Include="SnesMemoryType.h" />
<ClInclude Include="SNES\Input\SnesMouse.h" />
<ClInclude Include="SoundMixer.h" />
<ClInclude Include="SoundResampler.h" />
<ClInclude Include="Shared\Audio\SoundMixer.h" />
<ClInclude Include="Shared\Audio\SoundResampler.h" />
<ClInclude Include="SNES\Spc.h" />
<ClInclude Include="SNES\Coprocessors\SPC7110\Spc7110.h" />
<ClInclude Include="SNES\Coprocessors\SPC7110\Spc7110Decomp.h" />
@ -278,18 +285,19 @@
<ClInclude Include="SNES\SpcTypes.h" />
<ClInclude Include="SNES\SPC_DSP.h" />
<ClInclude Include="SNES\SPC_Filter.h" />
<ClInclude Include="SNES\stdafx.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="SNES\Coprocessors\SGB\SuperGameboy.h" />
<ClInclude Include="SNES\Input\SuperScope.h" />
<ClInclude Include="SystemActionManager.h" />
<ClInclude Include="Debugger\TraceLogger.h" />
<ClInclude Include="VideoDecoder.h" />
<ClInclude Include="VideoRenderer.h" />
<ClInclude Include="WaveRecorder.h" />
<ClInclude Include="Shared\Video\VideoDecoder.h" />
<ClInclude Include="Shared\Video\VideoRenderer.h" />
<ClInclude Include="Shared\Audio\WaveRecorder.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="Gameboy\GbControlManager.cpp" />
<ClCompile Include="NesDefaultVideoFilter.cpp" />
<ClCompile Include="Shared\Video\NesDefaultVideoFilter.cpp" />
<ClCompile Include="NES\BaseMapper.cpp" />
<ClCompile Include="NES\NesControlManager.cpp" />
<ClCompile Include="NES\APU\DeltaModulationChannel.cpp" />
@ -309,11 +317,11 @@
<ClCompile Include="SNES\AluMulDiv.cpp" />
<ClCompile Include="SNES\Debugger\Assembler.cpp" />
<ClCompile Include="SNES\BaseCartridge.cpp" />
<ClCompile Include="BaseControlDevice.cpp" />
<ClCompile Include="BaseRenderer.cpp" />
<ClCompile Include="BaseSoundManager.cpp" />
<ClCompile Include="BaseVideoFilter.cpp" />
<ClCompile Include="BatteryManager.cpp" />
<ClCompile Include="Shared\BaseControlDevice.cpp" />
<ClCompile Include="Shared\Video\BaseRenderer.cpp" />
<ClCompile Include="Shared\Audio\BaseSoundManager.cpp" />
<ClCompile Include="Shared\Video\BaseVideoFilter.cpp" />
<ClCompile Include="Shared\BatteryManager.cpp" />
<ClCompile Include="Debugger\Breakpoint.cpp" />
<ClCompile Include="Debugger\BreakpointManager.cpp" />
<ClCompile Include="SNES\Coprocessors\BSX\BsxCart.cpp" />
@ -321,10 +329,10 @@
<ClCompile Include="SNES\Coprocessors\BSX\BsxSatellaview.cpp" />
<ClCompile Include="SNES\Coprocessors\BSX\BsxStream.cpp" />
<ClCompile Include="Debugger\CallstackManager.cpp" />
<ClCompile Include="CheatManager.cpp" />
<ClCompile Include="Shared\CheatManager.cpp" />
<ClCompile Include="Debugger\CodeDataLogger.cpp" />
<ClCompile Include="SNES\Console.cpp" />
<ClCompile Include="EmulatorLock.cpp" />
<ClCompile Include="Shared\EmulatorLock.cpp" />
<ClCompile Include="SNES\ControlManager.cpp" />
<ClCompile Include="SNES\Cpu.cpp" />
<ClCompile Include="SNES\Debugger\CpuDebugger.cpp" />
@ -334,13 +342,13 @@
<ClCompile Include="SNES\Debugger\Cx4Debugger.cpp" />
<ClCompile Include="SNES\Debugger\Cx4DisUtils.cpp" />
<ClCompile Include="Debugger\Debugger.cpp" />
<ClCompile Include="DebugHud.cpp" />
<ClCompile Include="DebugStats.cpp" />
<ClCompile Include="DefaultVideoFilter.cpp" />
<ClCompile Include="Shared\Video\DebugHud.cpp" />
<ClCompile Include="Shared\Video\DebugStats.cpp" />
<ClCompile Include="Shared\Video\DefaultVideoFilter.cpp" />
<ClCompile Include="Debugger\Disassembler.cpp" />
<ClCompile Include="Debugger\DisassemblyInfo.cpp" />
<ClCompile Include="SNES\DmaController.cpp" />
<ClCompile Include="Emulator.cpp" />
<ClCompile Include="Shared\Emulator.cpp" />
<ClCompile Include="Gameboy\Gameboy.cpp" />
<ClCompile Include="Gameboy\Debugger\GameboyDisUtils.cpp" />
<ClCompile Include="Gameboy\GbApu.cpp" />
@ -356,7 +364,7 @@
<ClCompile Include="Gameboy\GbTimer.cpp" />
<ClCompile Include="Gameboy\GbWaveChannel.cpp" />
<ClCompile Include="SNES\Debugger\NecDspDebugger.cpp" />
<ClCompile Include="EmuSettings.cpp" />
<ClCompile Include="Shared\EmuSettings.cpp" />
<ClCompile Include="SNES\Debugger\EventManager.cpp" />
<ClCompile Include="Debugger\ExpressionEvaluator.cpp" />
<ClCompile Include="Netplay\GameClient.cpp" />
@ -368,9 +376,9 @@
<ClCompile Include="SNES\Coprocessors\GSU\Gsu.Instructions.cpp" />
<ClCompile Include="SNES\Debugger\GsuDebugger.cpp" />
<ClCompile Include="SNES\Debugger\GsuDisUtils.cpp" />
<ClCompile Include="InputHud.cpp" />
<ClCompile Include="Shared\InputHud.cpp" />
<ClCompile Include="SNES\InternalRegisters.cpp" />
<ClCompile Include="KeyManager.cpp" />
<ClCompile Include="Shared\KeyManager.cpp" />
<ClCompile Include="Debugger\LabelManager.cpp" />
<ClCompile Include="Debugger\LuaApi.cpp" />
<ClCompile Include="Debugger\LuaCallHelper.cpp" />
@ -378,41 +386,41 @@
<ClCompile Include="Debugger\MemoryAccessCounter.cpp" />
<ClCompile Include="Debugger\MemoryDumper.cpp" />
<ClCompile Include="SNES\MemoryManager.cpp" />
<ClCompile Include="MemoryMappings.cpp" />
<ClCompile Include="MesenMovie.cpp" />
<ClCompile Include="MessageManager.cpp" />
<ClCompile Include="MovieManager.cpp" />
<ClCompile Include="MovieRecorder.cpp" />
<ClCompile Include="SNES\MemoryMappings.cpp" />
<ClCompile Include="Shared\Movies\MesenMovie.cpp" />
<ClCompile Include="Shared\MessageManager.cpp" />
<ClCompile Include="Shared\Movies\MovieManager.cpp" />
<ClCompile Include="Shared\Movies\MovieRecorder.cpp" />
<ClCompile Include="SNES\Coprocessors\MSU1\Msu1.cpp" />
<ClCompile Include="SNES\Input\Multitap.cpp" />
<ClCompile Include="SNES\Coprocessors\DSP\NecDsp.cpp" />
<ClCompile Include="SNES\Debugger\NecDspDisUtils.cpp" />
<ClCompile Include="NotificationManager.cpp" />
<ClCompile Include="NtscFilter.cpp" />
<ClCompile Include="Shared\NotificationManager.cpp" />
<ClCompile Include="Shared\Video\NtscFilter.cpp" />
<ClCompile Include="SNES\Coprocessors\OBC1\Obc1.cpp" />
<ClCompile Include="PcmReader.cpp" />
<ClCompile Include="Shared\Audio\PcmReader.cpp" />
<ClCompile Include="SNES\Ppu.cpp" />
<ClCompile Include="Debugger\PpuTools.cpp" />
<ClCompile Include="Debugger\Profiler.cpp" />
<ClCompile Include="RecordedRomTest.cpp" />
<ClCompile Include="Shared\RecordedRomTest.cpp" />
<ClCompile Include="SNES\RegisterHandlerB.cpp" />
<ClCompile Include="RewindData.cpp" />
<ClCompile Include="RewindManager.cpp" />
<ClCompile Include="Shared\RewindData.cpp" />
<ClCompile Include="Shared\RewindManager.cpp" />
<ClCompile Include="SNES\Coprocessors\SPC7110\Rtc4513.cpp" />
<ClCompile Include="SNES\Coprocessors\SA1\Sa1.cpp" />
<ClCompile Include="SNES\Coprocessors\SA1\Sa1Cpu.cpp" />
<ClCompile Include="SaveStateManager.cpp" />
<ClCompile Include="ScaleFilter.cpp" />
<ClCompile Include="Shared\SaveStateManager.cpp" />
<ClCompile Include="Shared\Video\ScaleFilter.cpp" />
<ClCompile Include="Debugger\ScriptHost.cpp" />
<ClCompile Include="Debugger\ScriptingContext.cpp" />
<ClCompile Include="Debugger\ScriptManager.cpp" />
<ClCompile Include="SNES\Coprocessors\SDD1\Sdd1.cpp" />
<ClCompile Include="SNES\Coprocessors\SDD1\Sdd1Decomp.cpp" />
<ClCompile Include="SNES\Coprocessors\SDD1\Sdd1Mmc.cpp" />
<ClCompile Include="ShortcutKeyHandler.cpp" />
<ClCompile Include="Shared\ShortcutKeyHandler.cpp" />
<ClCompile Include="SNES\Input\SnesController.cpp" />
<ClCompile Include="SoundMixer.cpp" />
<ClCompile Include="SoundResampler.cpp" />
<ClCompile Include="Shared\Audio\SoundMixer.cpp" />
<ClCompile Include="Shared\Audio\SoundResampler.cpp" />
<ClCompile Include="SNES\Spc.cpp" />
<ClCompile Include="SNES\Spc.Instructions.cpp" />
<ClCompile Include="SNES\Coprocessors\SPC7110\Spc7110.cpp" />
@ -436,9 +444,9 @@
</ClCompile>
<ClCompile Include="SNES\Coprocessors\SGB\SuperGameboy.cpp" />
<ClCompile Include="Debugger\TraceLogger.cpp" />
<ClCompile Include="VideoDecoder.cpp" />
<ClCompile Include="VideoRenderer.cpp" />
<ClCompile Include="WaveRecorder.cpp" />
<ClCompile Include="Shared\Video\VideoDecoder.cpp" />
<ClCompile Include="Shared\Video\VideoRenderer.cpp" />
<ClCompile Include="Shared\Audio\WaveRecorder.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{78FEF1A1-6DF1-4CBB-A373-AE6FA7CE5CE0}</ProjectGuid>

200
Core/Core.vcxproj.filters
View file

@ -19,31 +19,31 @@
<ClInclude Include="SNES\Console.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="IAudioDevice.h">
<ClInclude Include="Shared\Interfaces\IAudioDevice.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="IInputProvider.h">
<ClInclude Include="Shared\Interfaces\IInputProvider.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="IInputRecorder.h">
<ClInclude Include="Shared\Interfaces\IInputRecorder.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="IKeyManager.h">
<ClInclude Include="Shared\Interfaces\IKeyManager.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="IMessageManager.h">
<ClInclude Include="Shared\Interfaces\IMessageManager.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="INotificationListener.h">
<ClInclude Include="Shared\Interfaces\INotificationListener.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="IRenderingDevice.h">
<ClInclude Include="Shared\Interfaces\IRenderingDevice.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="MessageManager.h">
<ClInclude Include="Shared\MessageManager.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="KeyManager.h">
<ClInclude Include="Shared\KeyManager.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="SNES\Ppu.h">
@ -52,43 +52,43 @@
<ClInclude Include="SNES\PpuTypes.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="VideoRenderer.h">
<ClInclude Include="Shared\Video\VideoRenderer.h">
<Filter>Video</Filter>
</ClInclude>
<ClInclude Include="VideoDecoder.h">
<ClInclude Include="Shared\Video\VideoDecoder.h">
<Filter>Video</Filter>
</ClInclude>
<ClInclude Include="BaseRenderer.h">
<ClInclude Include="Shared\Video\BaseRenderer.h">
<Filter>Video</Filter>
</ClInclude>
<ClInclude Include="DefaultVideoFilter.h">
<ClInclude Include="Shared\Video\DefaultVideoFilter.h">
<Filter>Video</Filter>
</ClInclude>
<ClInclude Include="BaseVideoFilter.h">
<ClInclude Include="Shared\Video\BaseVideoFilter.h">
<Filter>Video</Filter>
</ClInclude>
<ClInclude Include="SettingTypes.h">
<ClInclude Include="Shared\SettingTypes.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="DebugHud.h">
<ClInclude Include="Shared\Video\DebugHud.h">
<Filter>Video\DebugHud</Filter>
</ClInclude>
<ClInclude Include="DrawCommand.h">
<ClInclude Include="Shared\Video\DrawCommand.h">
<Filter>Video\DebugHud</Filter>
</ClInclude>
<ClInclude Include="DrawLineCommand.h">
<ClInclude Include="Shared\Video\DrawLineCommand.h">
<Filter>Video\DebugHud</Filter>
</ClInclude>
<ClInclude Include="DrawPixelCommand.h">
<ClInclude Include="Shared\Video\DrawPixelCommand.h">
<Filter>Video\DebugHud</Filter>
</ClInclude>
<ClInclude Include="DrawRectangleCommand.h">
<ClInclude Include="Shared\Video\DrawRectangleCommand.h">
<Filter>Video\DebugHud</Filter>
</ClInclude>
<ClInclude Include="DrawScreenBufferCommand.h">
<ClInclude Include="Shared\Video\DrawScreenBufferCommand.h">
<Filter>Video\DebugHud</Filter>
</ClInclude>
<ClInclude Include="DrawStringCommand.h">
<ClInclude Include="Shared\Video\DrawStringCommand.h">
<Filter>Video\DebugHud</Filter>
</ClInclude>
<ClInclude Include="SNES\DmaController.h">
@ -103,10 +103,10 @@
<ClInclude Include="SNES\BaseCartridge.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="IMemoryHandler.h">
<ClInclude Include="SNES\IMemoryHandler.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="NotificationManager.h">
<ClInclude Include="Shared\NotificationManager.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="blargg_common.h">
@ -130,22 +130,22 @@
<ClInclude Include="SNES\Spc.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="RomHandler.h">
<ClInclude Include="SNES\RomHandler.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="RamHandler.h">
<ClInclude Include="SNES\RamHandler.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="SNES\InternalRegisters.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="BaseControlDevice.h">
<ClInclude Include="Shared\BaseControlDevice.h">
<Filter>SNES\Input</Filter>
</ClInclude>
<ClInclude Include="SNES\Input\SnesController.h">
<Filter>SNES\Input</Filter>
</ClInclude>
<ClInclude Include="ControlDeviceState.h">
<ClInclude Include="Shared\ControlDeviceState.h">
<Filter>SNES\Input</Filter>
</ClInclude>
<ClInclude Include="SNES\ControlManager.h">
@ -181,46 +181,46 @@
<ClInclude Include="Debugger\DebugBreakHelper.h">
<Filter>Debugger</Filter>
</ClInclude>
<ClInclude Include="EmuSettings.h">
<ClInclude Include="Shared\EmuSettings.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="ScaleFilter.h">
<ClInclude Include="Shared\Video\ScaleFilter.h">
<Filter>Video</Filter>
</ClInclude>
<ClInclude Include="NtscFilter.h">
<ClInclude Include="Shared\Video\NtscFilter.h">
<Filter>Video</Filter>
</ClInclude>
<ClInclude Include="SoundMixer.h">
<ClInclude Include="Shared\Audio\SoundMixer.h">
<Filter>Audio</Filter>
</ClInclude>
<ClInclude Include="SoundResampler.h">
<ClInclude Include="Shared\Audio\SoundResampler.h">
<Filter>Audio</Filter>
</ClInclude>
<ClInclude Include="BaseSoundManager.h">
<ClInclude Include="Shared\Audio\BaseSoundManager.h">
<Filter>Audio</Filter>
</ClInclude>
<ClInclude Include="DebugStats.h">
<ClInclude Include="Shared\Video\DebugStats.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="ShortcutKeyHandler.h">
<ClInclude Include="Shared\ShortcutKeyHandler.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="SaveStateManager.h">
<ClInclude Include="Shared\SaveStateManager.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="SNES\CartTypes.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="EmulatorLock.h">
<ClInclude Include="Shared\EmulatorLock.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="RewindData.h">
<ClInclude Include="Shared\RewindData.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="RewindManager.h">
<ClInclude Include="Shared\RewindManager.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="WaveRecorder.h">
<ClInclude Include="Shared\Audio\WaveRecorder.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="SNES\Input\SnesMouse.h">
@ -289,7 +289,7 @@
<ClInclude Include="FirmwareHelper.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="MemoryMappings.h">
<ClInclude Include="SNES\MemoryMappings.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="Debugger\DebugUtilities.h">
@ -373,22 +373,22 @@
<ClInclude Include="SNES\Input\Multitap.h">
<Filter>SNES\Input</Filter>
</ClInclude>
<ClInclude Include="MesenMovie.h">
<ClInclude Include="Shared\Movies\MesenMovie.h">
<Filter>Movies</Filter>
</ClInclude>
<ClInclude Include="MovieManager.h">
<ClInclude Include="Shared\Movies\MovieManager.h">
<Filter>Movies</Filter>
</ClInclude>
<ClInclude Include="MovieRecorder.h">
<ClInclude Include="Shared\Movies\MovieRecorder.h">
<Filter>Movies</Filter>
</ClInclude>
<ClInclude Include="MovieTypes.h">
<ClInclude Include="Shared\Movies\MovieTypes.h">
<Filter>Movies</Filter>
</ClInclude>
<ClInclude Include="BatteryManager.h">
<ClInclude Include="Shared\BatteryManager.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="FrameLimiter.h">
<ClInclude Include="Shared\FrameLimiter.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="SNES\Input\SuperScope.h">
@ -400,13 +400,13 @@
<ClInclude Include="SNES\DmaControllerTypes.h">
<Filter>SNES</Filter>
</ClInclude>
<ClInclude Include="CheatManager.h">
<ClInclude Include="Shared\CheatManager.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="RecordedRomTest.h">
<ClInclude Include="Shared\RecordedRomTest.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="InputHud.h">
<ClInclude Include="Shared\InputHud.h">
<Filter>SNES\Input</Filter>
</ClInclude>
<ClInclude Include="SNES\SpcHud.h">
@ -430,7 +430,7 @@
<ClInclude Include="Netplay\ServerInformationMessage.h">
<Filter>Netplay\Messages</Filter>
</ClInclude>
<ClInclude Include="SaveStateMessage.h">
<ClInclude Include="Netplay\SaveStateMessage.h">
<Filter>Netplay\Messages</Filter>
</ClInclude>
<ClInclude Include="Netplay\PlayerListMessage.h">
@ -451,13 +451,13 @@
<ClInclude Include="Netplay\SelectControllerMessage.h">
<Filter>Netplay\Messages</Filter>
</ClInclude>
<ClInclude Include="MovieDataMessage.h">
<ClInclude Include="Netplay\MovieDataMessage.h">
<Filter>Netplay\Messages</Filter>
</ClInclude>
<ClInclude Include="InputDataMessage.h">
<ClInclude Include="Netplay\InputDataMessage.h">
<Filter>Netplay\Messages</Filter>
</ClInclude>
<ClInclude Include="MessageType.h">
<ClInclude Include="Netplay\MessageType.h">
<Filter>Netplay\Messages</Filter>
</ClInclude>
<ClInclude Include="Netplay\ClientConnectionData.h">
@ -475,7 +475,7 @@
<ClInclude Include="SNES\Coprocessors\MSU1\Msu1.h">
<Filter>SNES\Coprocessors\MSU1</Filter>
</ClInclude>
<ClInclude Include="PcmReader.h">
<ClInclude Include="Shared\Audio\PcmReader.h">
<Filter>SNES\Coprocessors\MSU1</Filter>
</ClInclude>
<ClInclude Include="SNES\Coprocessors\SA1\Sa1IRamHandler.h">
@ -601,8 +601,8 @@
<ClInclude Include="Gameboy\GbBootRom.h">
<Filter>GB</Filter>
</ClInclude>
<ClInclude Include="Emulator.h" />
<ClInclude Include="IConsole.h" />
<ClInclude Include="Shared\Emulator.h" />
<ClInclude Include="Shared\Interfaces\IConsole.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="NES\APU\ApuEnvelope.h">
<Filter>NES</Filter>
@ -691,10 +691,10 @@
<ClInclude Include="MemoryOperationType.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="IControlManager.h">
<ClInclude Include="Shared\Interfaces\IControlManager.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="NesDefaultVideoFilter.h">
<ClInclude Include="Shared\Video\NesDefaultVideoFilter.h">
<Filter>Video</Filter>
</ClInclude>
<ClInclude Include="NES\NesControlManager.h">
@ -712,7 +712,7 @@
<ClInclude Include="Gameboy\stdafx.h">
<Filter>GB</Filter>
</ClInclude>
<ClInclude Include="IAudioProvider.h">
<ClInclude Include="Shared\Interfaces\IAudioProvider.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="NES\Debugger\NesDebugger.h">
@ -721,9 +721,17 @@
<ClInclude Include="NES\Debugger\NesDisUtils.h">
<Filter>Debugger\Disassembler</Filter>
</ClInclude>
<ClInclude Include="BaseState.h">
<ClInclude Include="Shared\BaseState.h">
<Filter>Interfaces</Filter>
</ClInclude>
<ClInclude Include="Debugger\stdafx.h" />
<ClInclude Include="Shared\Audio\stdafx.h" />
<ClInclude Include="Shared\Video\stdafx.h" />
<ClInclude Include="Shared\Movies\stdafx.h" />
<ClInclude Include="Shared\Interfaces\stdafx.h" />
<ClInclude Include="Shared\stdafx.h" />
<ClInclude Include="SNES\stdafx.h" />
<ClInclude Include="Netplay\stdafx.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="SNES\Cpu.cpp">
@ -738,31 +746,31 @@
<ClCompile Include="SNES\Console.cpp">
<Filter>SNES</Filter>
</ClCompile>
<ClCompile Include="MessageManager.cpp">
<ClCompile Include="Shared\MessageManager.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="KeyManager.cpp">
<ClCompile Include="Shared\KeyManager.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="SNES\Ppu.cpp">
<Filter>SNES</Filter>
</ClCompile>
<ClCompile Include="VideoDecoder.cpp">
<ClCompile Include="Shared\Video\VideoDecoder.cpp">
<Filter>Video</Filter>
</ClCompile>
<ClCompile Include="VideoRenderer.cpp">
<ClCompile Include="Shared\Video\VideoRenderer.cpp">
<Filter>Video</Filter>
</ClCompile>
<ClCompile Include="BaseRenderer.cpp">
<ClCompile Include="Shared\Video\BaseRenderer.cpp">
<Filter>Video</Filter>
</ClCompile>
<ClCompile Include="DefaultVideoFilter.cpp">
<ClCompile Include="Shared\Video\DefaultVideoFilter.cpp">
<Filter>Video</Filter>
</ClCompile>
<ClCompile Include="BaseVideoFilter.cpp">
<ClCompile Include="Shared\Video\BaseVideoFilter.cpp">
<Filter>Video</Filter>
</ClCompile>
<ClCompile Include="DebugHud.cpp">
<ClCompile Include="Shared\Video\DebugHud.cpp">
<Filter>Video\DebugHud</Filter>
</ClCompile>
<ClCompile Include="SNES\DmaController.cpp">
@ -771,7 +779,7 @@
<ClCompile Include="Debugger\MemoryDumper.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="NotificationManager.cpp">
<ClCompile Include="Shared\NotificationManager.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="SNES\SPC_DSP.cpp">
@ -789,7 +797,7 @@
<ClCompile Include="SNES\InternalRegisters.cpp">
<Filter>SNES</Filter>
</ClCompile>
<ClCompile Include="BaseControlDevice.cpp">
<ClCompile Include="Shared\BaseControlDevice.cpp">
<Filter>SNES\Input</Filter>
</ClCompile>
<ClCompile Include="SNES\ControlManager.cpp">
@ -813,43 +821,43 @@
<ClCompile Include="Debugger\PpuTools.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="EmuSettings.cpp">
<ClCompile Include="Shared\EmuSettings.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="ScaleFilter.cpp">
<ClCompile Include="Shared\Video\ScaleFilter.cpp">
<Filter>Video</Filter>
</ClCompile>
<ClCompile Include="NtscFilter.cpp">
<ClCompile Include="Shared\Video\NtscFilter.cpp">
<Filter>Video</Filter>
</ClCompile>
<ClCompile Include="SoundMixer.cpp">
<ClCompile Include="Shared\Audio\SoundMixer.cpp">
<Filter>Audio</Filter>
</ClCompile>
<ClCompile Include="SoundResampler.cpp">
<ClCompile Include="Shared\Audio\SoundResampler.cpp">
<Filter>Audio</Filter>
</ClCompile>
<ClCompile Include="BaseSoundManager.cpp">
<ClCompile Include="Shared\Audio\BaseSoundManager.cpp">
<Filter>Audio</Filter>
</ClCompile>
<ClCompile Include="ShortcutKeyHandler.cpp">
<ClCompile Include="Shared\ShortcutKeyHandler.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="DebugStats.cpp">
<ClCompile Include="Shared\Video\DebugStats.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="SNES\RegisterHandlerB.cpp">
<Filter>SNES</Filter>
</ClCompile>
<ClCompile Include="SaveStateManager.cpp">
<ClCompile Include="Shared\SaveStateManager.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="RewindData.cpp">
<ClCompile Include="Shared\RewindData.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="RewindManager.cpp">
<ClCompile Include="Shared\RewindManager.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="WaveRecorder.cpp">
<ClCompile Include="Shared\Audio\WaveRecorder.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="SNES\Spc.Instructions.cpp">
@ -873,7 +881,7 @@
<ClCompile Include="SNES\Debugger\SpcDisUtils.cpp">
<Filter>Debugger\Disassembler</Filter>
</ClCompile>
<ClCompile Include="EmulatorLock.cpp">
<ClCompile Include="Shared\EmulatorLock.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="Debugger\LabelManager.cpp">
@ -903,7 +911,7 @@
<ClCompile Include="SNES\Debugger\NecDspDisUtils.cpp">
<Filter>Debugger\Disassembler</Filter>
</ClCompile>
<ClCompile Include="MemoryMappings.cpp">
<ClCompile Include="SNES\MemoryMappings.cpp">
<Filter>SNES</Filter>
</ClCompile>
<ClCompile Include="SNES\Coprocessors\SA1\Sa1.cpp">
@ -954,28 +962,28 @@
<ClCompile Include="SNES\Coprocessors\OBC1\Obc1.cpp">
<Filter>SNES\Coprocessors\OBC1</Filter>
</ClCompile>
<ClCompile Include="MesenMovie.cpp">
<ClCompile Include="Shared\Movies\MesenMovie.cpp">
<Filter>Movies</Filter>
</ClCompile>
<ClCompile Include="MovieRecorder.cpp">
<ClCompile Include="Shared\Movies\MovieRecorder.cpp">
<Filter>Movies</Filter>
</ClCompile>
<ClCompile Include="MovieManager.cpp">
<ClCompile Include="Shared\Movies\MovieManager.cpp">
<Filter>Movies</Filter>
</ClCompile>
<ClCompile Include="BatteryManager.cpp">
<ClCompile Include="Shared\BatteryManager.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="CheatManager.cpp">
<ClCompile Include="Shared\CheatManager.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="SNES\Input\SnesController.cpp">
<Filter>SNES\Input</Filter>
</ClCompile>
<ClCompile Include="RecordedRomTest.cpp">
<ClCompile Include="Shared\RecordedRomTest.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="InputHud.cpp">
<ClCompile Include="Shared\InputHud.cpp">
<Filter>SNES\Input</Filter>
</ClCompile>
<ClCompile Include="SNES\Input\Multitap.cpp">
@ -999,7 +1007,7 @@
<ClCompile Include="Netplay\GameServer.cpp">
<Filter>Netplay</Filter>
</ClCompile>
<ClCompile Include="PcmReader.cpp">
<ClCompile Include="Shared\Audio\PcmReader.cpp">
<Filter>SNES\Coprocessors\MSU1</Filter>
</ClCompile>
<ClCompile Include="SNES\Coprocessors\MSU1\Msu1.cpp">
@ -1086,7 +1094,7 @@
<ClCompile Include="SNES\Coprocessors\SGB\SuperGameboy.cpp">
<Filter>SNES\Coprocessors\SuperGameboy</Filter>
</ClCompile>
<ClCompile Include="Emulator.cpp" />
<ClCompile Include="Shared\Emulator.cpp" />
<ClCompile Include="stdafx.cpp" />
<ClCompile Include="NES\BaseMapper.cpp">
<Filter>NES</Filter>
@ -1127,7 +1135,7 @@
<ClCompile Include="NES\NesConsole.cpp">
<Filter>NES</Filter>
</ClCompile>
<ClCompile Include="NesDefaultVideoFilter.cpp">
<ClCompile Include="Shared\Video\NesDefaultVideoFilter.cpp">
<Filter>Video</Filter>
</ClCompile>
<ClCompile Include="NES\NesControlManager.cpp">

4
Core/Debugger/DebugBreakHelper.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "Debugger.h"
#include "Emulator.h"
#include "Debugger/Debugger.h"
#include "Shared/Emulator.h"
class DebugBreakHelper
{

5
Core/Debugger/DebugTypes.h
View file

@ -1,7 +1,8 @@
#pragma once
#include "stdafx.h"
#include "SnesMemoryType.h"
#include "MemoryOperationType.h"
#include "Core/MemoryOperationType.h"
enum class SnesMemoryType;
struct AddressInfo
{

3
Core/Debugger/DebugUtilities.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "stdafx.h"
#include "DebugTypes.h"
#include "Core/Debugger/DebugTypes.h"
#include "Core/SnesMemoryType.h"
class DebugUtilities
{

62
Core/Debugger/Debugger.cpp
View file

@ -1,8 +1,20 @@
#include "stdafx.h"
#include "Debugger.h"
#include "DebugTypes.h"
#include "Emulator.h"
#include "IConsole.h"
#include "Debugger/Debugger.h"
#include "Debugger/DebugTypes.h"
#include "Debugger/DisassemblyInfo.h"
#include "Debugger/TraceLogger.h"
#include "Debugger/MemoryDumper.h"
#include "Debugger/MemoryAccessCounter.h"
#include "Debugger/CodeDataLogger.h"
#include "Debugger/Disassembler.h"
#include "Debugger/BreakpointManager.h"
#include "Debugger/PpuTools.h"
#include "Debugger/DebugBreakHelper.h"
#include "Debugger/LabelManager.h"
#include "Debugger/ScriptManager.h"
#include "Debugger/CallstackManager.h"
#include "Debugger/ExpressionEvaluator.h"
#include "Debugger/BaseEventManager.h"
#include "SNES/Cpu.h"
#include "SNES/Ppu.h"
#include "SNES/Spc.h"
@ -10,48 +22,36 @@
#include "SNES/Coprocessors/GSU/Gsu.h"
#include "SNES/Coprocessors/CX4/Cx4.h"
#include "SNES/Coprocessors/DSP/NecDsp.h"
#include "Gameboy/Gameboy.h"
#include "SNES/BaseCartridge.h"
#include "SNES/MemoryManager.h"
#include "SNES/MemoryMappings.h"
#include "SNES/Debugger/CpuDebugger.h"
#include "SNES/Debugger/SpcDebugger.h"
#include "SNES/Debugger/GsuDebugger.h"
#include "SNES/Debugger/NecDspDebugger.h"
#include "SNES/Debugger/Cx4Debugger.h"
#include "Gameboy/Debugger/GbDebugger.h"
#include "SNES/BaseCartridge.h"
#include "SNES/MemoryManager.h"
#include "EmuSettings.h"
#include "SoundMixer.h"
#include "MemoryMappings.h"
#include "NotificationManager.h"
#include "SNES/CpuTypes.h"
#include "DisassemblyInfo.h"
#include "TraceLogger.h"
#include "MemoryDumper.h"
#include "MemoryAccessCounter.h"
#include "CodeDataLogger.h"
#include "Disassembler.h"
#include "BreakpointManager.h"
#include "PpuTools.h"
#include "EventType.h"
#include "DebugBreakHelper.h"
#include "LabelManager.h"
#include "ScriptManager.h"
#include "CallstackManager.h"
#include "ExpressionEvaluator.h"
#include "SNES/InternalRegisters.h"
#include "SNES/AluMulDiv.h"
#include "SNES/DmaController.h"
#include "SNES/CpuTypes.h"
#include "NES/Debugger/NesDebugger.h"
#include "NES/NesTypes.h"
#include "Gameboy/Debugger/GbDebugger.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/GbPpu.h"
#include "Gameboy/GameboyHeader.h"
#include "Shared/EmuSettings.h"
#include "Shared/Audio/SoundMixer.h"
#include "Shared/NotificationManager.h"
#include "Shared/BaseState.h"
#include "Shared/Emulator.h"
#include "Shared/Interfaces/IConsole.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/FolderUtilities.h"
#include "Utilities/IpsPatcher.h"
#include "MemoryOperationType.h"
#include "NES/Debugger/NesDebugger.h"
#include "NES/NesTypes.h"
#include "BaseState.h"
#include "BaseEventManager.h"
#include "EventType.h"
Debugger::Debugger(Emulator* emu, IConsole* console)
{

18
Core/Debugger/Disassembler.cpp
View file

@ -1,19 +1,19 @@
#include "stdafx.h"
#include <algorithm>
#include "Disassembler.h"
#include "DisassemblyInfo.h"
#include "Debugger.h"
#include "LabelManager.h"
#include "MemoryDumper.h"
#include "CodeDataLogger.h"
#include "DebugBreakHelper.h"
#include "EmuSettings.h"
#include "DebugUtilities.h"
#include "Debugger/Disassembler.h"
#include "Debugger/DisassemblyInfo.h"
#include "Debugger/Debugger.h"
#include "Debugger/LabelManager.h"
#include "Debugger/MemoryDumper.h"
#include "Debugger/CodeDataLogger.h"
#include "Debugger/DebugBreakHelper.h"
#include "Debugger/DebugUtilities.h"
#include "SNES/CpuTypes.h"
#include "SNES/SpcTypes.h"
#include "SNES/Coprocessors/GSU/GsuTypes.h"
#include "Gameboy/GbTypes.h"
#include "NES/NesTypes.h"
#include "Shared/EmuSettings.h"
#include "Utilities/FastString.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/StringUtilities.h"

8
Core/Debugger/DisassemblyInfo.cpp
View file

@ -1,11 +1,10 @@
#include "stdafx.h"
#include <algorithm>
#include "DisassemblyInfo.h"
#include "EmuSettings.h"
#include "MemoryDumper.h"
#include "Debugger/DisassemblyInfo.h"
#include "Debugger/MemoryDumper.h"
#include "Debugger/DebugUtilities.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/FastString.h"
#include "DebugUtilities.h"
#include "SNES/CpuTypes.h"
#include "SNES/Console.h"
#include "SNES/Debugger/CpuDisUtils.h"
@ -15,6 +14,7 @@
#include "SNES/Debugger/Cx4DisUtils.h"
#include "Gameboy/Debugger/GameboyDisUtils.h"
#include "NES/Debugger/NesDisUtils.h"
#include "Shared/EmuSettings.h"
DisassemblyInfo::DisassemblyInfo()
{

16
Core/Debugger/ExpressionEvaluator.cpp
View file

@ -1,15 +1,15 @@
#include "stdafx.h"
#include <climits>
#include <algorithm>
#include "DebugTypes.h"
#include "ExpressionEvaluator.h"
#include "Debugger/DebugTypes.h"
#include "Debugger/ExpressionEvaluator.h"
#include "SNES/Console.h"
#include "Debugger.h"
#include "MemoryDumper.h"
#include "Disassembler.h"
#include "LabelManager.h"
#include "DebugUtilities.h"
#include "BaseState.h"
#include "Debugger/Debugger.h"
#include "Debugger/MemoryDumper.h"
#include "Debugger/Disassembler.h"
#include "Debugger/LabelManager.h"
#include "Debugger/DebugUtilities.h"
#include "Shared/BaseState.h"
#include "Utilities/HexUtilities.h"
const vector<string> ExpressionEvaluator::_binaryOperators = { { "*", "/", "%", "+", "-", "<<", ">>", "<", "<=", ">", ">=", "==", "!=", "&", "^", "|", "&&", "||" } };

34
Core/Debugger/LuaApi.cpp
View file

@ -2,29 +2,29 @@
#ifndef LIBRETRO
#include "LuaApi.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/FolderUtilities.h"
#include "../Lua/lua.hpp"
#include "LuaCallHelper.h"
#include "Debugger.h"
#include "MemoryDumper.h"
#include "MessageManager.h"
#include "ScriptingContext.h"
#include "DebugHud.h"
#include "VideoDecoder.h"
#include "RewindManager.h"
#include "SaveStateManager.h"
#include "Emulator.h"
#include "Debugger/LuaCallHelper.h"
#include "Debugger/Debugger.h"
#include "Debugger/MemoryDumper.h"
#include "Debugger/ScriptingContext.h"
#include "SNES/Console.h"
#include "SNES/BaseCartridge.h"
#include "IKeyManager.h"
#include "SNES/ControlManager.h"
#include "SNES/Input/SnesController.h"
#include "SNES/Ppu.h"
#include "KeyManager.h"
#include "MemoryAccessCounter.h"
#include "LabelManager.h"
#include "DefaultVideoFilter.h"
#include "Debugger/MemoryAccessCounter.h"
#include "Debugger/LabelManager.h"
#include "Shared/Video/DebugHud.h"
#include "Shared/Video/VideoDecoder.h"
#include "Shared/Video/DefaultVideoFilter.h"
#include "Shared/MessageManager.h"
#include "Shared/RewindManager.h"
#include "Shared/SaveStateManager.h"
#include "Shared/Emulator.h"
#include "Shared/KeyManager.h"
#include "Shared/Interfaces/IKeyManager.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/FolderUtilities.h"
#include "MemoryOperationType.h"
#define lua_pushintvalue(name, value) lua_pushliteral(lua, #name); lua_pushinteger(lua, (int)value); lua_settable(lua, -3);

1
Core/Debugger/MemoryAccessCounter.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "stdafx.h"
#include "DebugTypes.h"
#include "SnesMemoryType.h"
class Debugger;
class MemoryManager;

14
Core/Debugger/MemoryDumper.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h"
#include "Debugger.h"
#include "Emulator.h"
#include "Debugger/Debugger.h"
#include "Shared/Emulator.h"
#include "SNES/MemoryManager.h"
#include "SNES/Ppu.h"
#include "SNES/Spc.h"
@ -13,14 +13,14 @@
#include "SNES/Coprocessors/BSX/BsxCart.h"
#include "SNES/Coprocessors/BSX/BsxMemoryPack.h"
#include "SNES/Console.h"
#include "MemoryDumper.h"
#include "Debugger/MemoryDumper.h"
#include "SNES/BaseCartridge.h"
#include "NES/NesConsole.h"
#include "NES/NesMemoryManager.h"
#include "VideoDecoder.h"
#include "DebugTypes.h"
#include "DebugBreakHelper.h"
#include "Disassembler.h"
#include "Shared/Video/VideoDecoder.h"
#include "Debugger/DebugTypes.h"
#include "Debugger/DebugBreakHelper.h"
#include "Debugger/Disassembler.h"
MemoryDumper::MemoryDumper(Debugger* debugger)
{

1
Core/Debugger/MemoryDumper.h
View file

@ -8,6 +8,7 @@ class NesMemoryManager;
class BaseCartridge;
class Ppu;
class Spc;
class Emulator;
class Debugger;
class Disassembler;
enum class SnesMemoryType;

8
Core/Debugger/PpuTools.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h"
#include "PpuTools.h"
#include "DebugTypes.h"
#include "NotificationManager.h"
#include "DefaultVideoFilter.h"
#include "Debugger/PpuTools.h"
#include "Debugger/DebugTypes.h"
#include "Shared/NotificationManager.h"
#include "Shared/Video/DefaultVideoFilter.h"
#include "SNES/Ppu.h"
#include "SNES/Console.h"
#include "SNES/BaseCartridge.h"

6
Core/Debugger/PpuTools.h
View file

@ -1,8 +1,8 @@
#pragma once
#include "stdafx.h"
#include "DebugTypes.h"
#include "Emulator.h"
#include "NotificationManager.h"
#include "Debugger/DebugTypes.h"
#include "Shared/Emulator.h"
#include "Shared/NotificationManager.h"
#include "SNES/PpuTypes.h"
class Ppu;

12
Core/Debugger/ScriptManager.cpp
View file

@ -1,10 +1,10 @@
#include "stdafx.h"
#include "ScriptManager.h"
#include "ScriptHost.h"
#include "DebugBreakHelper.h"
#include "Debugger.h"
#include "Emulator.h"
#include "DebugHud.h"
#include "Debugger/ScriptManager.h"
#include "Debugger/ScriptHost.h"
#include "Debugger/DebugBreakHelper.h"
#include "Debugger/Debugger.h"
#include "Shared/Emulator.h"
#include "Shared/Video/DebugHud.h"
#include "MemoryOperationType.h"
ScriptManager::ScriptManager(Debugger* debugger)

10
Core/Debugger/ScriptingContext.cpp
View file

@ -1,10 +1,10 @@
#include "stdafx.h"
#include <algorithm>
#include "ScriptingContext.h"
#include "DebugTypes.h"
#include "Debugger.h"
#include "Emulator.h"
#include "SaveStateManager.h"
#include "Debugger/ScriptingContext.h"
#include "Debugger/DebugTypes.h"
#include "Debugger/Debugger.h"
#include "Shared/Emulator.h"
#include "Shared/SaveStateManager.h"
string ScriptingContext::_log = "";

18
Core/Debugger/TraceLogger.cpp
View file

@ -1,13 +1,13 @@
#include "stdafx.h"
#include <regex>
#include <algorithm>
#include "TraceLogger.h"
#include "DisassemblyInfo.h"
#include "Emulator.h"
#include "EmuSettings.h"
#include "Debugger.h"
#include "LabelManager.h"
#include "DebugUtilities.h"
#include "Debugger/TraceLogger.h"
#include "Debugger/DisassemblyInfo.h"
#include "Debugger/Debugger.h"
#include "Debugger/LabelManager.h"
#include "Debugger/DebugTypes.h"
#include "Debugger/DebugUtilities.h"
#include "Debugger/DebugBreakHelper.h"
#include "SNES/MemoryManager.h"
#include "SNES/Console.h"
#include "SNES/CpuTypes.h"
@ -19,9 +19,9 @@
#include "Gameboy/GbTypes.h"
#include "NES/NesTypes.h"
#include "NES/Debugger/NesDebuggerTypes.h"
#include "DebugTypes.h"
#include "Utilities/HexUtilities.h"
#include "DebugBreakHelper.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
string TraceLogger::_executionTrace = "";

2
Core/Debugger/stdafx.h Normal file
View file

@ -0,0 +1,2 @@
#pragma once
#include "../stdafx.h"

4
Core/FirmwareHelper.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "Emulator.h"
#include "NotificationManager.h"
#include "Shared/Emulator.h"
#include "Shared/NotificationManager.h"
#include "Utilities/FolderUtilities.h"
struct MissingFirmwareMessage

6
Core/Gameboy/Carts/GbCart.h
View file

@ -1,8 +1,8 @@
#pragma once
#include "stdafx.h"
#include "Gameboy.h"
#include "GbMemoryManager.h"
#include "MessageManager.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/GbMemoryManager.h"
#include "Shared/MessageManager.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/ISerializable.h"

2
Core/Gameboy/Debugger/GameboyDisUtils.cpp
View file

@ -3,7 +3,7 @@
#include "Gameboy/GbTypes.h"
#include "Debugger/DisassemblyInfo.h"
#include "Debugger/LabelManager.h"
#include "EmuSettings.h"
#include "Shared/EmuSettings.h"
#include "Utilities/FastString.h"
#include "Utilities/HexUtilities.h"

4
Core/Gameboy/Debugger/GbDebugger.cpp
View file

@ -19,9 +19,9 @@
#include "Gameboy/GbCpu.h"
#include "SNES/Console.h"
#include "SNES/BaseCartridge.h"
#include "EmuSettings.h"
#include "Shared/EmuSettings.h"
#include "Shared/Emulator.h"
#include "MemoryOperationType.h"
#include "Emulator.h"
GbDebugger::GbDebugger(Debugger* debugger)
{

4
Core/Gameboy/Debugger/GbEventManager.cpp
View file

@ -1,13 +1,13 @@
#include "stdafx.h"
#include "GbEventManager.h"
#include "Gameboy/Debugger/GbEventManager.h"
#include "Gameboy/GbCpu.h"
#include "Gameboy/GbPpu.h"
#include "DefaultVideoFilter.h"
#include "Gameboy/Gameboy.h"
#include "Debugger/DebugTypes.h"
#include "Debugger/Debugger.h"
#include "Debugger/DebugBreakHelper.h"
#include "Debugger/BaseEventManager.h"
#include "Shared/Video/DefaultVideoFilter.h"
GbEventManager::GbEventManager(Debugger* debugger, GbCpu* cpu, GbPpu* ppu)
{

32
Core/Gameboy/Gameboy.cpp
View file

@ -1,23 +1,23 @@
#include "stdafx.h"
#include "Gameboy.h"
#include "GbCpu.h"
#include "GbPpu.h"
#include "GbApu.h"
#include "Carts/GbCart.h"
#include "GbTimer.h"
#include "GbControlManager.h"
#include "GbDmaController.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/GbCpu.h"
#include "Gameboy/GbPpu.h"
#include "Gameboy/GbApu.h"
#include "Gameboy/Carts/GbCart.h"
#include "Gameboy/GbTimer.h"
#include "Gameboy/GbControlManager.h"
#include "Gameboy/GbDmaController.h"
#include "Gameboy/GbMemoryManager.h"
#include "Gameboy/GbCartFactory.h"
#include "Gameboy/GameboyHeader.h"
#include "Gameboy/GbBootRom.h"
#include "Debugger/DebugTypes.h"
#include "GbMemoryManager.h"
#include "GbCartFactory.h"
#include "BatteryManager.h"
#include "GameboyHeader.h"
#include "EmuSettings.h"
#include "MessageManager.h"
#include "FirmwareHelper.h"
#include "GbBootRom.h"
#include "Shared/BatteryManager.h"
#include "Shared/EmuSettings.h"
#include "Shared/MessageManager.h"
#include "Utilities/VirtualFile.h"
#include "Utilities/Serializer.h"
#include "FirmwareHelper.h"
Gameboy::Gameboy(Emulator* emu, bool allowSgb)
{

8
Core/Gameboy/Gameboy.h
View file

@ -1,10 +1,10 @@
#pragma once
#include "stdafx.h"
#include "Gameboy/GameboyHeader.h"
#include "Gameboy/GbTypes.h"
#include "Debugger/DebugTypes.h"
#include "GameboyHeader.h"
#include "SettingTypes.h"
#include "GbTypes.h"
#include "IConsole.h"
#include "Shared/SettingTypes.h"
#include "Shared/Interfaces/IConsole.h"
#include "Utilities/ISerializable.h"
class Emulator;

10
Core/Gameboy/GbApu.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h"
#include "GbApu.h"
#include "Emulator.h"
#include "Gameboy.h"
#include "SoundMixer.h"
#include "EmuSettings.h"
#include "Gameboy/GbApu.h"
#include "Gameboy/Gameboy.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/Audio/SoundMixer.h"
#include "SNES/Coprocessors/SGB/SuperGameboy.h"
#include "Utilities/Serializer.h"

8
Core/Gameboy/GbControlManager.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h"
#include "Emulator.h"
#include "EmuSettings.h"
#include "GbControlManager.h"
#include "Gameboy/GbControlManager.h"
#include "SNES/Input/SnesController.h"
#include "KeyManager.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/KeyManager.h"
GbControlManager::GbControlManager(Emulator* emu)
{

2
Core/Gameboy/GbControlManager.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "stdafx.h"
#include "IControlManager.h"
#include "Shared/Interfaces/IControlManager.h"
class Emulator;
class BaseControlDevice;

8
Core/Gameboy/GbCpu.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h"
#include "Emulator.h"
#include "GbCpu.h"
#include "Gameboy.h"
#include "GbMemoryManager.h"
#include "Gameboy/GbCpu.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/GbMemoryManager.h"
#include "Shared/Emulator.h"
#include "Utilities/Serializer.h"
void GbCpu::Init(Emulator* emu, Gameboy* gameboy, GbMemoryManager* memoryManager)

22
Core/Gameboy/GbMemoryManager.cpp
View file

@ -1,18 +1,18 @@
#include "stdafx.h"
#include "Emulator.h"
#include "Gameboy.h"
#include "GbMemoryManager.h"
#include "GbPpu.h"
#include "GbApu.h"
#include "GbTimer.h"
#include "GbTypes.h"
#include "Carts/GbCart.h"
#include "GbDmaController.h"
#include "EmuSettings.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/GbMemoryManager.h"
#include "Gameboy/GbPpu.h"
#include "Gameboy/GbApu.h"
#include "Gameboy/GbTimer.h"
#include "Gameboy/GbTypes.h"
#include "Gameboy/Carts/GbCart.h"
#include "Gameboy/GbDmaController.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/MessageManager.h"
#include "SNES/Coprocessors/SGB/SuperGameboy.h"
#include "SNES/ControlManager.h"
#include "SNES/Input/SnesController.h"
#include "MessageManager.h"
#include "Utilities/VirtualFile.h"
#include "Utilities/Serializer.h"
#include "Utilities/HexUtilities.h"

24
Core/Gameboy/GbPpu.cpp
View file

@ -1,19 +1,19 @@
#include "stdafx.h"
#include "GbPpu.h"
#include "GbTypes.h"
#include "EventType.h"
#include "Emulator.h"
#include "EmuSettings.h"
#include "Gameboy.h"
#include "VideoDecoder.h"
#include "RewindManager.h"
#include "GbMemoryManager.h"
#include "GbDmaController.h"
#include "NotificationManager.h"
#include "MessageManager.h"
#include "Gameboy/GbPpu.h"
#include "Gameboy/GbTypes.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/GbMemoryManager.h"
#include "Gameboy/GbDmaController.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/RewindManager.h"
#include "Shared/Video/VideoDecoder.h"
#include "Shared/NotificationManager.h"
#include "Shared/MessageManager.h"
#include "SNES/Coprocessors/SGB/SuperGameboy.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/Serializer.h"
#include "EventType.h"
constexpr uint16_t evtColors[6] = { 0x18C6, 0x294A, 0x108C, 0x4210, 0x3084, 0x1184 };

4
Core/Gameboy/GbTypes.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "../SnesMemoryType.h"
#include "../BaseState.h"
#include "SnesMemoryType.h"
#include "Shared/BaseState.h"
struct GbCpuState : BaseState
{

16
Core/NES/APU/NesApu.cpp
View file

@ -1,17 +1,17 @@
#include "stdafx.h"
#include "Utilities/Serializer.h"
#include "NES/APU/NesApu.h"
#include "NES/APU/SquareChannel.h"
#include "NES/APU/TriangleChannel.h"
#include "NES/APU/NoiseChannel.h"
#include "NES/APU/DeltaModulationChannel.h"
#include "NES/APU/ApuFrameCounter.h"
#include "NES/NesCpu.h"
#include "NES/NesConsole.h"
#include "NES/NesTypes.h"
#include "NES/NesMemoryManager.h"
#include "NES/NesSoundMixer.h"
#include "NesApu.h"
#include "SquareChannel.h"
#include "TriangleChannel.h"
#include "NoiseChannel.h"
#include "DeltaModulationChannel.h"
#include "ApuFrameCounter.h"
#include "Emulator.h"
#include "Shared/Emulator.h"
#include "Utilities/Serializer.h"
NesApu::NesApu(shared_ptr<NesConsole> console)
{

3
Core/NES/APU/SquareChannel.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "stdafx.h"
#include "ApuEnvelope.h"
#include "NES/APU/ApuEnvelope.h"
#include "NES/NesCpu.h"
#include "NES/NesConsole.h"
class SquareChannel : public ApuEnvelope

4
Core/NES/BaseLoader.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../stdafx.h"
#include "../MessageManager.h"
#include "stdafx.h"
#include "Shared/MessageManager.h"
class BaseLoader
{

26
Core/NES/BaseMapper.cpp
View file

@ -1,20 +1,20 @@
#include "stdafx.h"
#include <random>
#include <assert.h>
#include "../../Utilities/FolderUtilities.h"
#include "../../Utilities/IpsPatcher.h"
#include "../../Utilities/Serializer.h"
#include "../MessageManager.h"
#include "BaseMapper.h"
#include "NesConsole.h"
#include "NesTypes.h"
#include "NesMemoryManager.h"
#include "RomData.h"
#include "SnesMemoryType.h"
#include "NES/BaseMapper.h"
#include "NES/NesConsole.h"
#include "NES/NesTypes.h"
#include "NES/NesMemoryManager.h"
#include "NES/RomData.h"
#include "Debugger/DebugTypes.h"
#include "CheatManager.h"
#include "BatteryManager.h"
#include "EmuSettings.h"
#include "Shared/MessageManager.h"
#include "Shared/CheatManager.h"
#include "Shared/BatteryManager.h"
#include "Shared/EmuSettings.h"
#include "Utilities/FolderUtilities.h"
#include "Utilities/IpsPatcher.h"
#include "Utilities/Serializer.h"
#include "SnesMemoryType.h"
#include "MemoryOperationType.h"
void BaseMapper::WriteRegister(uint16_t addr, uint8_t value) { }

12
Core/NES/BaseMapper.h
View file

@ -1,13 +1,13 @@
#pragma once
#include "../stdafx.h"
#include "Utilities/ISerializable.h"
#include "INesMemoryHandler.h"
#include "NesTypes.h"
#include "RomData.h"
#include "Emulator.h"
#include "stdafx.h"
#include "NES/INesMemoryHandler.h"
#include "NES/NesTypes.h"
#include "NES/RomData.h"
#include "Debugger/DebugTypes.h"
#include "Shared/Emulator.h"
#include "MemoryOperationType.h"
#include "Utilities/ISerializable.h"
class NesConsole;
class BaseControlDevice;

7
Core/NES/Debugger/NesDebugger.cpp
View file

@ -17,10 +17,9 @@
#include "NES/Debugger/NesDebugger.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/FolderUtilities.h"
#include "EmuSettings.h"
#include "SettingTypes.h"
#include "MemoryMappings.h"
#include "Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/SettingTypes.h"
#include "Shared/Emulator.h"
#include "MemoryOperationType.h"
NesDebugger::NesDebugger(Debugger* debugger)

5
Core/NES/Debugger/NesDisUtils.cpp
View file

@ -1,13 +1,14 @@
#include "stdafx.h"
#include "NesDisUtils.h"
#include "NES/Debugger/NesDisUtils.h"
#include "NES/NesTypes.h"
#include "EmuSettings.h"
#include "Shared/EmuSettings.h"
#include "Debugger/DisassemblyInfo.h"
#include "Debugger/LabelManager.h"
#include "Debugger/MemoryDumper.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/FastString.h"
#include "SnesMemoryType.h"
void NesDisUtils::GetDisassembly(DisassemblyInfo& info, string& out, uint32_t memoryAddr, LabelManager* labelManager, EmuSettings* settings)
{

14
Core/NES/GameDatabase.cpp
View file

@ -1,11 +1,11 @@
#include "stdafx.h"
#include "RomData.h"
#include "../MessageManager.h"
#include "../../Utilities/CRC32.h"
#include "../../Utilities/FolderUtilities.h"
#include "../../Utilities/StringUtilities.h"
#include "../../Utilities/HexUtilities.h"
#include "GameDatabase.h"
#include "NES/RomData.h"
#include "NES/GameDatabase.h"
#include "Shared/MessageManager.h"
#include "Utilities/CRC32.h"
#include "Utilities/FolderUtilities.h"
#include "Utilities/StringUtilities.h"
#include "Utilities/HexUtilities.h"
//TODO NES
//#include "EmulationSettings.h"

4
Core/NES/Input/StandardController.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "BaseControlDevice.h"
#include "Emulator.h"
#include "Shared/BaseControlDevice.h"
#include "Shared/Emulator.h"
#include "Utilities/Serializer.h"
class StandardController : public BaseControlDevice

14
Core/NES/MapperFactory.cpp
View file

@ -1,12 +1,12 @@
#include "stdafx.h"
#include "../NotificationManager.h"
#include "MapperFactory.h"
#include "NesConsole.h"
#include "RomLoader.h"
#include "Shared/NotificationManager.h"
#include "NES/MapperFactory.h"
#include "NES/NesConsole.h"
#include "NES/RomLoader.h"
//#include "UnifBoards.h"
#include "BaseMapper.h"
#include "RomData.h"
#include "../../Utilities/VirtualFile.h"
#include "NES/BaseMapper.h"
#include "NES/RomData.h"
#include "Utilities/VirtualFile.h"
/*
#include "A65AS.h"
#include "Ac08.h"

24
Core/NES/NesConsole.cpp
View file

@ -1,18 +1,18 @@
#include "stdafx.h"
#include "NesConsole.h"
#include "Emulator.h"
#include "NesControlManager.h"
#include "IControlManager.h"
#include "MapperFactory.h"
#include "NES/NesConsole.h"
#include "NES/NesControlManager.h"
#include "NES/MapperFactory.h"
#include "NES/APU/NesApu.h"
#include "NesCpu.h"
#include "BaseMapper.h"
#include "NesSoundMixer.h"
#include "NesMemoryManager.h"
#include "NesPpu.h"
#include "Utilities/Serializer.h"
#include "EmuSettings.h"
#include "NES/NesCpu.h"
#include "NES/BaseMapper.h"
#include "NES/NesSoundMixer.h"
#include "NES/NesMemoryManager.h"
#include "NES/NesPpu.h"
#include "Shared/Emulator.h"
#include "Shared/Interfaces/IControlManager.h"
#include "Shared/EmuSettings.h"
#include "Debugger/DebugTypes.h"
#include "Utilities/Serializer.h"
NesConsole::NesConsole(Emulator* emu)
{

4
Core/NES/NesConsole.h
View file

@ -1,8 +1,8 @@
#pragma once
#include "stdafx.h"
#include "SettingTypes.h"
#include "IConsole.h"
#include "Shared/SettingTypes.h"
#include "Shared/Interfaces/IConsole.h"
#include "Debugger/DebugTypes.h"
class Emulator;

31
Core/NES/NesControlManager.cpp
View file

@ -1,18 +1,17 @@
#include "stdafx.h"
#include "NesControlManager.h"
#include "BaseMapper.h"
#include "EmuSettings.h"
#include "NesConsole.h"
#include "NesMemoryManager.h"
#include "IKeyManager.h"
#include "IInputProvider.h"
#include "IInputRecorder.h"
#include "BatteryManager.h"
#include "NES/NesControlManager.h"
#include "NES/BaseMapper.h"
#include "NES/NesConsole.h"
#include "NES/NesMemoryManager.h"
#include "NES/Input/StandardController.h"
#include "SNES/Input/SnesController.h"
#include "NesConsole.h"
#include "Emulator.h"
#include "KeyManager.h"
#include "Shared/EmuSettings.h"
#include "Shared/Interfaces/IKeyManager.h"
#include "Shared/Interfaces/IInputProvider.h"
#include "Shared/Interfaces/IInputRecorder.h"
#include "Shared/BatteryManager.h"
#include "Shared/Emulator.h"
#include "Shared/KeyManager.h"
/*#include "Zapper.h"
#include "ArkanoidController.h"
#include "OekaKidsTablet.h"
@ -145,8 +144,8 @@ shared_ptr<BaseControlDevice> NesControlManager::CreateExpansionDevice(Expansion
{
shared_ptr<BaseControlDevice> device;
switch(type) {
/*case ExpansionPortDevice::Zapper: device.reset(new Zapper(console, BaseControlDevice::ExpDevicePort)); break;
/*switch(type) {
case ExpansionPortDevice::Zapper: device.reset(new Zapper(console, BaseControlDevice::ExpDevicePort)); break;
case ExpansionPortDevice::ArkanoidController: device.reset(new ArkanoidController(console, BaseControlDevice::ExpDevicePort)); break;
case ExpansionPortDevice::OekaKidsTablet: device.reset(new OekaKidsTablet(console)); break;
case ExpansionPortDevice::FamilyTrainerMat: device.reset(new FamilyMatTrainer(console, console->GetSettings()->GetControllerKeys(0))); break;
@ -163,9 +162,9 @@ shared_ptr<BaseControlDevice> NesControlManager::CreateExpansionDevice(Expansion
case ExpansionPortDevice::AsciiTurboFile: device.reset(new AsciiTurboFile(console)); break;
case ExpansionPortDevice::BattleBox: device.reset(new BattleBox(console)); break;
case ExpansionPortDevice::FourPlayerAdapter:*/
case ExpansionPortDevice::FourPlayerAdapter:
default: break;
}
}*/
return device;
}

4
Core/NES/NesControlManager.h
View file

@ -1,8 +1,8 @@
#pragma once
#include "stdafx.h"
#include "INesMemoryHandler.h"
#include "IControlManager.h"
#include "NES/INesMemoryHandler.h"
#include "Shared/Interfaces/IControlManager.h"
#include "Utilities/SimpleLock.h"
#include "Utilities/ISerializable.h"

7
Core/NES/NesCpu.cpp
View file

@ -8,11 +8,10 @@
#include "NES/APU/NesApu.h"
#include "NES/NesMemoryManager.h"
#include "NES/NesConsole.h"
#include "MessageManager.h"
#include "EmuSettings.h"
#include "Emulator.h"
#include "Shared/MessageManager.h"
#include "Shared/EmuSettings.h"
#include "Shared/Emulator.h"
#include "MemoryOperationType.h"
#include "Emulator.h"
NesCpu::NesCpu(shared_ptr<NesConsole> console)
{

6
Core/NES/NesHeader.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#include "NesHeader.h"
#include "RomData.h"
#include "../MessageManager.h"
#include "NES/NesHeader.h"
#include "NES/RomData.h"
#include "Shared/MessageManager.h"
uint16_t NesHeader::GetMapperID()
{

13
Core/NES/NesMemoryManager.cpp
View file

@ -1,11 +1,10 @@
#include "stdafx.h"
#include "../../Utilities/Serializer.h"
#include "NesMemoryManager.h"
#include "BaseMapper.h"
//#include "Debugger.h"
#include "CheatManager.h"
#include "Emulator.h"
#include "NesConsole.h"
#include "NES/NesMemoryManager.h"
#include "NES/BaseMapper.h"
#include "NES/NesConsole.h"
#include "Shared/CheatManager.h"
#include "Shared/Emulator.h"
#include "Utilities/Serializer.h"
#include "MemoryOperationType.h"
NesMemoryManager::NesMemoryManager(shared_ptr<NesConsole> console)

8
Core/NES/NesPpu.cpp
View file

@ -11,10 +11,10 @@
#include "NES/BaseMapper.h"
#include "Debugger/Debugger.h"
#include "EmuSettings.h"
#include "VideoDecoder.h"
#include "RewindManager.h"
#include "NotificationManager.h"
#include "Shared/EmuSettings.h"
#include "Shared/Video/VideoDecoder.h"
#include "Shared/RewindManager.h"
#include "Shared/NotificationManager.h"
#include "MemoryOperationType.h"
NesPpu::NesPpu(shared_ptr<NesConsole> console)

12
Core/NES/NesSoundMixer.cpp
View file

@ -1,12 +1,12 @@
#include "stdafx.h"
#include "NES/NesSoundMixer.h"
#include "NES/NesConsole.h"
#include "NES/NesCpu.h"
#include "NES/NesTypes.h"
#include "Shared/Emulator.h"
#include "Shared/Audio/SoundMixer.h"
#include "Utilities/Serializer.h"
#include "Utilities/blip_buf.h"
#include "NesConsole.h"
#include "NesCpu.h"
#include "NesSoundMixer.h"
#include "NesTypes.h"
#include "Emulator.h"
#include "SoundMixer.h"
NesSoundMixer::NesSoundMixer(shared_ptr<NesConsole> console)
{

2
Core/NES/NesTypes.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "stdafx.h"
#include "BaseState.h"
#include "Shared/BaseState.h"
namespace PSFlags
{

4
Core/Netplay/ForceDisconnectMessage.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "MessageManager.h"
#include "NetMessage.h"
#include "Netplay/NetMessage.h"
#include "Shared/MessageManager.h"
#include "Utilities/FolderUtilities.h"
class ForceDisconnectMessage : public NetMessage

12
Core/Netplay/GameClient.cpp
View file

@ -2,13 +2,13 @@
#include <thread>
using std::thread;
#include "MessageManager.h"
#include "GameClient.h"
#include "Emulator.h"
#include "NotificationManager.h"
#include "Netplay/GameClient.h"
#include "Netplay/ClientConnectionData.h"
#include "Netplay/GameClientConnection.h"
#include "Shared/MessageManager.h"
#include "Shared/Emulator.h"
#include "Shared/NotificationManager.h"
#include "Utilities/Socket.h"
#include "ClientConnectionData.h"
#include "GameClientConnection.h"
shared_ptr<GameClient> GameClient::_instance;

2
Core/Netplay/GameClient.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include <thread>
#include "INotificationListener.h"
#include "Shared/Interfaces/INotificationListener.h"
using std::thread;
class Socket;

28
Core/Netplay/GameClientConnection.cpp
View file

@ -1,20 +1,20 @@
#include "stdafx.h"
#include "GameClientConnection.h"
#include "HandShakeMessage.h"
#include "InputDataMessage.h"
#include "MovieDataMessage.h"
#include "GameInformationMessage.h"
#include "SaveStateMessage.h"
#include "Emulator.h"
#include "EmuSettings.h"
#include "Netplay/GameClientConnection.h"
#include "Netplay/HandShakeMessage.h"
#include "Netplay/InputDataMessage.h"
#include "Netplay/MovieDataMessage.h"
#include "Netplay/GameInformationMessage.h"
#include "Netplay/SaveStateMessage.h"
#include "Netplay/ClientConnectionData.h"
#include "Netplay/SelectControllerMessage.h"
#include "Netplay/PlayerListMessage.h"
#include "Netplay/ForceDisconnectMessage.h"
#include "Netplay/ServerInformationMessage.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "SNES/ControlManager.h"
#include "ClientConnectionData.h"
#include "SNES/Input/SnesController.h"
#include "SelectControllerMessage.h"
#include "PlayerListMessage.h"
#include "ForceDisconnectMessage.h"
#include "ServerInformationMessage.h"
#include "NotificationManager.h"
#include "Shared/NotificationManager.h"
#include "RomFinder.h"
GameClientConnection::GameClientConnection(shared_ptr<Emulator> emu, shared_ptr<Socket> socket, ClientConnectionData &connectionData) : GameConnection(emu, socket)

12
Core/Netplay/GameClientConnection.h
View file

@ -1,14 +1,14 @@
#pragma once
#include "stdafx.h"
#include <deque>
#include "GameConnection.h"
#include "Utilities/AutoResetEvent.h"
#include "Utilities/SimpleLock.h"
#include "BaseControlDevice.h"
#include "INotificationListener.h"
#include "IInputProvider.h"
#include "ControlDeviceState.h"
#include "ClientConnectionData.h"
#include "Shared/BaseControlDevice.h"
#include "Shared/Interfaces/INotificationListener.h"
#include "Shared/Interfaces/IInputProvider.h"
#include "Shared/ControlDeviceState.h"
#include "Netplay/GameConnection.h"
#include "Netplay/ClientConnectionData.h"
class Emulator;

4
Core/Netplay/GameInformationMessage.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "MessageManager.h"
#include "NetMessage.h"
#include "Shared/MessageManager.h"
#include "Netplay/NetMessage.h"
#include "Utilities/FolderUtilities.h"
class GameInformationMessage : public NetMessage

10
Core/Netplay/GameServer.cpp
View file

@ -2,13 +2,13 @@
#include <thread>
using std::thread;
#include "MessageManager.h"
#include "GameServer.h"
#include "Emulator.h"
#include "Netplay/GameServer.h"
#include "Netplay/PlayerListMessage.h"
#include "SNES/ControlManager.h"
#include "SNES/Input/Multitap.h"
#include "PlayerListMessage.h"
#include "NotificationManager.h"
#include "Shared/Emulator.h"
#include "Shared/NotificationManager.h"
#include "Shared/MessageManager.h"
#include "Utilities/Socket.h"
shared_ptr<GameServer> GameServer::Instance;

8
Core/Netplay/GameServer.h
View file

@ -1,10 +1,10 @@
#pragma once
#include "stdafx.h"
#include <thread>
#include "GameServerConnection.h"
#include "INotificationListener.h"
#include "IInputProvider.h"
#include "IInputRecorder.h"
#include "Netplay/GameServerConnection.h"
#include "Shared/Interfaces/INotificationListener.h"
#include "Shared/Interfaces/IInputProvider.h"
#include "Shared/Interfaces/IInputRecorder.h"
using std::thread;
class Emulator;

32
Core/Netplay/GameServerConnection.cpp
View file

@ -1,22 +1,22 @@
#include "stdafx.h"
#include <random>
#include "MessageManager.h"
#include "GameServerConnection.h"
#include "HandShakeMessage.h"
#include "InputDataMessage.h"
#include "MovieDataMessage.h"
#include "GameInformationMessage.h"
#include "SaveStateMessage.h"
#include "Emulator.h"
#include "Netplay/GameServerConnection.h"
#include "Netplay/HandShakeMessage.h"
#include "Netplay/InputDataMessage.h"
#include "Netplay/MovieDataMessage.h"
#include "Netplay/GameInformationMessage.h"
#include "Netplay/SaveStateMessage.h"
#include "Netplay/ClientConnectionData.h"
#include "Netplay/SelectControllerMessage.h"
#include "Netplay/PlayerListMessage.h"
#include "Netplay/GameServer.h"
#include "Netplay/ForceDisconnectMessage.h"
#include "Netplay/ServerInformationMessage.h"
#include "SNES/ControlManager.h"
#include "ClientConnectionData.h"
#include "EmuSettings.h"
#include "SelectControllerMessage.h"
#include "PlayerListMessage.h"
#include "GameServer.h"
#include "ForceDisconnectMessage.h"
#include "BaseControlDevice.h"
#include "ServerInformationMessage.h"
#include "Shared/MessageManager.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/BaseControlDevice.h"
GameServerConnection* GameServerConnection::_netPlayDevices[BaseControlDevice::PortCount] = { };

8
Core/Netplay/GameServerConnection.h
View file

@ -1,10 +1,10 @@
#pragma once
#include "stdafx.h"
#include <deque>
#include "GameConnection.h"
#include "INotificationListener.h"
#include "BaseControlDevice.h"
#include "ControlDeviceState.h"
#include "Netplay/GameConnection.h"
#include "Shared/Interfaces/INotificationListener.h"
#include "Shared/BaseControlDevice.h"
#include "Shared/ControlDeviceState.h"
class HandShakeMessage;

4
Core/InputDataMessage.h → Core/Netplay/InputDataMessage.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "NetMessage.h"
#include "ControlDeviceState.h"
#include "Netplay/NetMessage.h"
#include "Shared/ControlDeviceState.h"
class InputDataMessage : public NetMessage
{

0
Core/MessageType.h → Core/Netplay/MessageType.h
View file

4
Core/MovieDataMessage.h → Core/Netplay/MovieDataMessage.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "NetMessage.h"
#include "ControlDeviceState.h"
#include "Netplay/NetMessage.h"
#include "Shared/ControlDeviceState.h"
class MovieDataMessage : public NetMessage
{

4
Core/Netplay/NetMessage.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "MessageType.h"
#include "SaveStateManager.h"
#include "Netplay/MessageType.h"
#include "Shared/SaveStateManager.h"
#include "Utilities/Socket.h"
#include "Utilities/Serializer.h"

10
Core/SaveStateMessage.h → Core/Netplay/SaveStateMessage.h
View file

@ -1,10 +1,10 @@
#pragma once
#include "stdafx.h"
#include "NetMessage.h"
#include "Emulator.h"
#include "EmuSettings.h"
#include "CheatManager.h"
#include "SaveStateManager.h"
#include "Netplay/NetMessage.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/CheatManager.h"
#include "Shared/SaveStateManager.h"
class SaveStateMessage : public NetMessage
{

2
Core/Netplay/stdafx.h Normal file
View file

@ -0,0 +1,2 @@
#include "../stdafx.h"

2
Core/RomFinder.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "stdafx.h"
#include "Emulator.h"
#include "Shared/Emulator.h"
#include "Utilities/VirtualFile.h"
#include "Utilities/FolderUtilities.h"

26
Core/SNES/BaseCartridge.cpp
View file

@ -1,17 +1,11 @@
#include "stdafx.h"
#include "BaseCartridge.h"
#include "RamHandler.h"
#include "RomHandler.h"
#include "MemoryMappings.h"
#include "IMemoryHandler.h"
#include "MessageManager.h"
#include "Emulator.h"
#include "Console.h"
#include "EmuSettings.h"
#include "SettingTypes.h"
#include "BatteryManager.h"
#include "FirmwareHelper.h"
#include "SpcFileData.h"
#include "SNES/BaseCartridge.h"
#include "SNES/RamHandler.h"
#include "SNES/RomHandler.h"
#include "SNES/MemoryMappings.h"
#include "SNES/IMemoryHandler.h"
#include "SNES/Console.h"
#include "SNES/SpcFileData.h"
#include "Gameboy/Gameboy.h"
#include "SNES/Coprocessors/DSP/NecDsp.h"
#include "SNES/Coprocessors/BaseCoprocessor.h"
@ -24,12 +18,18 @@
#include "SNES/Coprocessors/BSX/BsxCart.h"
#include "SNES/Coprocessors/BSX/BsxMemoryPack.h"
#include "SNES/Coprocessors/SGB/SuperGameboy.h"
#include "Shared/EmuSettings.h"
#include "Shared/SettingTypes.h"
#include "Shared/BatteryManager.h"
#include "Shared/MessageManager.h"
#include "Shared/Emulator.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/VirtualFile.h"
#include "Utilities/FolderUtilities.h"
#include "Utilities/Serializer.h"
#include "Utilities/sha1.h"
#include "Utilities/CRC32.h"
#include "FirmwareHelper.h"
BaseCartridge::~BaseCartridge()
{

54
Core/SNES/Console.cpp
View file

@ -1,49 +1,34 @@
#include "stdafx.h"
#include "Console.h"
#include "Cpu.h"
#include "Ppu.h"
#include "Spc.h"
#include "InternalRegisters.h"
#include "ControlManager.h"
#include "MemoryManager.h"
#include "DmaController.h"
#include "BaseCartridge.h"
#include "RamHandler.h"
#include "SNES/Console.h"
#include "SNES/Cpu.h"
#include "SNES/Ppu.h"
#include "SNES/Spc.h"
#include "SNES/InternalRegisters.h"
#include "SNES/ControlManager.h"
#include "SNES/MemoryManager.h"
#include "SNES/DmaController.h"
#include "SNES/BaseCartridge.h"
#include "SNES/RamHandler.h"
#include "SNES/CartTypes.h"
#include "SNES/SpcHud.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/GbPpu.h"
#include "Debugger/Debugger.h"
#include "Debugger/DebugTypes.h"
#include "NotificationManager.h"
#include "SoundMixer.h"
#include "VideoDecoder.h"
#include "VideoRenderer.h"
#include "DebugHud.h"
#include "FrameLimiter.h"
#include "MessageManager.h"
#include "KeyManager.h"
#include "EventType.h"
#include "EmuSettings.h"
#include "SaveStateManager.h"
#include "DebugStats.h"
#include "CartTypes.h"
#include "RewindManager.h"
#include "MovieManager.h"
#include "BatteryManager.h"
#include "CheatManager.h"
#include "MovieManager.h"
#include "SystemActionManager.h"
#include "SpcHud.h"
#include "Emulator.h"
#include "SNES/Coprocessors/MSU1/Msu1.h"
#include "SNES/Coprocessors/SA1/Sa1.h"
#include "SNES/Coprocessors/GSU/Gsu.h"
#include "SNES/Coprocessors/CX4/Cx4.h"
#include "IControlManager.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/Interfaces/IControlManager.h"
#include "Utilities/Serializer.h"
#include "Utilities/Timer.h"
#include "Utilities/VirtualFile.h"
#include "Utilities/PlatformUtilities.h"
#include "Utilities/FolderUtilities.h"
#include "EventType.h"
#include "SystemActionManager.h"
Console::Console(Emulator* emu)
{
@ -351,11 +336,6 @@ bool Console::IsRunning()
return _cpu != nullptr;
}
bool Console::IsRunAheadFrame()
{
return _isRunAheadFrame;
}
AddressInfo Console::GetAbsoluteAddress(AddressInfo relAddress)
{
if(relAddress.Type == SnesMemoryType::CpuMemory) {

24
Core/SNES/Console.h
View file

@ -1,9 +1,9 @@
#pragma once
#include "stdafx.h"
#include "CartTypes.h"
#include "SNES/CartTypes.h"
#include "Debugger/DebugTypes.h"
#include "Debugger/Debugger.h"
#include "IConsole.h"
#include "Shared/Interfaces/IConsole.h"
#include "Utilities/Timer.h"
#include "Utilities/VirtualFile.h"
#include "Utilities/SimpleLock.h"
@ -45,8 +45,6 @@ enum class ConsoleType;
class Console : public std::enable_shared_from_this<Console>, public IConsole
{
private:
unique_ptr<thread> _emuThread;
shared_ptr<Cpu> _cpu;
shared_ptr<Ppu> _ppu;
shared_ptr<Spc> _spc;
@ -57,27 +55,14 @@ private:
shared_ptr<DmaController> _dmaController;
shared_ptr<Msu1> _msu1;
shared_ptr<Debugger> _debugger;
shared_ptr<EmuSettings> _settings;
shared_ptr<SpcHud> _spcHud;
Emulator* _emu;
shared_ptr<EmuSettings> _settings;
shared_ptr<SpcHud> _spcHud;
uint32_t _masterClockRate;
ConsoleRegion _region;
atomic<bool> _isRunAheadFrame;
bool _frameRunning = false;
unique_ptr<DebugStats> _stats;
unique_ptr<FrameLimiter> _frameLimiter;
Timer _lastFrameTimer;
double _frameDelay = 0;
void UpdateRegion();
void RunFrame();
@ -122,7 +107,6 @@ public:
Emulator* GetEmulator();
bool IsRunning();
bool IsRunAheadFrame();
AddressInfo GetAbsoluteAddress(AddressInfo relAddress);
AddressInfo GetRelativeAddress(AddressInfo absAddress, CpuType cpuType);

18
Core/SNES/ControlManager.cpp
View file

@ -1,13 +1,13 @@
#include "stdafx.h"
#include "ControlManager.h"
#include "Console.h"
#include "Emulator.h"
#include "EmuSettings.h"
#include "MemoryManager.h"
#include "KeyManager.h"
#include "IKeyManager.h"
#include "IInputProvider.h"
#include "IInputRecorder.h"
#include "SNES/ControlManager.h"
#include "SNES/Console.h"
#include "SNES/MemoryManager.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/KeyManager.h"
#include "Shared/Interfaces/IKeyManager.h"
#include "Shared/Interfaces/IInputProvider.h"
#include "Shared/Interfaces/IInputRecorder.h"
#include "SystemActionManager.h"
#include "SNES/Input/SnesController.h"
#include "SNES/Input/SnesMouse.h"

2
Core/SNES/ControlManager.h
View file

@ -3,7 +3,7 @@
#include "stdafx.h"
#include "Utilities/SimpleLock.h"
#include "Utilities/ISerializable.h"
#include "IControlManager.h"
#include "Shared/Interfaces/IControlManager.h"
class BaseControlDevice;
class IInputRecorder;

14
Core/SNES/Coprocessors/BSX/BsxCart.cpp
View file

@ -1,14 +1,14 @@
#include "stdafx.h"
#include "Emulator.h"
#include "MemoryMappings.h"
#include "BsxCart.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "SNES/Console.h"
#include "SNES/MemoryManager.h"
#include "SNES/BaseCartridge.h"
#include "BsxMemoryPack.h"
#include "BsxSatellaview.h"
#include "RamHandler.h"
#include "EmuSettings.h"
#include "SNES/Coprocessors/BSX/BsxCart.h"
#include "SNES/Coprocessors/BSX/BsxMemoryPack.h"
#include "SNES/Coprocessors/BSX/BsxSatellaview.h"
#include "SNES/RamHandler.h"
#include "SNES/MemoryMappings.h"
#include "Utilities/Serializer.h"
BsxCart::BsxCart(Console* console, BsxMemoryPack* memPack) : BaseCoprocessor(SnesMemoryType::Register)

6
Core/SNES/Coprocessors/BSX/BsxMemoryPack.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h"
#include "BsxMemoryPack.h"
#include "SNES/Coprocessors/BSX/BsxMemoryPack.h"
#include "SNES/Console.h"
#include "Emulator.h"
#include "BatteryManager.h"
#include "Shared/Emulator.h"
#include "Shared/BatteryManager.h"
#include "Utilities/IpsPatcher.h"
#include "Utilities/Serializer.h"

4
Core/SNES/Coprocessors/BSX/BsxMemoryPack.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "RamHandler.h"
#include "IMemoryHandler.h"
#include "SNES/RamHandler.h"
#include "SNES/IMemoryHandler.h"
#include "Utilities/ISerializable.h"
class BsxMemoryPackHandler;

6
Core/SNES/Coprocessors/BSX/BsxSatellaview.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h"
#include "BsxSatellaview.h"
#include "SNES/Coprocessors/BSX/BsxSatellaview.h"
#include "SNES/Console.h"
#include "Emulator.h"
#include "SNES/MemoryManager.h"
#include "EmuSettings.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Utilities/Serializer.h"
BsxSatellaview::BsxSatellaview(Console* console, IMemoryHandler* bBusHandler) : IMemoryHandler(SnesMemoryType::Register)

4
Core/SNES/Coprocessors/BSX/BsxSatellaview.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "IMemoryHandler.h"
#include "BsxStream.h"
#include "SNES/IMemoryHandler.h"
#include "SNES/Coprocessors/BSX/BsxStream.h"
#include "Utilities/ISerializable.h"
class Console;

2
Core/SNES/Coprocessors/BaseCoprocessor.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "Utilities/ISerializable.h"
#include "IMemoryHandler.h"
#include "SNES/IMemoryHandler.h"
class BaseCoprocessor : public ISerializable, public IMemoryHandler
{

10
Core/SNES/Coprocessors/CX4/Cx4.cpp
View file

@ -1,13 +1,13 @@
#include "stdafx.h"
#include "Cx4.h"
#include "SNES/Coprocessors/CX4/Cx4.h"
#include "SNES/Console.h"
#include "Emulator.h"
#include "SNES/Cpu.h"
#include "SNES/MemoryManager.h"
#include "SNES/BaseCartridge.h"
#include "MemoryMappings.h"
#include "EmuSettings.h"
#include "RamHandler.h"
#include "SNES/MemoryMappings.h"
#include "SNES/RamHandler.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/Serializer.h"

4
Core/SNES/Coprocessors/CX4/Cx4.h
View file

@ -1,8 +1,8 @@
#pragma once
#include "stdafx.h"
#include "SNES/Coprocessors/BaseCoprocessor.h"
#include "Cx4Types.h"
#include "MemoryMappings.h"
#include "SNES/Coprocessors/CX4/Cx4Types.h"
#include "SNES/MemoryMappings.h"
class Console;
class Emulator;

2
Core/SNES/Coprocessors/CX4/Cx4Types.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "stdafx.h"
#include "BaseState.h"
#include "Shared/BaseState.h"
struct Cx4Dma
{

20
Core/SNES/Coprocessors/DSP/NecDsp.cpp
View file

@ -1,19 +1,19 @@
#include "stdafx.h"
#include "Utilities/FolderUtilities.h"
#include "Utilities/Serializer.h"
#include "SNES/Coprocessors/DSP/NecDsp.h"
#include "SNES/MemoryManager.h"
#include "SNES/Console.h"
#include "SNES/BaseCartridge.h"
#include "SNES/CartTypes.h"
#include "NecDsp.h"
#include "MemoryMappings.h"
#include "Emulator.h"
#include "NotificationManager.h"
#include "MessageManager.h"
#include "EmuSettings.h"
#include "RamHandler.h"
#include "BatteryManager.h"
#include "SNES/MemoryMappings.h"
#include "SNES/RamHandler.h"
#include "Shared/Emulator.h"
#include "Shared/NotificationManager.h"
#include "Shared/MessageManager.h"
#include "Shared/EmuSettings.h"
#include "Shared/BatteryManager.h"
#include "FirmwareHelper.h"
#include "Utilities/FolderUtilities.h"
#include "Utilities/Serializer.h"
NecDsp::NecDsp(CoprocessorType type, Console* console, vector<uint8_t> &programRom, vector<uint8_t> &dataRom) : BaseCoprocessor(SnesMemoryType::Register)
{

2
Core/SNES/Coprocessors/DSP/NecDspTypes.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "stdafx.h"
#include "BaseState.h"
#include "Shared/BaseState.h"
struct NecDspAccFlags
{

18
Core/SNES/Coprocessors/GSU/Gsu.cpp
View file

@ -1,19 +1,19 @@
#include "stdafx.h"
#include "Gsu.h"
#include "Emulator.h"
#include "SNES/Coprocessors/GSU/Gsu.h"
#include "SNES/Coprocessors/GSU/GsuRomHandler.h"
#include "SNES/Coprocessors/GSU/GsuRamHandler.h"
#include "SNES/Console.h"
#include "SNES/Cpu.h"
#include "SNES/MemoryManager.h"
#include "SNES/BaseCartridge.h"
#include "RamHandler.h"
#include "GsuRomHandler.h"
#include "GsuRamHandler.h"
#include "EmuSettings.h"
#include "MessageManager.h"
#include "BatteryManager.h"
#include "MemoryOperationType.h"
#include "SNES/RamHandler.h"
#include "Shared/Emulator.h"
#include "Shared/EmuSettings.h"
#include "Shared/MessageManager.h"
#include "Shared/BatteryManager.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/Serializer.h"
#include "MemoryOperationType.h"
Gsu::Gsu(Console *console, uint32_t gsuRamSize) : BaseCoprocessor(SnesMemoryType::Register)
{

6
Core/SNES/Coprocessors/GSU/Gsu.h
View file

@ -1,9 +1,9 @@
#pragma once
#include "stdafx.h"
#include "SNES/Coprocessors/BaseCoprocessor.h"
#include "GsuTypes.h"
#include "MemoryMappings.h"
#include "IMemoryHandler.h"
#include "SNES/Coprocessors/GSU/GsuTypes.h"
#include "SNES/MemoryMappings.h"
#include "SNES/IMemoryHandler.h"
class Emulator;
class Console;

5
Core/SNES/Coprocessors/GSU/GsuRamHandler.h
View file

@ -1,7 +1,8 @@
#pragma once
#include "stdafx.h"
#include "IMemoryHandler.h"
#include "GsuTypes.h"
#include "SNES/IMemoryHandler.h"
#include "SNES/Coprocessors/GSU/GsuTypes.h"
#include "SnesMemoryType.h"
class GsuRamHandler : public IMemoryHandler
{

5
Core/SNES/Coprocessors/GSU/GsuRomHandler.h
View file

@ -1,7 +1,8 @@
#pragma once
#include "stdafx.h"
#include "IMemoryHandler.h"
#include "GsuTypes.h"
#include "SNES/IMemoryHandler.h"
#include "SNES/Coprocessors/GSU/GsuTypes.h"
#include "SnesMemoryType.h"
class GsuRomHandler : public IMemoryHandler
{

2
Core/SNES/Coprocessors/GSU/GsuTypes.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "stdafx.h"
#include "BaseState.h"
#include "Shared/BaseState.h"
struct GsuFlags
{

4
Core/SNES/Coprocessors/MSU1/Msu1.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "PcmReader.h"
#include "IAudioProvider.h"
#include "Shared/Interfaces/IAudioProvider.h"
#include "Shared/Audio/PcmReader.h"
#include "Utilities/ISerializable.h"
#include "Utilities/VirtualFile.h"

4
Core/SNES/Coprocessors/OBC1/Obc1.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h"
#include "Obc1.h"
#include "SNES/Coprocessors/OBC1/Obc1.h"
#include "SNES/Console.h"
#include "SNES/MemoryManager.h"
#include "MemoryMappings.h"
#include "SNES/MemoryMappings.h"
Obc1::Obc1(Console* console, uint8_t* saveRam, uint32_t saveRamSize) : BaseCoprocessor(SnesMemoryType::Register)
{

8
Core/SNES/Coprocessors/SA1/CpuBwRamHandler.h
View file

@ -1,9 +1,9 @@
#pragma once
#include "stdafx.h"
#include "IMemoryHandler.h"
#include "Sa1Cpu.h"
#include "Sa1Types.h"
#include "Sa1.h"
#include "SNES/IMemoryHandler.h"
#include "SNES/Coprocessors/SA1/Sa1Cpu.h"
#include "SNES/Coprocessors/SA1/Sa1Types.h"
#include "SNES/Coprocessors/SA1/Sa1.h"
//Manages BWRAM access from the SNES CPU
//Returns conversion result when char conversion type 1 is enabled

28
Core/SNES/Coprocessors/SA1/Sa1.cpp
View file

@ -1,22 +1,22 @@
#include "stdafx.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/Serializer.h"
#include "SNES/Coprocessors/SA1/Sa1.h"
#include "SNES/Coprocessors/SA1/Sa1Cpu.h"
#include "SNES/Coprocessors/SA1/Sa1VectorHandler.h"
#include "SNES/Coprocessors/SA1/Sa1IRamHandler.h"
#include "SNES/Coprocessors/SA1/Sa1BwRamHandler.h"
#include "SNES/Coprocessors/SA1/CpuBwRamHandler.h"
#include "SNES/Cpu.h"
#include "SNES/Console.h"
#include "SNES/MemoryManager.h"
#include "SNES/BaseCartridge.h"
#include "Sa1.h"
#include "Sa1Cpu.h"
#include "EmuSettings.h"
#include "Emulator.h"
#include "MemoryMappings.h"
#include "RamHandler.h"
#include "Sa1VectorHandler.h"
#include "Sa1IRamHandler.h"
#include "Sa1BwRamHandler.h"
#include "CpuBwRamHandler.h"
#include "MessageManager.h"
#include "BatteryManager.h"
#include "SNES/MemoryMappings.h"
#include "SNES/RamHandler.h"
#include "Shared/EmuSettings.h"
#include "Shared/Emulator.h"
#include "Shared/MessageManager.h"
#include "Shared/BatteryManager.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/Serializer.h"
#include "MemoryOperationType.h"
Sa1::Sa1(Console* console) : BaseCoprocessor(SnesMemoryType::Register)

4
Core/SNES/Coprocessors/SA1/Sa1.h
View file

@ -1,8 +1,8 @@
#pragma once
#include "stdafx.h"
#include "SNES/Coprocessors/BaseCoprocessor.h"
#include "MemoryMappings.h"
#include "Sa1Types.h"
#include "SNES/MemoryMappings.h"
#include "SNES/Coprocessors/SA1/Sa1Types.h"
class Console;
class Emulator;

8
Core/SNES/Coprocessors/SA1/Sa1BwRamHandler.h
View file

@ -1,9 +1,9 @@
#pragma once
#include "stdafx.h"
#include "IMemoryHandler.h"
#include "Sa1Cpu.h"
#include "Sa1Types.h"
#include "Sa1.h"
#include "SNES/Coprocessors/SA1/Sa1Cpu.h"
#include "SNES/Coprocessors/SA1/Sa1Types.h"
#include "SNES/Coprocessors/SA1/Sa1.h"
#include "SNES/IMemoryHandler.h"
//Manages BWRAM access from the SA-1 CPU, for regions that can enable bitmap mode. e.g:
//00-3F:6000-7FFF + 80-BF:6000-7FFF (optional bitmap mode + bank select)

10
Core/SNES/Coprocessors/SA1/Sa1Cpu.cpp
View file

@ -1,13 +1,13 @@
#include "stdafx.h"
#include "Utilities/Serializer.h"
#include "Shared/Emulator.h"
#include "SNES/CpuTypes.h"
#include "Sa1Cpu.h"
#include "Emulator.h"
#include "SNES/Coprocessors/SA1/Sa1Cpu.h"
#include "SNES/MemoryManager.h"
#include "EventType.h"
#include "Sa1.h"
#include "MemoryMappings.h"
#include "SNES/Coprocessors/SA1/Sa1.h"
#include "SNES/MemoryMappings.h"
#include "MemoryOperationType.h"
#include "EventType.h"
#define Cpu Sa1Cpu
#include "SNES/Cpu.Instructions.h"

3
Core/SNES/Coprocessors/SA1/Sa1IRamHandler.h
View file

@ -1,7 +1,8 @@
#pragma once
#include "stdafx.h"
#include "IMemoryHandler.h"
#include "SNES/IMemoryHandler.h"
#include "Debugger/DebugTypes.h"
#include "SnesMemoryType.h"
class Sa1IRamHandler : public IMemoryHandler
{

6
Core/SNES/Coprocessors/SA1/Sa1VectorHandler.h
View file

@ -1,8 +1,8 @@
#pragma once
#include "stdafx.h"
#include "IMemoryHandler.h"
#include "Sa1Cpu.h"
#include "Sa1Types.h"
#include "SNES/IMemoryHandler.h"
#include "SNES/Coprocessors/SA1/Sa1Cpu.h"
#include "SNES/Coprocessors/SA1/Sa1Types.h"
class Sa1VectorHandler : public IMemoryHandler
{

Some files were not shown because too many files have changed in this diff Show more