Emulation/Mesen2
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen2.git synced 2025-04-02 10:21:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Code reorganization (GB)

Browse source
This commit is contained in:
Sour 2021-04-09 19:13:47 -04:00
parent b79f726b34
commit c7ef756b3f
35 changed files with 94 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Core/Core.vcxproj
View file

@ -107,21 +107,21 @@
<ClInclude Include="SNES\DmaControllerTypes.h" />
<ClInclude Include="Emulator.h" />
<ClInclude Include="Gameboy\Gameboy.h" />
<ClInclude Include="Gameboy\GameboyDisUtils.h" />
<ClInclude Include="Gameboy\Debugger\GameboyDisUtils.h" />
<ClInclude Include="Gameboy\GameboyHeader.h" />
<ClInclude Include="Gameboy\GbApu.h" />
<ClInclude Include="Gameboy\GbAssembler.h" />
<ClInclude Include="Gameboy\Debugger\GbAssembler.h" />
<ClInclude Include="Gameboy\GbBootRom.h" />
<ClInclude Include="Gameboy\GbCart.h" />
<ClInclude Include="Gameboy\Carts\GbCart.h" />
<ClInclude Include="Gameboy\GbCartFactory.h" />
<ClInclude Include="Gameboy\GbCpu.h" />
<ClInclude Include="Gameboy\GbDebugger.h" />
<ClInclude Include="Gameboy\Debugger\GbDebugger.h" />
<ClInclude Include="Gameboy\GbDmaController.h" />
<ClInclude Include="Gameboy\GbEventManager.h" />
<ClInclude Include="Gameboy\GbMbc1.h" />
<ClInclude Include="Gameboy\GbMbc2.h" />
<ClInclude Include="Gameboy\GbMbc3.h" />
<ClInclude Include="Gameboy\GbMbc5.h" />
<ClInclude Include="Gameboy\Debugger\GbEventManager.h" />
<ClInclude Include="Gameboy\Carts\GbMbc1.h" />
<ClInclude Include="Gameboy\Carts\GbMbc2.h" />
<ClInclude Include="Gameboy\Carts\GbMbc3.h" />
<ClInclude Include="Gameboy\Carts\GbMbc5.h" />
<ClInclude Include="Gameboy\GbMemoryManager.h" />
<ClInclude Include="Gameboy\GbNoiseChannel.h" />
<ClInclude Include="Gameboy\GbPpu.h" />
@ -342,13 +342,13 @@
<ClCompile Include="SNES\DmaController.cpp" />
<ClCompile Include="Emulator.cpp" />
<ClCompile Include="Gameboy\Gameboy.cpp" />
<ClCompile Include="Gameboy\GameboyDisUtils.cpp" />
<ClCompile Include="Gameboy\Debugger\GameboyDisUtils.cpp" />
<ClCompile Include="Gameboy\GbApu.cpp" />
<ClCompile Include="Gameboy\GbAssembler.cpp" />
<ClCompile Include="Gameboy\Debugger\GbAssembler.cpp" />
<ClCompile Include="Gameboy\GbCpu.cpp" />
<ClCompile Include="Gameboy\GbDebugger.cpp" />
<ClCompile Include="Gameboy\Debugger\GbDebugger.cpp" />
<ClCompile Include="Gameboy\GbDmaController.cpp" />
<ClCompile Include="Gameboy\GbEventManager.cpp" />
<ClCompile Include="Gameboy\Debugger\GbEventManager.cpp" />
<ClCompile Include="Gameboy\GbMemoryManager.cpp" />
<ClCompile Include="Gameboy\GbNoiseChannel.cpp" />
<ClCompile Include="Gameboy\GbPpu.cpp" />

26
Core/Core.vcxproj.filters
View file

@ -532,16 +532,16 @@
<ClInclude Include="Gameboy\GbTimer.h">
<Filter>GB</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GameboyDisUtils.h">
<ClInclude Include="Gameboy\Debugger\GameboyDisUtils.h">
<Filter>Debugger\Disassembler</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GbDebugger.h">
<ClInclude Include="Gameboy\Debugger\GbDebugger.h">
<Filter>Debugger\Debuggers</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GbMbc1.h">
<ClInclude Include="Gameboy\Carts\GbMbc1.h">
<Filter>GB\Carts</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GbCart.h">
<ClInclude Include="Gameboy\Carts\GbCart.h">
<Filter>GB\Carts</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GbCartFactory.h">
@ -565,19 +565,19 @@
<ClInclude Include="Gameboy\GbNoiseChannel.h">
<Filter>GB\APU</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GbMbc5.h">
<ClInclude Include="Gameboy\Carts\GbMbc5.h">
<Filter>GB\Carts</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GbMbc2.h">
<ClInclude Include="Gameboy\Carts\GbMbc2.h">
<Filter>GB\Carts</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GbMbc3.h">
<ClInclude Include="Gameboy\Carts\GbMbc3.h">
<Filter>GB\Carts</Filter>
</ClInclude>
<ClInclude Include="SNES\Debugger\EventManager.h">
<Filter>Debugger\EventManager</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GbEventManager.h">
<ClInclude Include="Gameboy\Debugger\GbEventManager.h">
<Filter>Debugger\EventManager</Filter>
</ClInclude>
<ClInclude Include="BaseEventManager.h">
@ -589,7 +589,7 @@
<ClInclude Include="SNES\Debugger\Assembler.h">
<Filter>Debugger\Assembler</Filter>
</ClInclude>
<ClInclude Include="Gameboy\GbAssembler.h">
<ClInclude Include="Gameboy\Debugger\GbAssembler.h">
<Filter>Debugger\Assembler</Filter>
</ClInclude>
<ClInclude Include="IAssembler.h">
@ -1047,10 +1047,10 @@
<ClCompile Include="Gameboy\Gameboy.cpp">
<Filter>GB</Filter>
</ClCompile>
<ClCompile Include="Gameboy\GameboyDisUtils.cpp">
<ClCompile Include="Gameboy\Debugger\GameboyDisUtils.cpp">
<Filter>Debugger\Disassembler</Filter>
</ClCompile>
<ClCompile Include="Gameboy\GbDebugger.cpp">
<ClCompile Include="Gameboy\Debugger\GbDebugger.cpp">
<Filter>Debugger\Debuggers</Filter>
</ClCompile>
<ClCompile Include="Gameboy\GbApu.cpp">
@ -1062,7 +1062,7 @@
<ClCompile Include="SNES\Debugger\EventManager.cpp">
<Filter>Debugger\EventManager</Filter>
</ClCompile>
<ClCompile Include="Gameboy\GbEventManager.cpp">
<ClCompile Include="Gameboy\Debugger\GbEventManager.cpp">
<Filter>Debugger\EventManager</Filter>
</ClCompile>
<ClCompile Include="Gameboy\GbDmaController.cpp">
@ -1071,7 +1071,7 @@
<ClCompile Include="SNES\Debugger\Assembler.cpp">
<Filter>Debugger\Assembler</Filter>
</ClCompile>
<ClCompile Include="Gameboy\GbAssembler.cpp">
<ClCompile Include="Gameboy\Debugger\GbAssembler.cpp">
<Filter>Debugger\Assembler</Filter>
</ClCompile>
<ClCompile Include="Gameboy\GbSquareChannel.cpp">

5
Core/Debugger.cpp
View file

@ -16,7 +16,7 @@
#include "SNES/Debugger/GsuDebugger.h"
#include "SNES/Debugger/NecDspDebugger.h"
#include "SNES/Debugger/Cx4Debugger.h"
#include "Gameboy/GbDebugger.h"
#include "Gameboy/Debugger/GbDebugger.h"
#include "SNES/BaseCartridge.h"
#include "SNES/MemoryManager.h"
#include "EmuSettings.h"
@ -43,13 +43,12 @@
#include "SNES/DmaController.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/GbPpu.h"
#include "Gameboy/GbAssembler.h"
#include "Gameboy/GameboyHeader.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/FolderUtilities.h"
#include "Utilities/IpsPatcher.h"
#include "MemoryOperationType.h"
#include "NES/NesDebugger.h"
#include "NES/Debugger/NesDebugger.h"
#include "NES/NesTypes.h"
#include "BaseState.h"
#include "BaseEventManager.h"

2
Core/Disassembler.cpp
View file

@ -11,7 +11,7 @@
#include "DebugUtilities.h"
#include "SNES/CpuTypes.h"
#include "SNES/SpcTypes.h"
#include "SNES/GsuTypes.h"
#include "SNES/Coprocessors/GSU/GsuTypes.h"
#include "Gameboy/GbTypes.h"
#include "NES/NesTypes.h"
#include "Utilities/FastString.h"

14
Core/DisassemblyInfo.cpp
View file

@ -7,14 +7,14 @@
#include "Utilities/FastString.h"
#include "DebugUtilities.h"
#include "SNES/CpuTypes.h"
#include "SNES/CpuDisUtils.h"
#include "SNES/SpcDisUtils.h"
#include "SNES/GsuDisUtils.h"
#include "SNES/NecDspDisUtils.h"
#include "SNES/Cx4DisUtils.h"
#include "SNES/Console.h"
#include "Gameboy/GameboyDisUtils.h"
#include "NES/NesDisUtils.h"
#include "SNES/Debugger/CpuDisUtils.h"
#include "SNES/Debugger/SpcDisUtils.h"
#include "SNES/Debugger/GsuDisUtils.h"
#include "SNES/Debugger/NecDspDisUtils.h"
#include "SNES/Debugger/Cx4DisUtils.h"
#include "Gameboy/Debugger/GameboyDisUtils.h"
#include "NES/Debugger/NesDisUtils.h"
DisassemblyInfo::DisassemblyInfo()
{

2
Core/GameClientConnection.cpp
View file

@ -9,7 +9,7 @@
#include "EmuSettings.h"
#include "SNES/ControlManager.h"
#include "ClientConnectionData.h"
#include "SNES/SnesController.h"
#include "SNES/Input/SnesController.h"
#include "SelectControllerMessage.h"
#include "PlayerListMessage.h"
#include "ForceDisconnectMessage.h"

2
Core/GameServer.cpp
View file

@ -6,7 +6,7 @@ using std::thread;
#include "GameServer.h"
#include "Emulator.h"
#include "SNES/ControlManager.h"
#include "SNES/Multitap.h"
#include "SNES/Input/Multitap.h"
#include "PlayerListMessage.h"
#include "NotificationManager.h"
#include "Utilities/Socket.h"

0
Core/Gameboy/GbCart.h → Core/Gameboy/Carts/GbCart.h
View file

4
Core/Gameboy/GbMbc1.h → Core/Gameboy/Carts/GbMbc1.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "GbCart.h"
#include "GbMemoryManager.h"
#include "Gameboy/Carts/GbCart.h"
#include "Gameboy/GbMemoryManager.h"
#include "Utilities/Serializer.h"
class GbMbc1 : public GbCart

4
Core/Gameboy/GbMbc2.h → Core/Gameboy/Carts/GbMbc2.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "GbCart.h"
#include "GbMemoryManager.h"
#include "Gameboy/Carts/GbCart.h"
#include "Gameboy/GbMemoryManager.h"
#include "Utilities/Serializer.h"
class GbMbc2 : public GbCart

4
Core/Gameboy/GbMbc3.h → Core/Gameboy/Carts/GbMbc3.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "GbCart.h"
#include "GbMemoryManager.h"
#include "Gameboy/Carts/GbCart.h"
#include "Gameboy/GbMemoryManager.h"
#include "Utilities/Serializer.h"
class GbMbc3 : public GbCart

4
Core/Gameboy/GbMbc5.h → Core/Gameboy/Carts/GbMbc5.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "stdafx.h"
#include "GbCart.h"
#include "GbMemoryManager.h"
#include "Gameboy/Carts/GbCart.h"
#include "Gameboy/GbMemoryManager.h"
#include "Utilities/Serializer.h"
class GbMbc5 : public GbCart

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

@ -5,7 +5,7 @@
#include "LabelManager.h"
#include "Utilities/FastString.h"
#include "Utilities/HexUtilities.h"
#include "GbTypes.h"
#include "Gameboy/GbTypes.h"
constexpr const char* _opTemplate[256] = {
"NOP", "LD BC, e", "LD (BC), A", "INC BC", "INC B", "DEC B", "LD B, d", "RLCA", "LD (a), SP", "ADD HL, BC", "LD A, (BC)", "DEC BC", "INC C", "DEC C", "LD C, d", "RRCA",

0
Core/Gameboy/GameboyDisUtils.h → Core/Gameboy/Debugger/GameboyDisUtils.h
View file

0
Core/Gameboy/GbAssembler.cpp → Core/Gameboy/Debugger/GbAssembler.cpp
View file

0
Core/Gameboy/GbAssembler.h → Core/Gameboy/Debugger/GbAssembler.h
View file

6
Core/Gameboy/GbDebugger.cpp → Core/Gameboy/Debugger/GbDebugger.cpp
View file

@ -2,7 +2,7 @@
#include "GbDebugger.h"
#include "DisassemblyInfo.h"
#include "Disassembler.h"
#include "Gameboy.h"
#include "Gameboy/Gameboy.h"
#include "Emulator.h"
#include "TraceLogger.h"
#include "CallstackManager.h"
@ -19,8 +19,8 @@
#include "Utilities/HexUtilities.h"
#include "MemoryOperationType.h"
#include "Emulator.h"
#include "GbPpu.h"
#include "GbCpu.h"
#include "Gameboy/GbPpu.h"
#include "Gameboy/GbCpu.h"
#include "SNES/Console.h"
#include "SNES/BaseCartridge.h"

0
Core/Gameboy/GbDebugger.h → Core/Gameboy/Debugger/GbDebugger.h
View file

6
Core/Gameboy/GbEventManager.cpp → Core/Gameboy/Debugger/GbEventManager.cpp
View file

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

0
Core/Gameboy/GbEventManager.h → Core/Gameboy/Debugger/GbEventManager.h
View file

2
Core/Gameboy/Gameboy.cpp
View file

@ -3,7 +3,7 @@
#include "GbCpu.h"
#include "GbPpu.h"
#include "GbApu.h"
#include "GbCart.h"
#include "Carts/GbCart.h"
#include "GbTimer.h"
#include "GbControlManager.h"
#include "GbDmaController.h"

2
Core/Gameboy/GbApu.cpp
View file

@ -4,7 +4,7 @@
#include "Gameboy.h"
#include "SoundMixer.h"
#include "EmuSettings.h"
#include "SNES/SuperGameboy.h"
#include "SNES/Coprocessors/SGB/SuperGameboy.h"
#include "Utilities/Serializer.h"
GbApu::GbApu()

10
Core/Gameboy/GbCartFactory.h
View file

@ -1,10 +1,10 @@
#pragma once
#include "stdafx.h"
#include "GbCart.h"
#include "GbMbc1.h"
#include "GbMbc2.h"
#include "GbMbc3.h"
#include "GbMbc5.h"
#include "Carts/GbCart.h"
#include "Carts/GbMbc1.h"
#include "Carts/GbMbc2.h"
#include "Carts/GbMbc3.h"
#include "Carts/GbMbc5.h"
class GbCartFactory
{

2
Core/Gameboy/GbControlManager.cpp
View file

@ -2,7 +2,7 @@
#include "Emulator.h"
#include "EmuSettings.h"
#include "GbControlManager.h"
#include "SNES/SnesController.h"
#include "SNES/Input/SnesController.h"
#include "KeyManager.h"
GbControlManager::GbControlManager(Emulator* emu)

6
Core/Gameboy/GbMemoryManager.cpp
View file

@ -6,12 +6,12 @@
#include "GbApu.h"
#include "GbTimer.h"
#include "GbTypes.h"
#include "GbCart.h"
#include "Carts/GbCart.h"
#include "GbDmaController.h"
#include "EmuSettings.h"
#include "SNES/SuperGameboy.h"
#include "SNES/Coprocessors/SGB/SuperGameboy.h"
#include "SNES/ControlManager.h"
#include "SNES/SnesController.h"
#include "SNES/Input/SnesController.h"
#include "MessageManager.h"
#include "Utilities/VirtualFile.h"
#include "Utilities/Serializer.h"

2
Core/Gameboy/GbPpu.cpp
View file

@ -11,7 +11,7 @@
#include "GbDmaController.h"
#include "NotificationManager.h"
#include "MessageManager.h"
#include "SNES/SuperGameboy.h"
#include "SNES/Coprocessors/SGB/SuperGameboy.h"
#include "Utilities/HexUtilities.h"
#include "Utilities/Serializer.h"

6
Core/MemoryAccessCounter.cpp
View file

@ -6,9 +6,9 @@
#include "SNES/MemoryManager.h"
#include "SNES/Console.h"
#include "SNES/Spc.h"
#include "SNES/Sa1.h"
#include "SNES/Gsu.h"
#include "SNES/Cx4.h"
#include "SNES/Coprocessors/SA1/Sa1.h"
#include "SNES/Coprocessors/GSU/Gsu.h"
#include "SNES/Coprocessors/CX4/Cx4.h"
#include "SNES/BaseCartridge.h"
#include "Gameboy/Gameboy.h"

12
Core/MemoryDumper.cpp
View file

@ -4,14 +4,14 @@
#include "SNES/MemoryManager.h"
#include "SNES/Ppu.h"
#include "SNES/Spc.h"
#include "SNES/NecDsp.h"
#include "SNES/Sa1.h"
#include "SNES/Cx4.h"
#include "SNES/Gsu.h"
#include "SNES/Coprocessors/DSP/NecDsp.h"
#include "SNES/Coprocessors/SA1/Sa1.h"
#include "SNES/Coprocessors/CX4/Cx4.h"
#include "SNES/Coprocessors/GSU/Gsu.h"
#include "Gameboy/Gameboy.h"
#include "Gameboy/GbMemoryManager.h"
#include "SNES/BsxCart.h"
#include "SNES/BsxMemoryPack.h"
#include "SNES/Coprocessors/BSX/BsxCart.h"
#include "SNES/Coprocessors/BSX/BsxMemoryPack.h"
#include "SNES/Console.h"
#include "MemoryDumper.h"
#include "SNES/BaseCartridge.h"

2
Core/NES/Debugger/NesDebuggerTypes.h
View file

@ -1,5 +1,5 @@
#pragma once
#include "NesTypes.h"
#include "NES/NesTypes.h"
struct NesPpuState
{

2
Core/NES/NesConsole.cpp
View file

@ -4,7 +4,7 @@
#include "NesControlManager.h"
#include "IControlManager.h"
#include "MapperFactory.h"
#include "NesApu.h"
#include "NES/APU/NesApu.h"
#include "NesCpu.h"
#include "BaseMapper.h"
#include "NesSoundMixer.h"

4
Core/NES/NesControlManager.cpp
View file

@ -9,8 +9,8 @@
#include "IInputProvider.h"
#include "IInputRecorder.h"
#include "BatteryManager.h"
#include "StandardController.h"
#include "SNES/SnesController.h"
#include "NES/Input/StandardController.h"
#include "SNES/Input/SnesController.h"
#include "NesConsole.h"
#include "Emulator.h"
#include "KeyManager.h"

3
Core/NES/NesCpu.cpp
View file

@ -7,8 +7,7 @@
#include "Emulator.h"
#include "NesCpu.h"
#include "NesPpu.h"
#include "NesApu.h"
#include "DeltaModulationChannel.h"
#include "NES/APU/NesApu.h"
#include "Debugger.h"
#include "NesMemoryManager.h"
#include "NesConsole.h"

16
Core/NES/NesPpu.cpp
View file

@ -1,14 +1,14 @@
#include "stdafx.h"
#include "../../Utilities/Serializer.h"
#include "Utilities/Serializer.h"
#include "NesPpu.h"
#include "NesCpu.h"
#include "NesApu.h"
#include "NesMemoryManager.h"
#include "NesConsole.h"
#include "NesControlManager.h"
#include "BaseMapper.h"
#include "NES/NesPpu.h"
#include "NES/NesCpu.h"
#include "NES/APU/NesApu.h"
#include "NES/NesMemoryManager.h"
#include "NES/NesConsole.h"
#include "NES/NesControlManager.h"
#include "NES/BaseMapper.h"
#include "EmuSettings.h"
#include "Debugger.h"

6
Core/NES/NesPpu.h
View file

@ -2,9 +2,9 @@
#include "../stdafx.h"
#include "../../Utilities/ISerializable.h"
#include "NesTypes.h"
#include "NesDebuggerTypes.h"
#include "INesMemoryHandler.h"
#include "NES/NesTypes.h"
#include "NES/Debugger/NesDebuggerTypes.h"
#include "NES/INesMemoryHandler.h"
#include "MemoryOperationType.h"
enum class NesModel;

8
Core/TraceLogger.cpp
View file

@ -12,13 +12,13 @@
#include "SNES/Console.h"
#include "SNES/CpuTypes.h"
#include "SNES/SpcTypes.h"
#include "SNES/NecDspTypes.h"
#include "SNES/Coprocessors/DSP/NecDspTypes.h"
#include "SNES/PpuTypes.h"
#include "SNES/Cx4Types.h"
#include "SNES/GsuTypes.h"
#include "SNES/Coprocessors/CX4/Cx4Types.h"
#include "SNES/Coprocessors/GSU/GsuTypes.h"
#include "Gameboy/GbTypes.h"
#include "NES/NesTypes.h"
#include "NES/NesDebuggerTypes.h"
#include "NES/Debugger/NesDebuggerTypes.h"
#include "DebugTypes.h"
#include "Utilities/HexUtilities.h"
#include "DebugBreakHelper.h"