diff --git a/Breaknes/Breaknes/Breaknes.sln b/Breaknes/Breaknes/Breaknes.sln index 760ad54b..f6754578 100644 --- a/Breaknes/Breaknes/Breaknes.sln +++ b/Breaknes/Breaknes/Breaknes.sln @@ -7,11 +7,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Breaknes", "Breaknes.csproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BreaksCore", "..\BreaksCore\Scripts\VS2022\BreaksCore.vcxproj", "{88908FB4-0012-4533-BFFB-30AA9F72EBDC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Breaks6502\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\BreaksPPU\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\BreaksAPU\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Breaks Core", "Breaks Core", "{F7FC065C-EBE2-4648-9BD4-79B660C14322}" EndProject diff --git a/Breaknes/Breaknes/FormSettings.cs b/Breaknes/Breaknes/FormSettings.cs index 7e5a1217..587afb61 100644 --- a/Breaknes/Breaknes/FormSettings.cs +++ b/Breaknes/Breaknes/FormSettings.cs @@ -53,7 +53,7 @@ static BreaknesSettings SetDefaultSettings() { BreaknesSettings settings = new(); - settings.MainBoard = "NES-001 (PCB rev. -01 to -04) (1985-1986)"; + settings.MainBoard = "NES-001 (PCB rev. -01 to -04)"; settings.DumpAudio = false; settings.DumpAudioDir = ""; settings.DumpVideo = false; diff --git a/Breaknes/BreaknesSDL/BreaknesSDL.sln b/Breaknes/BreaknesSDL/BreaknesSDL.sln index c363d0f3..7fffe568 100644 --- a/Breaknes/BreaknesSDL/BreaknesSDL.sln +++ b/Breaknes/BreaknesSDL/BreaknesSDL.sln @@ -13,11 +13,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseBoardLib", "..\..\Commo EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mappers", "..\..\Mappers\Scripts\VS2022\Mappers.vcxproj", "{1CE1EFD6-4DBF-4D93-AD3A-94C808EA70AB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Breaks6502\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\BreaksAPU\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\BreaksPPU\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BreaksCoreStatic", "..\BreaksCore\Scripts\VS2022\BreaksCoreStatic.vcxproj", "{59610324-CE90-474C-89F1-8A998C52B346}" EndProject diff --git a/Breaknes/BreaknesSDL/BreaknesSDL.vcxproj b/Breaknes/BreaknesSDL/BreaknesSDL.vcxproj index af28727b..93e8f25a 100644 --- a/Breaknes/BreaknesSDL/BreaknesSDL.vcxproj +++ b/Breaknes/BreaknesSDL/BreaknesSDL.vcxproj @@ -149,13 +149,13 @@ {59610324-ce90-474c-89f1-8a998c52b346} - + {75210c0a-a812-4246-a179-b50d8a25a121} - + {50e93d78-36dc-46c3-82ea-cab373e18729} - + {ebd9b3eb-3c04-43ed-b454-e9442b21f5a0} diff --git a/Breaknes/BreaksCore/Readme.md b/Breaknes/BreaksCore/Readme.md index 4b516a75..adc4f24b 100644 --- a/Breaknes/BreaksCore/Readme.md +++ b/Breaknes/BreaksCore/Readme.md @@ -20,13 +20,13 @@ List of supported boards. The plan is to simulate the Generic Famicom board as follows: -![fami_logisim](/UserManual/imgstore/fami_logisim.jpg) +![fami_logisim](/Wiki/imgstore/fami_logisim.jpg) ### NES The plan is to simulate the Generic NES board as follows: -![nes](/UserManual/imgstore/nes.png) +![nes](/Wiki/imgstore/nes.png) ### Dendy/Subor/Phantom/Whatever @@ -36,7 +36,7 @@ TBD. BogusBoard is a default motherboard if BreaksCore did not recognize the board type when it created the instances or other erroneous parameters. -![BogusBoard](/UserManual/imgstore/BogusBoard.jpg) +![BogusBoard](/Wiki/imgstore/BogusBoard.jpg) This system contains 64 KBytes of RAM, a 6502 processor core and nothing else. @@ -46,7 +46,7 @@ In other words, it's a minimal computing system to check if anything is ticking A special debug board for the PPUPlayer. -![PPUPlayer_All](/UserManual/imgstore/PPUPlayer_All.png) +![PPUPlayer_All](/Wiki/imgstore/PPUPlayer_All.png) The board contains the PPU, adjacent logic (Address Latch, VRAM) and partial support for the cartridge connector (only the PPU/CHR pins are used). @@ -54,7 +54,7 @@ The board contains the PPU, adjacent logic (Address Latch, VRAM) and partial sup Another debug board for "playing" the APU register dump. -![APUPlayer](/UserManual/imgstore/APUPlayer.jpg) +![APUPlayer](/Wiki/imgstore/APUPlayer.jpg) It is roughly the same as PPUPlayer, but simpler in that the APU does not require a cartridge connector and additional bindings associated with it. @@ -72,7 +72,7 @@ Debug entities are divided into the following categories: - DebugInfo: get/set internal state - MemLayout: read/write memory dumps -![debug](/UserManual/imgstore/debug.jpg) +![debug](/Wiki/imgstore/debug.jpg) ### DebugInfo diff --git a/Breaknes/BreaksCore/Scripts/VS2022/BreaksCore.vcxproj b/Breaknes/BreaksCore/Scripts/VS2022/BreaksCore.vcxproj index f46a379e..04b08470 100644 --- a/Breaknes/BreaksCore/Scripts/VS2022/BreaksCore.vcxproj +++ b/Breaknes/BreaksCore/Scripts/VS2022/BreaksCore.vcxproj @@ -19,8 +19,8 @@ - - + + @@ -45,8 +45,8 @@ - - + + @@ -65,13 +65,13 @@ - + {75210c0a-a812-4246-a179-b50d8a25a121} - + {50e93d78-36dc-46c3-82ea-cab373e18729} - + {ebd9b3eb-3c04-43ed-b454-e9442b21f5a0} diff --git a/Breaknes/BreaksCore/Scripts/VS2022/BreaksCoreStatic.vcxproj b/Breaknes/BreaksCore/Scripts/VS2022/BreaksCoreStatic.vcxproj index 7ca90736..25cf7b11 100644 --- a/Breaknes/BreaksCore/Scripts/VS2022/BreaksCoreStatic.vcxproj +++ b/Breaknes/BreaksCore/Scripts/VS2022/BreaksCoreStatic.vcxproj @@ -19,8 +19,8 @@ - - + + @@ -44,8 +44,8 @@ - - + + @@ -64,13 +64,13 @@ - + {75210c0a-a812-4246-a179-b50d8a25a121} - + {50e93d78-36dc-46c3-82ea-cab373e18729} - + {ebd9b3eb-3c04-43ed-b454-e9442b21f5a0} diff --git a/Breaknes/BreaksCore/pch.h b/Breaknes/BreaksCore/pch.h index 75d663bf..00a41acf 100644 --- a/Breaknes/BreaksCore/pch.h +++ b/Breaknes/BreaksCore/pch.h @@ -11,8 +11,8 @@ #include #endif -#include "../../Breaks6502/Breakasm/ASM.h" -#include "../../Breaks6502/Breakasm/ASMOPS.h" +#include "../../Tools/Breakasm/ASM.h" +#include "../../Tools/Breakasm/ASMOPS.h" // Very basic @@ -21,9 +21,9 @@ // Big chips -#include "../../Breaks6502/M6502Core/core.h" -#include "../../BreaksAPU/APUSim/apu.h" -#include "../../BreaksPPU/PPUSim/ppu.h" +#include "../../Chips/M6502Core/core.h" +#include "../../Chips/APUSim/apu.h" +#include "../../Chips/PPUSim/ppu.h" // Board logic diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b808ebc..8de1f4b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,63 +33,63 @@ add_executable (breaknes #Common/JsonLib/Json.cpp - BreaksAPU/APUSim/apu.cpp - BreaksAPU/APUSim/clkgen.cpp - BreaksAPU/APUSim/common.cpp - BreaksAPU/APUSim/core.cpp - BreaksAPU/APUSim/dac.cpp - BreaksAPU/APUSim/debug.cpp - BreaksAPU/APUSim/dma.cpp - BreaksAPU/APUSim/dpcm.cpp - BreaksAPU/APUSim/env.cpp - BreaksAPU/APUSim/length.cpp - BreaksAPU/APUSim/noise.cpp - BreaksAPU/APUSim/pads.cpp - BreaksAPU/APUSim/regs.cpp - BreaksAPU/APUSim/square.cpp - BreaksAPU/APUSim/triangle.cpp - - BreaksPPU/PPUSim/bgcol.cpp - BreaksPPU/PPUSim/cram.cpp - BreaksPPU/PPUSim/dataread.cpp - BreaksPPU/PPUSim/debug.cpp - BreaksPPU/PPUSim/fifo.cpp - BreaksPPU/PPUSim/fsm.cpp - BreaksPPU/PPUSim/hv.cpp - BreaksPPU/PPUSim/hv_decoder.cpp - BreaksPPU/PPUSim/mux.cpp - BreaksPPU/PPUSim/oam.cpp - BreaksPPU/PPUSim/par.cpp - BreaksPPU/PPUSim/patgen.cpp - BreaksPPU/PPUSim/pclk.cpp - BreaksPPU/PPUSim/ppu.cpp - BreaksPPU/PPUSim/regs.cpp - BreaksPPU/PPUSim/scroll_regs.cpp - BreaksPPU/PPUSim/sprite_eval.cpp - BreaksPPU/PPUSim/video_out.cpp - BreaksPPU/PPUSim/vram_ctrl.cpp - - Breaks6502/M6502Core/address_bus.cpp - Breaks6502/M6502Core/alu.cpp - Breaks6502/M6502Core/alu_control.cpp - Breaks6502/M6502Core/branch_logic.cpp - Breaks6502/M6502Core/bus_control.cpp - Breaks6502/M6502Core/core.cpp - Breaks6502/M6502Core/data_bus.cpp - Breaks6502/M6502Core/debug.cpp - Breaks6502/M6502Core/decoder.cpp - Breaks6502/M6502Core/dispatch.cpp - Breaks6502/M6502Core/extra_counter.cpp - Breaks6502/M6502Core/flags.cpp - Breaks6502/M6502Core/flags_control.cpp - Breaks6502/M6502Core/interrupts.cpp - Breaks6502/M6502Core/ir.cpp - Breaks6502/M6502Core/pc.cpp - Breaks6502/M6502Core/pc_control.cpp - Breaks6502/M6502Core/predecode.cpp - Breaks6502/M6502Core/random_logic.cpp - Breaks6502/M6502Core/regs.cpp - Breaks6502/M6502Core/regs_control.cpp + Chips/APUSim/apu.cpp + Chips/APUSim/clkgen.cpp + Chips/APUSim/common.cpp + Chips/APUSim/core.cpp + Chips/APUSim/dac.cpp + Chips/APUSim/debug.cpp + Chips/APUSim/dma.cpp + Chips/APUSim/dpcm.cpp + Chips/APUSim/env.cpp + Chips/APUSim/length.cpp + Chips/APUSim/noise.cpp + Chips/APUSim/pads.cpp + Chips/APUSim/regs.cpp + Chips/APUSim/square.cpp + Chips/APUSim/triangle.cpp + + Chips/PPUSim/bgcol.cpp + Chips/PPUSim/cram.cpp + Chips/PPUSim/dataread.cpp + Chips/PPUSim/debug.cpp + Chips/PPUSim/fifo.cpp + Chips/PPUSim/fsm.cpp + Chips/PPUSim/hv.cpp + Chips/PPUSim/hv_decoder.cpp + Chips/PPUSim/mux.cpp + Chips/PPUSim/oam.cpp + Chips/PPUSim/par.cpp + Chips/PPUSim/patgen.cpp + Chips/PPUSim/pclk.cpp + Chips/PPUSim/ppu.cpp + Chips/PPUSim/regs.cpp + Chips/PPUSim/scroll_regs.cpp + Chips/PPUSim/sprite_eval.cpp + Chips/PPUSim/video_out.cpp + Chips/PPUSim/vram_ctrl.cpp + + Chips/M6502Core/address_bus.cpp + Chips/M6502Core/alu.cpp + Chips/M6502Core/alu_control.cpp + Chips/M6502Core/branch_logic.cpp + Chips/M6502Core/bus_control.cpp + Chips/M6502Core/core.cpp + Chips/M6502Core/data_bus.cpp + Chips/M6502Core/debug.cpp + Chips/M6502Core/decoder.cpp + Chips/M6502Core/dispatch.cpp + Chips/M6502Core/extra_counter.cpp + Chips/M6502Core/flags.cpp + Chips/M6502Core/flags_control.cpp + Chips/M6502Core/interrupts.cpp + Chips/M6502Core/ir.cpp + Chips/M6502Core/pc.cpp + Chips/M6502Core/pc_control.cpp + Chips/M6502Core/predecode.cpp + Chips/M6502Core/random_logic.cpp + Chips/M6502Core/regs.cpp + Chips/M6502Core/regs_control.cpp Mappers/AbstractCartridge.cpp Mappers/CartridgeFactory.cpp diff --git a/BreaksAPU/APUSim/Readme.md b/Chips/APUSim/Readme.md similarity index 100% rename from BreaksAPU/APUSim/Readme.md rename to Chips/APUSim/Readme.md diff --git a/Breaks6502/M6502Core/Scripts/.gitignore b/Chips/APUSim/Scripts/.gitignore similarity index 100% rename from Breaks6502/M6502Core/Scripts/.gitignore rename to Chips/APUSim/Scripts/.gitignore diff --git a/BreaksAPU/APUSim/Scripts/VS2022/APUSim.vcxproj b/Chips/APUSim/Scripts/VS2022/APUSim.vcxproj similarity index 100% rename from BreaksAPU/APUSim/Scripts/VS2022/APUSim.vcxproj rename to Chips/APUSim/Scripts/VS2022/APUSim.vcxproj diff --git a/BreaksAPU/APUSim/Scripts/VS2022/APUSim.vcxproj.filters b/Chips/APUSim/Scripts/VS2022/APUSim.vcxproj.filters similarity index 100% rename from BreaksAPU/APUSim/Scripts/VS2022/APUSim.vcxproj.filters rename to Chips/APUSim/Scripts/VS2022/APUSim.vcxproj.filters diff --git a/BreaksAPU/APUSim/apu.cpp b/Chips/APUSim/apu.cpp similarity index 100% rename from BreaksAPU/APUSim/apu.cpp rename to Chips/APUSim/apu.cpp diff --git a/BreaksAPU/APUSim/apu.h b/Chips/APUSim/apu.h similarity index 100% rename from BreaksAPU/APUSim/apu.h rename to Chips/APUSim/apu.h diff --git a/BreaksAPU/APUSim/apu_layers.png b/Chips/APUSim/apu_layers.png similarity index 100% rename from BreaksAPU/APUSim/apu_layers.png rename to Chips/APUSim/apu_layers.png diff --git a/BreaksAPU/APUSim/clkgen.cpp b/Chips/APUSim/clkgen.cpp similarity index 100% rename from BreaksAPU/APUSim/clkgen.cpp rename to Chips/APUSim/clkgen.cpp diff --git a/BreaksAPU/APUSim/clkgen.h b/Chips/APUSim/clkgen.h similarity index 100% rename from BreaksAPU/APUSim/clkgen.h rename to Chips/APUSim/clkgen.h diff --git a/BreaksAPU/APUSim/common.cpp b/Chips/APUSim/common.cpp similarity index 100% rename from BreaksAPU/APUSim/common.cpp rename to Chips/APUSim/common.cpp diff --git a/BreaksAPU/APUSim/common.h b/Chips/APUSim/common.h similarity index 100% rename from BreaksAPU/APUSim/common.h rename to Chips/APUSim/common.h diff --git a/BreaksAPU/APUSim/core.cpp b/Chips/APUSim/core.cpp similarity index 100% rename from BreaksAPU/APUSim/core.cpp rename to Chips/APUSim/core.cpp diff --git a/BreaksAPU/APUSim/core.h b/Chips/APUSim/core.h similarity index 100% rename from BreaksAPU/APUSim/core.h rename to Chips/APUSim/core.h diff --git a/BreaksAPU/APUSim/dac.cpp b/Chips/APUSim/dac.cpp similarity index 100% rename from BreaksAPU/APUSim/dac.cpp rename to Chips/APUSim/dac.cpp diff --git a/BreaksAPU/APUSim/dac.h b/Chips/APUSim/dac.h similarity index 100% rename from BreaksAPU/APUSim/dac.h rename to Chips/APUSim/dac.h diff --git a/BreaksAPU/APUSim/debug.cpp b/Chips/APUSim/debug.cpp similarity index 100% rename from BreaksAPU/APUSim/debug.cpp rename to Chips/APUSim/debug.cpp diff --git a/BreaksAPU/APUSim/debug.h b/Chips/APUSim/debug.h similarity index 100% rename from BreaksAPU/APUSim/debug.h rename to Chips/APUSim/debug.h diff --git a/BreaksAPU/APUSim/dma.cpp b/Chips/APUSim/dma.cpp similarity index 100% rename from BreaksAPU/APUSim/dma.cpp rename to Chips/APUSim/dma.cpp diff --git a/BreaksAPU/APUSim/dma.h b/Chips/APUSim/dma.h similarity index 100% rename from BreaksAPU/APUSim/dma.h rename to Chips/APUSim/dma.h diff --git a/BreaksAPU/APUSim/dpcm.cpp b/Chips/APUSim/dpcm.cpp similarity index 100% rename from BreaksAPU/APUSim/dpcm.cpp rename to Chips/APUSim/dpcm.cpp diff --git a/BreaksAPU/APUSim/dpcm.h b/Chips/APUSim/dpcm.h similarity index 100% rename from BreaksAPU/APUSim/dpcm.h rename to Chips/APUSim/dpcm.h diff --git a/BreaksAPU/APUSim/env.cpp b/Chips/APUSim/env.cpp similarity index 100% rename from BreaksAPU/APUSim/env.cpp rename to Chips/APUSim/env.cpp diff --git a/BreaksAPU/APUSim/env.h b/Chips/APUSim/env.h similarity index 100% rename from BreaksAPU/APUSim/env.h rename to Chips/APUSim/env.h diff --git a/BreaksAPU/APUSim/length.cpp b/Chips/APUSim/length.cpp similarity index 100% rename from BreaksAPU/APUSim/length.cpp rename to Chips/APUSim/length.cpp diff --git a/BreaksAPU/APUSim/length.h b/Chips/APUSim/length.h similarity index 100% rename from BreaksAPU/APUSim/length.h rename to Chips/APUSim/length.h diff --git a/BreaksAPU/APUSim/noise.cpp b/Chips/APUSim/noise.cpp similarity index 100% rename from BreaksAPU/APUSim/noise.cpp rename to Chips/APUSim/noise.cpp diff --git a/BreaksAPU/APUSim/noise.h b/Chips/APUSim/noise.h similarity index 100% rename from BreaksAPU/APUSim/noise.h rename to Chips/APUSim/noise.h diff --git a/BreaksAPU/APUSim/pads.cpp b/Chips/APUSim/pads.cpp similarity index 100% rename from BreaksAPU/APUSim/pads.cpp rename to Chips/APUSim/pads.cpp diff --git a/BreaksAPU/APUSim/pads.h b/Chips/APUSim/pads.h similarity index 100% rename from BreaksAPU/APUSim/pads.h rename to Chips/APUSim/pads.h diff --git a/BreaksAPU/APUSim/pch.cpp b/Chips/APUSim/pch.cpp similarity index 100% rename from BreaksAPU/APUSim/pch.cpp rename to Chips/APUSim/pch.cpp diff --git a/BreaksAPU/APUSim/pch.h b/Chips/APUSim/pch.h similarity index 75% rename from BreaksAPU/APUSim/pch.h rename to Chips/APUSim/pch.h index 02c5139f..188d4a3d 100644 --- a/BreaksAPU/APUSim/pch.h +++ b/Chips/APUSim/pch.h @@ -5,6 +5,6 @@ #include #include "../../Common/BaseLogicLib/BaseLogic.h" -#include "../../Breaks6502/M6502Core/core.h" +#include "../../Chips/M6502Core/core.h" #include "apu.h" diff --git a/BreaksAPU/APUSim/regs.cpp b/Chips/APUSim/regs.cpp similarity index 100% rename from BreaksAPU/APUSim/regs.cpp rename to Chips/APUSim/regs.cpp diff --git a/BreaksAPU/APUSim/regs.h b/Chips/APUSim/regs.h similarity index 100% rename from BreaksAPU/APUSim/regs.h rename to Chips/APUSim/regs.h diff --git a/BreaksAPU/APUSim/square.cpp b/Chips/APUSim/square.cpp similarity index 100% rename from BreaksAPU/APUSim/square.cpp rename to Chips/APUSim/square.cpp diff --git a/BreaksAPU/APUSim/square.h b/Chips/APUSim/square.h similarity index 100% rename from BreaksAPU/APUSim/square.h rename to Chips/APUSim/square.h diff --git a/BreaksAPU/APUSim/triangle.cpp b/Chips/APUSim/triangle.cpp similarity index 100% rename from BreaksAPU/APUSim/triangle.cpp rename to Chips/APUSim/triangle.cpp diff --git a/BreaksAPU/APUSim/triangle.h b/Chips/APUSim/triangle.h similarity index 100% rename from BreaksAPU/APUSim/triangle.h rename to Chips/APUSim/triangle.h diff --git a/BreaksAPU/FastAPU/FastAPU.vcxproj b/Chips/FastAPU/FastAPU.vcxproj similarity index 100% rename from BreaksAPU/FastAPU/FastAPU.vcxproj rename to Chips/FastAPU/FastAPU.vcxproj diff --git a/BreaksAPU/FastAPU/FastAPU.vcxproj.filters b/Chips/FastAPU/FastAPU.vcxproj.filters similarity index 100% rename from BreaksAPU/FastAPU/FastAPU.vcxproj.filters rename to Chips/FastAPU/FastAPU.vcxproj.filters diff --git a/BreaksAPU/FastAPU/Readme.md b/Chips/FastAPU/Readme.md similarity index 100% rename from BreaksAPU/FastAPU/Readme.md rename to Chips/FastAPU/Readme.md diff --git a/BreaksAPU/FastAPU/apu.cpp b/Chips/FastAPU/apu.cpp similarity index 100% rename from BreaksAPU/FastAPU/apu.cpp rename to Chips/FastAPU/apu.cpp diff --git a/BreaksAPU/FastAPU/apu.h b/Chips/FastAPU/apu.h similarity index 100% rename from BreaksAPU/FastAPU/apu.h rename to Chips/FastAPU/apu.h diff --git a/BreaksAPU/FastAPU/clkgen.cpp b/Chips/FastAPU/clkgen.cpp similarity index 100% rename from BreaksAPU/FastAPU/clkgen.cpp rename to Chips/FastAPU/clkgen.cpp diff --git a/BreaksAPU/FastAPU/clkgen.h b/Chips/FastAPU/clkgen.h similarity index 100% rename from BreaksAPU/FastAPU/clkgen.h rename to Chips/FastAPU/clkgen.h diff --git a/BreaksAPU/FastAPU/core.cpp b/Chips/FastAPU/core.cpp similarity index 100% rename from BreaksAPU/FastAPU/core.cpp rename to Chips/FastAPU/core.cpp diff --git a/BreaksAPU/FastAPU/core.h b/Chips/FastAPU/core.h similarity index 100% rename from BreaksAPU/FastAPU/core.h rename to Chips/FastAPU/core.h diff --git a/BreaksAPU/FastAPU/dac.cpp b/Chips/FastAPU/dac.cpp similarity index 100% rename from BreaksAPU/FastAPU/dac.cpp rename to Chips/FastAPU/dac.cpp diff --git a/BreaksAPU/FastAPU/dac.h b/Chips/FastAPU/dac.h similarity index 100% rename from BreaksAPU/FastAPU/dac.h rename to Chips/FastAPU/dac.h diff --git a/BreaksAPU/FastAPU/dma.cpp b/Chips/FastAPU/dma.cpp similarity index 100% rename from BreaksAPU/FastAPU/dma.cpp rename to Chips/FastAPU/dma.cpp diff --git a/BreaksAPU/FastAPU/dma.h b/Chips/FastAPU/dma.h similarity index 100% rename from BreaksAPU/FastAPU/dma.h rename to Chips/FastAPU/dma.h diff --git a/BreaksAPU/FastAPU/dpcm.cpp b/Chips/FastAPU/dpcm.cpp similarity index 100% rename from BreaksAPU/FastAPU/dpcm.cpp rename to Chips/FastAPU/dpcm.cpp diff --git a/BreaksAPU/FastAPU/dpcm.h b/Chips/FastAPU/dpcm.h similarity index 100% rename from BreaksAPU/FastAPU/dpcm.h rename to Chips/FastAPU/dpcm.h diff --git a/BreaksAPU/FastAPU/env.cpp b/Chips/FastAPU/env.cpp similarity index 100% rename from BreaksAPU/FastAPU/env.cpp rename to Chips/FastAPU/env.cpp diff --git a/BreaksAPU/FastAPU/env.h b/Chips/FastAPU/env.h similarity index 100% rename from BreaksAPU/FastAPU/env.h rename to Chips/FastAPU/env.h diff --git a/BreaksAPU/FastAPU/length.cpp b/Chips/FastAPU/length.cpp similarity index 100% rename from BreaksAPU/FastAPU/length.cpp rename to Chips/FastAPU/length.cpp diff --git a/BreaksAPU/FastAPU/length.h b/Chips/FastAPU/length.h similarity index 100% rename from BreaksAPU/FastAPU/length.h rename to Chips/FastAPU/length.h diff --git a/BreaksAPU/FastAPU/noise.cpp b/Chips/FastAPU/noise.cpp similarity index 100% rename from BreaksAPU/FastAPU/noise.cpp rename to Chips/FastAPU/noise.cpp diff --git a/BreaksAPU/FastAPU/noise.h b/Chips/FastAPU/noise.h similarity index 100% rename from BreaksAPU/FastAPU/noise.h rename to Chips/FastAPU/noise.h diff --git a/BreaksAPU/FastAPU/pads.cpp b/Chips/FastAPU/pads.cpp similarity index 100% rename from BreaksAPU/FastAPU/pads.cpp rename to Chips/FastAPU/pads.cpp diff --git a/BreaksAPU/FastAPU/pads.h b/Chips/FastAPU/pads.h similarity index 100% rename from BreaksAPU/FastAPU/pads.h rename to Chips/FastAPU/pads.h diff --git a/Breaks6502/Breakasm/pch.cpp b/Chips/FastAPU/pch.cpp similarity index 100% rename from Breaks6502/Breakasm/pch.cpp rename to Chips/FastAPU/pch.cpp diff --git a/BreaksAPU/FastAPU/pch.h b/Chips/FastAPU/pch.h similarity index 75% rename from BreaksAPU/FastAPU/pch.h rename to Chips/FastAPU/pch.h index 02c5139f..188d4a3d 100644 --- a/BreaksAPU/FastAPU/pch.h +++ b/Chips/FastAPU/pch.h @@ -5,6 +5,6 @@ #include #include "../../Common/BaseLogicLib/BaseLogic.h" -#include "../../Breaks6502/M6502Core/core.h" +#include "../../Chips/M6502Core/core.h" #include "apu.h" diff --git a/BreaksAPU/FastAPU/regs.cpp b/Chips/FastAPU/regs.cpp similarity index 100% rename from BreaksAPU/FastAPU/regs.cpp rename to Chips/FastAPU/regs.cpp diff --git a/BreaksAPU/FastAPU/regs.h b/Chips/FastAPU/regs.h similarity index 100% rename from BreaksAPU/FastAPU/regs.h rename to Chips/FastAPU/regs.h diff --git a/BreaksAPU/FastAPU/square.cpp b/Chips/FastAPU/square.cpp similarity index 100% rename from BreaksAPU/FastAPU/square.cpp rename to Chips/FastAPU/square.cpp diff --git a/BreaksAPU/FastAPU/square.h b/Chips/FastAPU/square.h similarity index 100% rename from BreaksAPU/FastAPU/square.h rename to Chips/FastAPU/square.h diff --git a/BreaksAPU/FastAPU/triangle.cpp b/Chips/FastAPU/triangle.cpp similarity index 100% rename from BreaksAPU/FastAPU/triangle.cpp rename to Chips/FastAPU/triangle.cpp diff --git a/BreaksAPU/FastAPU/triangle.h b/Chips/FastAPU/triangle.h similarity index 100% rename from BreaksAPU/FastAPU/triangle.h rename to Chips/FastAPU/triangle.h diff --git a/Breaks6502/M6502Core/Readme.md b/Chips/M6502Core/Readme.md similarity index 100% rename from Breaks6502/M6502Core/Readme.md rename to Chips/M6502Core/Readme.md diff --git a/BreaksAPU/APUSim/Scripts/.gitignore b/Chips/M6502Core/Scripts/.gitignore similarity index 100% rename from BreaksAPU/APUSim/Scripts/.gitignore rename to Chips/M6502Core/Scripts/.gitignore diff --git a/Breaks6502/M6502Core/Scripts/VS2022/M6502Core.vcxproj b/Chips/M6502Core/Scripts/VS2022/M6502Core.vcxproj similarity index 100% rename from Breaks6502/M6502Core/Scripts/VS2022/M6502Core.vcxproj rename to Chips/M6502Core/Scripts/VS2022/M6502Core.vcxproj diff --git a/Breaks6502/M6502Core/Scripts/VS2022/M6502Core.vcxproj.filters b/Chips/M6502Core/Scripts/VS2022/M6502Core.vcxproj.filters similarity index 100% rename from Breaks6502/M6502Core/Scripts/VS2022/M6502Core.vcxproj.filters rename to Chips/M6502Core/Scripts/VS2022/M6502Core.vcxproj.filters diff --git a/Breaks6502/M6502Core/address_bus.cpp b/Chips/M6502Core/address_bus.cpp similarity index 100% rename from Breaks6502/M6502Core/address_bus.cpp rename to Chips/M6502Core/address_bus.cpp diff --git a/Breaks6502/M6502Core/address_bus.h b/Chips/M6502Core/address_bus.h similarity index 100% rename from Breaks6502/M6502Core/address_bus.h rename to Chips/M6502Core/address_bus.h diff --git a/Breaks6502/M6502Core/alu.cpp b/Chips/M6502Core/alu.cpp similarity index 100% rename from Breaks6502/M6502Core/alu.cpp rename to Chips/M6502Core/alu.cpp diff --git a/Breaks6502/M6502Core/alu.h b/Chips/M6502Core/alu.h similarity index 100% rename from Breaks6502/M6502Core/alu.h rename to Chips/M6502Core/alu.h diff --git a/Breaks6502/M6502Core/alu_control.cpp b/Chips/M6502Core/alu_control.cpp similarity index 100% rename from Breaks6502/M6502Core/alu_control.cpp rename to Chips/M6502Core/alu_control.cpp diff --git a/Breaks6502/M6502Core/alu_control.h b/Chips/M6502Core/alu_control.h similarity index 100% rename from Breaks6502/M6502Core/alu_control.h rename to Chips/M6502Core/alu_control.h diff --git a/Breaks6502/M6502Core/branch_logic.cpp b/Chips/M6502Core/branch_logic.cpp similarity index 100% rename from Breaks6502/M6502Core/branch_logic.cpp rename to Chips/M6502Core/branch_logic.cpp diff --git a/Breaks6502/M6502Core/branch_logic.h b/Chips/M6502Core/branch_logic.h similarity index 100% rename from Breaks6502/M6502Core/branch_logic.h rename to Chips/M6502Core/branch_logic.h diff --git a/Breaks6502/M6502Core/bus_control.cpp b/Chips/M6502Core/bus_control.cpp similarity index 100% rename from Breaks6502/M6502Core/bus_control.cpp rename to Chips/M6502Core/bus_control.cpp diff --git a/Breaks6502/M6502Core/bus_control.h b/Chips/M6502Core/bus_control.h similarity index 100% rename from Breaks6502/M6502Core/bus_control.h rename to Chips/M6502Core/bus_control.h diff --git a/Breaks6502/M6502Core/core.cpp b/Chips/M6502Core/core.cpp similarity index 100% rename from Breaks6502/M6502Core/core.cpp rename to Chips/M6502Core/core.cpp diff --git a/Breaks6502/M6502Core/core.h b/Chips/M6502Core/core.h similarity index 100% rename from Breaks6502/M6502Core/core.h rename to Chips/M6502Core/core.h diff --git a/Breaks6502/M6502Core/data_bus.cpp b/Chips/M6502Core/data_bus.cpp similarity index 100% rename from Breaks6502/M6502Core/data_bus.cpp rename to Chips/M6502Core/data_bus.cpp diff --git a/Breaks6502/M6502Core/data_bus.h b/Chips/M6502Core/data_bus.h similarity index 100% rename from Breaks6502/M6502Core/data_bus.h rename to Chips/M6502Core/data_bus.h diff --git a/Breaks6502/M6502Core/debug.cpp b/Chips/M6502Core/debug.cpp similarity index 100% rename from Breaks6502/M6502Core/debug.cpp rename to Chips/M6502Core/debug.cpp diff --git a/Breaks6502/M6502Core/debug.h b/Chips/M6502Core/debug.h similarity index 100% rename from Breaks6502/M6502Core/debug.h rename to Chips/M6502Core/debug.h diff --git a/Breaks6502/M6502Core/decoder.cpp b/Chips/M6502Core/decoder.cpp similarity index 100% rename from Breaks6502/M6502Core/decoder.cpp rename to Chips/M6502Core/decoder.cpp diff --git a/Breaks6502/M6502Core/decoder.h b/Chips/M6502Core/decoder.h similarity index 100% rename from Breaks6502/M6502Core/decoder.h rename to Chips/M6502Core/decoder.h diff --git a/Breaks6502/M6502Core/dispatch.cpp b/Chips/M6502Core/dispatch.cpp similarity index 100% rename from Breaks6502/M6502Core/dispatch.cpp rename to Chips/M6502Core/dispatch.cpp diff --git a/Breaks6502/M6502Core/dispatch.h b/Chips/M6502Core/dispatch.h similarity index 100% rename from Breaks6502/M6502Core/dispatch.h rename to Chips/M6502Core/dispatch.h diff --git a/Breaks6502/M6502Core/extra_counter.cpp b/Chips/M6502Core/extra_counter.cpp similarity index 100% rename from Breaks6502/M6502Core/extra_counter.cpp rename to Chips/M6502Core/extra_counter.cpp diff --git a/Breaks6502/M6502Core/extra_counter.h b/Chips/M6502Core/extra_counter.h similarity index 100% rename from Breaks6502/M6502Core/extra_counter.h rename to Chips/M6502Core/extra_counter.h diff --git a/Breaks6502/M6502Core/flags.cpp b/Chips/M6502Core/flags.cpp similarity index 100% rename from Breaks6502/M6502Core/flags.cpp rename to Chips/M6502Core/flags.cpp diff --git a/Breaks6502/M6502Core/flags.h b/Chips/M6502Core/flags.h similarity index 100% rename from Breaks6502/M6502Core/flags.h rename to Chips/M6502Core/flags.h diff --git a/Breaks6502/M6502Core/flags_control.cpp b/Chips/M6502Core/flags_control.cpp similarity index 100% rename from Breaks6502/M6502Core/flags_control.cpp rename to Chips/M6502Core/flags_control.cpp diff --git a/Breaks6502/M6502Core/flags_control.h b/Chips/M6502Core/flags_control.h similarity index 100% rename from Breaks6502/M6502Core/flags_control.h rename to Chips/M6502Core/flags_control.h diff --git a/Breaks6502/M6502Core/interrupts.cpp b/Chips/M6502Core/interrupts.cpp similarity index 100% rename from Breaks6502/M6502Core/interrupts.cpp rename to Chips/M6502Core/interrupts.cpp diff --git a/Breaks6502/M6502Core/interrupts.h b/Chips/M6502Core/interrupts.h similarity index 100% rename from Breaks6502/M6502Core/interrupts.h rename to Chips/M6502Core/interrupts.h diff --git a/Breaks6502/M6502Core/ir.cpp b/Chips/M6502Core/ir.cpp similarity index 100% rename from Breaks6502/M6502Core/ir.cpp rename to Chips/M6502Core/ir.cpp diff --git a/Breaks6502/M6502Core/ir.h b/Chips/M6502Core/ir.h similarity index 100% rename from Breaks6502/M6502Core/ir.h rename to Chips/M6502Core/ir.h diff --git a/Breaks6502/M6502Core/pc.cpp b/Chips/M6502Core/pc.cpp similarity index 100% rename from Breaks6502/M6502Core/pc.cpp rename to Chips/M6502Core/pc.cpp diff --git a/Breaks6502/M6502Core/pc.h b/Chips/M6502Core/pc.h similarity index 100% rename from Breaks6502/M6502Core/pc.h rename to Chips/M6502Core/pc.h diff --git a/Breaks6502/M6502Core/pc_control.cpp b/Chips/M6502Core/pc_control.cpp similarity index 100% rename from Breaks6502/M6502Core/pc_control.cpp rename to Chips/M6502Core/pc_control.cpp diff --git a/Breaks6502/M6502Core/pc_control.h b/Chips/M6502Core/pc_control.h similarity index 100% rename from Breaks6502/M6502Core/pc_control.h rename to Chips/M6502Core/pc_control.h diff --git a/Breaks6502/M6502Core/pch.cpp b/Chips/M6502Core/pch.cpp similarity index 100% rename from Breaks6502/M6502Core/pch.cpp rename to Chips/M6502Core/pch.cpp diff --git a/Breaks6502/M6502Core/pch.h b/Chips/M6502Core/pch.h similarity index 100% rename from Breaks6502/M6502Core/pch.h rename to Chips/M6502Core/pch.h diff --git a/Breaks6502/M6502Core/predecode.cpp b/Chips/M6502Core/predecode.cpp similarity index 100% rename from Breaks6502/M6502Core/predecode.cpp rename to Chips/M6502Core/predecode.cpp diff --git a/Breaks6502/M6502Core/predecode.h b/Chips/M6502Core/predecode.h similarity index 100% rename from Breaks6502/M6502Core/predecode.h rename to Chips/M6502Core/predecode.h diff --git a/Breaks6502/M6502Core/random_logic.cpp b/Chips/M6502Core/random_logic.cpp similarity index 100% rename from Breaks6502/M6502Core/random_logic.cpp rename to Chips/M6502Core/random_logic.cpp diff --git a/Breaks6502/M6502Core/random_logic.h b/Chips/M6502Core/random_logic.h similarity index 100% rename from Breaks6502/M6502Core/random_logic.h rename to Chips/M6502Core/random_logic.h diff --git a/Breaks6502/M6502Core/regs.cpp b/Chips/M6502Core/regs.cpp similarity index 100% rename from Breaks6502/M6502Core/regs.cpp rename to Chips/M6502Core/regs.cpp diff --git a/Breaks6502/M6502Core/regs.h b/Chips/M6502Core/regs.h similarity index 100% rename from Breaks6502/M6502Core/regs.h rename to Chips/M6502Core/regs.h diff --git a/Breaks6502/M6502Core/regs_control.cpp b/Chips/M6502Core/regs_control.cpp similarity index 100% rename from Breaks6502/M6502Core/regs_control.cpp rename to Chips/M6502Core/regs_control.cpp diff --git a/Breaks6502/M6502Core/regs_control.h b/Chips/M6502Core/regs_control.h similarity index 100% rename from Breaks6502/M6502Core/regs_control.h rename to Chips/M6502Core/regs_control.h diff --git a/Breaks6502/M6502Core/t1_ff.jpg b/Chips/M6502Core/t1_ff.jpg similarity index 100% rename from Breaks6502/M6502Core/t1_ff.jpg rename to Chips/M6502Core/t1_ff.jpg diff --git a/BreaksPPU/PPUSim/Readme.md b/Chips/PPUSim/Readme.md similarity index 100% rename from BreaksPPU/PPUSim/Readme.md rename to Chips/PPUSim/Readme.md diff --git a/BreaksPPU/PPUSim/Scripts/.gitignore b/Chips/PPUSim/Scripts/.gitignore similarity index 100% rename from BreaksPPU/PPUSim/Scripts/.gitignore rename to Chips/PPUSim/Scripts/.gitignore diff --git a/BreaksPPU/PPUSim/Scripts/VS2022/PPUSim.vcxproj b/Chips/PPUSim/Scripts/VS2022/PPUSim.vcxproj similarity index 100% rename from BreaksPPU/PPUSim/Scripts/VS2022/PPUSim.vcxproj rename to Chips/PPUSim/Scripts/VS2022/PPUSim.vcxproj diff --git a/BreaksPPU/PPUSim/Scripts/VS2022/PPUSim.vcxproj.filters b/Chips/PPUSim/Scripts/VS2022/PPUSim.vcxproj.filters similarity index 100% rename from BreaksPPU/PPUSim/Scripts/VS2022/PPUSim.vcxproj.filters rename to Chips/PPUSim/Scripts/VS2022/PPUSim.vcxproj.filters diff --git a/BreaksPPU/PPUSim/bgcol.cpp b/Chips/PPUSim/bgcol.cpp similarity index 100% rename from BreaksPPU/PPUSim/bgcol.cpp rename to Chips/PPUSim/bgcol.cpp diff --git a/BreaksPPU/PPUSim/bgcol.h b/Chips/PPUSim/bgcol.h similarity index 100% rename from BreaksPPU/PPUSim/bgcol.h rename to Chips/PPUSim/bgcol.h diff --git a/BreaksPPU/PPUSim/cram.cpp b/Chips/PPUSim/cram.cpp similarity index 100% rename from BreaksPPU/PPUSim/cram.cpp rename to Chips/PPUSim/cram.cpp diff --git a/BreaksPPU/PPUSim/cram.h b/Chips/PPUSim/cram.h similarity index 100% rename from BreaksPPU/PPUSim/cram.h rename to Chips/PPUSim/cram.h diff --git a/BreaksPPU/PPUSim/dataread.cpp b/Chips/PPUSim/dataread.cpp similarity index 100% rename from BreaksPPU/PPUSim/dataread.cpp rename to Chips/PPUSim/dataread.cpp diff --git a/BreaksPPU/PPUSim/dataread.h b/Chips/PPUSim/dataread.h similarity index 100% rename from BreaksPPU/PPUSim/dataread.h rename to Chips/PPUSim/dataread.h diff --git a/BreaksPPU/PPUSim/debug.cpp b/Chips/PPUSim/debug.cpp similarity index 100% rename from BreaksPPU/PPUSim/debug.cpp rename to Chips/PPUSim/debug.cpp diff --git a/BreaksPPU/PPUSim/debug.h b/Chips/PPUSim/debug.h similarity index 100% rename from BreaksPPU/PPUSim/debug.h rename to Chips/PPUSim/debug.h diff --git a/BreaksPPU/PPUSim/fifo.cpp b/Chips/PPUSim/fifo.cpp similarity index 100% rename from BreaksPPU/PPUSim/fifo.cpp rename to Chips/PPUSim/fifo.cpp diff --git a/BreaksPPU/PPUSim/fifo.h b/Chips/PPUSim/fifo.h similarity index 100% rename from BreaksPPU/PPUSim/fifo.h rename to Chips/PPUSim/fifo.h diff --git a/BreaksPPU/PPUSim/fsm.cpp b/Chips/PPUSim/fsm.cpp similarity index 100% rename from BreaksPPU/PPUSim/fsm.cpp rename to Chips/PPUSim/fsm.cpp diff --git a/BreaksPPU/PPUSim/fsm.h b/Chips/PPUSim/fsm.h similarity index 100% rename from BreaksPPU/PPUSim/fsm.h rename to Chips/PPUSim/fsm.h diff --git a/BreaksPPU/PPUSim/hv.cpp b/Chips/PPUSim/hv.cpp similarity index 100% rename from BreaksPPU/PPUSim/hv.cpp rename to Chips/PPUSim/hv.cpp diff --git a/BreaksPPU/PPUSim/hv.h b/Chips/PPUSim/hv.h similarity index 100% rename from BreaksPPU/PPUSim/hv.h rename to Chips/PPUSim/hv.h diff --git a/BreaksPPU/PPUSim/hv_decoder.cpp b/Chips/PPUSim/hv_decoder.cpp similarity index 100% rename from BreaksPPU/PPUSim/hv_decoder.cpp rename to Chips/PPUSim/hv_decoder.cpp diff --git a/BreaksPPU/PPUSim/hv_decoder.h b/Chips/PPUSim/hv_decoder.h similarity index 100% rename from BreaksPPU/PPUSim/hv_decoder.h rename to Chips/PPUSim/hv_decoder.h diff --git a/BreaksPPU/PPUSim/mux.cpp b/Chips/PPUSim/mux.cpp similarity index 100% rename from BreaksPPU/PPUSim/mux.cpp rename to Chips/PPUSim/mux.cpp diff --git a/BreaksPPU/PPUSim/mux.h b/Chips/PPUSim/mux.h similarity index 100% rename from BreaksPPU/PPUSim/mux.h rename to Chips/PPUSim/mux.h diff --git a/BreaksPPU/PPUSim/oam.cpp b/Chips/PPUSim/oam.cpp similarity index 100% rename from BreaksPPU/PPUSim/oam.cpp rename to Chips/PPUSim/oam.cpp diff --git a/BreaksPPU/PPUSim/oam.h b/Chips/PPUSim/oam.h similarity index 100% rename from BreaksPPU/PPUSim/oam.h rename to Chips/PPUSim/oam.h diff --git a/BreaksPPU/PPUSim/par.cpp b/Chips/PPUSim/par.cpp similarity index 100% rename from BreaksPPU/PPUSim/par.cpp rename to Chips/PPUSim/par.cpp diff --git a/BreaksPPU/PPUSim/par.h b/Chips/PPUSim/par.h similarity index 100% rename from BreaksPPU/PPUSim/par.h rename to Chips/PPUSim/par.h diff --git a/BreaksPPU/PPUSim/patgen.cpp b/Chips/PPUSim/patgen.cpp similarity index 100% rename from BreaksPPU/PPUSim/patgen.cpp rename to Chips/PPUSim/patgen.cpp diff --git a/BreaksPPU/PPUSim/patgen.h b/Chips/PPUSim/patgen.h similarity index 100% rename from BreaksPPU/PPUSim/patgen.h rename to Chips/PPUSim/patgen.h diff --git a/BreaksPPU/PPUSim/pch.cpp b/Chips/PPUSim/pch.cpp similarity index 100% rename from BreaksPPU/PPUSim/pch.cpp rename to Chips/PPUSim/pch.cpp diff --git a/BreaksPPU/PPUSim/pch.h b/Chips/PPUSim/pch.h similarity index 100% rename from BreaksPPU/PPUSim/pch.h rename to Chips/PPUSim/pch.h diff --git a/BreaksPPU/PPUSim/pclk.cpp b/Chips/PPUSim/pclk.cpp similarity index 100% rename from BreaksPPU/PPUSim/pclk.cpp rename to Chips/PPUSim/pclk.cpp diff --git a/BreaksPPU/PPUSim/ppu.cpp b/Chips/PPUSim/ppu.cpp similarity index 100% rename from BreaksPPU/PPUSim/ppu.cpp rename to Chips/PPUSim/ppu.cpp diff --git a/BreaksPPU/PPUSim/ppu.h b/Chips/PPUSim/ppu.h similarity index 100% rename from BreaksPPU/PPUSim/ppu.h rename to Chips/PPUSim/ppu.h diff --git a/BreaksPPU/PPUSim/ppu_layers.png b/Chips/PPUSim/ppu_layers.png similarity index 100% rename from BreaksPPU/PPUSim/ppu_layers.png rename to Chips/PPUSim/ppu_layers.png diff --git a/BreaksPPU/PPUSim/regs.cpp b/Chips/PPUSim/regs.cpp similarity index 100% rename from BreaksPPU/PPUSim/regs.cpp rename to Chips/PPUSim/regs.cpp diff --git a/BreaksPPU/PPUSim/regs.h b/Chips/PPUSim/regs.h similarity index 100% rename from BreaksPPU/PPUSim/regs.h rename to Chips/PPUSim/regs.h diff --git a/BreaksPPU/PPUSim/scroll_regs.cpp b/Chips/PPUSim/scroll_regs.cpp similarity index 100% rename from BreaksPPU/PPUSim/scroll_regs.cpp rename to Chips/PPUSim/scroll_regs.cpp diff --git a/BreaksPPU/PPUSim/scroll_regs.h b/Chips/PPUSim/scroll_regs.h similarity index 100% rename from BreaksPPU/PPUSim/scroll_regs.h rename to Chips/PPUSim/scroll_regs.h diff --git a/BreaksPPU/PPUSim/sprite_eval.cpp b/Chips/PPUSim/sprite_eval.cpp similarity index 100% rename from BreaksPPU/PPUSim/sprite_eval.cpp rename to Chips/PPUSim/sprite_eval.cpp diff --git a/BreaksPPU/PPUSim/sprite_eval.h b/Chips/PPUSim/sprite_eval.h similarity index 100% rename from BreaksPPU/PPUSim/sprite_eval.h rename to Chips/PPUSim/sprite_eval.h diff --git a/BreaksPPU/PPUSim/video_out.cpp b/Chips/PPUSim/video_out.cpp similarity index 100% rename from BreaksPPU/PPUSim/video_out.cpp rename to Chips/PPUSim/video_out.cpp diff --git a/BreaksPPU/PPUSim/video_out.h b/Chips/PPUSim/video_out.h similarity index 100% rename from BreaksPPU/PPUSim/video_out.h rename to Chips/PPUSim/video_out.h diff --git a/BreaksPPU/PPUSim/vram_ctrl.cpp b/Chips/PPUSim/vram_ctrl.cpp similarity index 100% rename from BreaksPPU/PPUSim/vram_ctrl.cpp rename to Chips/PPUSim/vram_ctrl.cpp diff --git a/BreaksPPU/PPUSim/vram_ctrl.h b/Chips/PPUSim/vram_ctrl.h similarity index 100% rename from BreaksPPU/PPUSim/vram_ctrl.h rename to Chips/PPUSim/vram_ctrl.h diff --git a/Chips/Readme.md b/Chips/Readme.md new file mode 100644 index 00000000..0ce9c057 --- /dev/null +++ b/Chips/Readme.md @@ -0,0 +1,3 @@ +# Chips + +This is where the functional simulators of large chips and cores are located. diff --git a/Common/BaseBoardLib/Readme.md b/Common/BaseBoardLib/Readme.md index 98f095a7..5b8c2cd9 100644 --- a/Common/BaseBoardLib/Readme.md +++ b/Common/BaseBoardLib/Readme.md @@ -3,3 +3,29 @@ This library contains components that are found on the simulated motherboards. These are not necessarily actual chips, they can be some special debugging components, e.g. Fake6502. + +## 40H368 - IO Binding + +![40H368](/Wiki/imgstore/40H368.jpg) + +An array of `notif0` elements (in Verilog terms) used to bind IO ports. The connection of external ports and CPU differs between Famicom/NES. + +## LS139 - Famicom/NES "North Bridge" + +![LS139](/Wiki/imgstore/LS139.jpg) + +This paired decoder is used to select the address space of the PPU register interface, internal S-RAM ("Work RAM"), or external ROM. + +The distinguishing feature is that the output from one half is fed to the same chip :-) + +## LS373 - PPU VRAM Address Latch + +![LS373](/Wiki/imgstore/LS373.jpg) + +Used for PPU Address/Data bus multiplexing. "Memorizes" the lower 8 bits of the PPU address bus when PPU ALE=1. + +## SRAM - Typical S-RAM from 90's + +![SRAM](/Wiki/imgstore/SRAM.jpg) + +Well, that's easy. diff --git a/Common/BaseBoardLib/pch.h b/Common/BaseBoardLib/pch.h index ec4df621..5007faec 100644 --- a/Common/BaseBoardLib/pch.h +++ b/Common/BaseBoardLib/pch.h @@ -6,7 +6,7 @@ #include #include "../BaseLogicLib/BaseLogic.h" -#include "../../Breaks6502/M6502Core/core.h" +#include "../../Chips/M6502Core/core.h" #include "LS139.h" #include "LS368.h" diff --git a/IO/Readme.md b/IO/Readme.md index 9a9f3cd5..26cd7363 100644 --- a/IO/Readme.md +++ b/IO/Readme.md @@ -45,7 +45,7 @@ Does not contain any IOState. ## Famicom Controller (Port1) -![famicom_controller1](/UserManual/imgstore/famicom_controller1.png) +![famicom_controller1](/Wiki/imgstore/famicom_controller1.png) DeviceID: 0x00000001 @@ -64,7 +64,7 @@ Although Famicom controllers are not removable, they can be detached inside the ## Famicom Controller (Port2) -![famicom_controller2](/UserManual/imgstore/famicom_controller2.png) +![famicom_controller2](/Wiki/imgstore/famicom_controller2.png) DeviceID: 0x00000002 @@ -83,7 +83,7 @@ Volume and mic level values are in the UInt8 range so far, we'll see how good th ## NES Controller (Port1/2) -![nes_controller](/UserManual/imgstore/nes_controller.png) +![nes_controller](/Wiki/imgstore/nes_controller.png) DeviceID: 0x00000003 @@ -100,7 +100,7 @@ DeviceID: 0x00000003 ## Dendy Turbo Controller (Port1/2) -![dendy_controller](/UserManual/imgstore/dendy_controller.png) +![dendy_controller](/Wiki/imgstore/dendy_controller.png) DeviceID: 0x00000004 @@ -119,7 +119,7 @@ DeviceID: 0x00000004 ## Virtual Famicom Controller (Port1) -![virt_famicom_controller1](/UserManual/imgstore/virt_famicom_controller1.png) +![virt_famicom_controller1](/Wiki/imgstore/virt_famicom_controller1.png) DeviceID: 0x00010001 @@ -136,7 +136,7 @@ DeviceID: 0x00010001 ## Virtual Famicom Controller (Port2) -![virt_famicom_controller2](/UserManual/imgstore/virt_famicom_controller2.png) +![virt_famicom_controller2](/Wiki/imgstore/virt_famicom_controller2.png) DeviceID: 0x00010002 @@ -153,7 +153,7 @@ DeviceID: 0x00010002 ## Virtual NES Controller (Port1/2) -![virt_nes_controller](/UserManual/imgstore/virt_nes_controller.png) +![virt_nes_controller](/Wiki/imgstore/virt_nes_controller.png) DeviceID: 0x00010003 @@ -170,7 +170,7 @@ DeviceID: 0x00010003 ## Virtual Dendy Turbo Controller (Port1/2) -![virt_dendy_controller](/UserManual/imgstore/virt_dendy_controller.png) +![virt_dendy_controller](/Wiki/imgstore/virt_dendy_controller.png) DeviceID: 0x00010004 diff --git a/IO/ReadmeRus.md b/IO/ReadmeRus.md index 471c8768..cef1e895 100644 --- a/IO/ReadmeRus.md +++ b/IO/ReadmeRus.md @@ -45,7 +45,7 @@ DeviceID: 0x00000000 ## Famicom Controller (Port1) -![famicom_controller1](/UserManual/imgstore/famicom_controller1.png) +![famicom_controller1](/Wiki/imgstore/famicom_controller1.png) DeviceID: 0x00000001 @@ -64,7 +64,7 @@ DeviceID: 0x00000001 ## Famicom Controller (Port2) -![famicom_controller2](/UserManual/imgstore/famicom_controller2.png) +![famicom_controller2](/Wiki/imgstore/famicom_controller2.png) DeviceID: 0x00000002 @@ -83,7 +83,7 @@ DeviceID: 0x00000002 ## NES Controller (Port1/2) -![nes_controller](/UserManual/imgstore/nes_controller.png) +![nes_controller](/Wiki/imgstore/nes_controller.png) DeviceID: 0x00000003 @@ -100,7 +100,7 @@ DeviceID: 0x00000003 ## Dendy Turbo Controller (Port1/2) -![dendy_controller](/UserManual/imgstore/dendy_controller.png) +![dendy_controller](/Wiki/imgstore/dendy_controller.png) DeviceID: 0x00000004 @@ -119,7 +119,7 @@ DeviceID: 0x00000004 ## Virtual Famicom Controller (Port1) -![virt_famicom_controller1](/UserManual/imgstore/virt_famicom_controller1.png) +![virt_famicom_controller1](/Wiki/imgstore/virt_famicom_controller1.png) DeviceID: 0x00010001 @@ -136,7 +136,7 @@ DeviceID: 0x00010001 ## Virtual Famicom Controller (Port2) -![virt_famicom_controller2](/UserManual/imgstore/virt_famicom_controller2.png) +![virt_famicom_controller2](/Wiki/imgstore/virt_famicom_controller2.png) DeviceID: 0x00010002 @@ -153,7 +153,7 @@ DeviceID: 0x00010002 ## Virtual NES Controller (Port1/2) -![virt_nes_controller](/UserManual/imgstore/virt_nes_controller.png) +![virt_nes_controller](/Wiki/imgstore/virt_nes_controller.png) DeviceID: 0x00010003 @@ -170,7 +170,7 @@ DeviceID: 0x00010003 ## Virtual Dendy Turbo Controller (Port1/2) -![virt_dendy_controller](/UserManual/imgstore/virt_dendy_controller.png) +![virt_dendy_controller](/Wiki/imgstore/virt_dendy_controller.png) DeviceID: 0x00010004 diff --git a/Mappers/Readme.md b/Mappers/Readme.md index 863675f7..e076738f 100644 --- a/Mappers/Readme.md +++ b/Mappers/Readme.md @@ -34,9 +34,8 @@ We have: - 6502 Emulator - 6502 firmware that simulates cartridge pin access and implements wild mapper logic -![mappers_ucode1](mappers_ucode1.png) - -![mappers_ucode2](mappers_ucode2.png) +|![mappers_ucode1](mappers_ucode1.png)|![mappers_ucode2](mappers_ucode2.png)| +|---|---| Of course, most of the mappers are easier to simulate in C++, but for universality, let's add the ability to write simulators of our own mappers. diff --git a/Mappers/Readme_ru.md b/Mappers/Readme_ru.md index 03d50277..f7f0fa99 100644 --- a/Mappers/Readme_ru.md +++ b/Mappers/Readme_ru.md @@ -34,9 +34,8 @@ NES/Famicom славится своим большим количеством м - Эмулятор 6502 - Микропрограмма на 6502, которая симулирует обращение к пинам картриджа и реализует логику "дикого" маппера -![mappers_ucode1](mappers_ucode1.png) - -![mappers_ucode2](mappers_ucode2.png) +|![mappers_ucode1](mappers_ucode1.png)|![mappers_ucode2](mappers_ucode2.png)| +|---|---| Конечно, большую часть мапперов проще симулировать на C++, но для универсальности добавим возможность написания симуляторов своих мапперов. diff --git a/Mappers/pch.h b/Mappers/pch.h index a43af46b..cd84fc27 100644 --- a/Mappers/pch.h +++ b/Mappers/pch.h @@ -9,8 +9,8 @@ #include "../Common/BaseLogicLib/BaseLogic.h" #include "../Breaknes/BreaksCore/DebugHub.h" -#include "../Breaks6502/M6502Core/core.h" -#include "../BreaksAPU/APUSim/apu.h" +#include "../Chips/M6502Core/core.h" +#include "../Chips/APUSim/apu.h" #include "../Common/BaseBoardLib/LS32.h" #include "../Common/BaseBoardLib/LS161.h" diff --git a/Readme.md b/Readme.md index 8668dede..665fcd40 100644 --- a/Readme.md +++ b/Readme.md @@ -1,11 +1,11 @@ -![logo](/UserManual/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.png) +![logo](/Wiki/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.png) NES/Famicom/Dendy emulator at the gate level. ## Progress -![progress](/UserManual/imgstore/progress.png) +![progress](/Wiki/imgstore/progress.png) ## Build for Windows diff --git a/BreaksAPU/APUPlayer/.gitignore b/Tools/APUPlayer/.gitignore similarity index 100% rename from BreaksAPU/APUPlayer/.gitignore rename to Tools/APUPlayer/.gitignore diff --git a/BreaksAPU/APUPlayer/APUPlayer.csproj b/Tools/APUPlayer/APUPlayer.csproj similarity index 100% rename from BreaksAPU/APUPlayer/APUPlayer.csproj rename to Tools/APUPlayer/APUPlayer.csproj diff --git a/BreaksAPU/APUPlayer/APUPlayer.csproj.user b/Tools/APUPlayer/APUPlayer.csproj.user similarity index 100% rename from BreaksAPU/APUPlayer/APUPlayer.csproj.user rename to Tools/APUPlayer/APUPlayer.csproj.user diff --git a/BreaksAPU/APUPlayer/APUPlayer.sln b/Tools/APUPlayer/APUPlayer.sln similarity index 97% rename from BreaksAPU/APUPlayer/APUPlayer.sln rename to Tools/APUPlayer/APUPlayer.sln index ff61293e..d9c7e770 100644 --- a/BreaksAPU/APUPlayer/APUPlayer.sln +++ b/Tools/APUPlayer/APUPlayer.sln @@ -7,9 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "APUPlayer", "APUPlayer.cspr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseLogicLib", "..\..\Common\BaseLogicLib\Scripts\VS2022\BaseLogicLib.vcxproj", "{11AAD192-46EB-4D5D-B81F-BCEE11D6AF8E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Breaks6502\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseBoardLib", "..\..\Common\BaseBoardLib\Scripts\VS2022\BaseBoardLib.vcxproj", "{36F535AD-B87B-4F4D-A5F9-0F2377FBA7EA}" EndProject @@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpTools", "..\..\Common\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BreaksCore", "..\..\Breaknes\BreaksCore\Scripts\VS2022\BreaksCore.vcxproj", "{88908FB4-0012-4533-BFFB-30AA9F72EBDC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\BreaksPPU\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonLib", "..\..\Common\JsonLib\Scripts\VS2022\JsonLib.vcxproj", "{8782459B-4E38-4227-AA98-6E7E8E06659C}" EndProject @@ -25,7 +25,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mappers", "..\..\Mappers\Sc EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Breaks Core", "Breaks Core", "{19CBF7A9-A823-49FB-94AE-AE1EE4BF4423}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FastAPU", "..\FastAPU\FastAPU.vcxproj", "{2C9982F5-51F1-4BDA-B331-C88690CC3BEE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FastAPU", "..\..\Chips\FastAPU\FastAPU.vcxproj", "{2C9982F5-51F1-4BDA-B331-C88690CC3BEE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IO", "..\..\IO\Scripts\VS2022\IO.vcxproj", "{AC032844-AE3A-4224-B6CE-451C5DBE80B9}" EndProject diff --git a/BreaksAPU/APUPlayer/App.config b/Tools/APUPlayer/App.config similarity index 100% rename from BreaksAPU/APUPlayer/App.config rename to Tools/APUPlayer/App.config diff --git a/BreaksAPU/APUPlayer/Build/.gitignore b/Tools/APUPlayer/Build/.gitignore similarity index 100% rename from BreaksAPU/APUPlayer/Build/.gitignore rename to Tools/APUPlayer/Build/.gitignore diff --git a/BreaksAPU/APUPlayer/Build/Readme.md b/Tools/APUPlayer/Build/Readme.md similarity index 100% rename from BreaksAPU/APUPlayer/Build/Readme.md rename to Tools/APUPlayer/Build/Readme.md diff --git a/BreaksAPU/APUPlayer/FormAbout.Designer.cs b/Tools/APUPlayer/FormAbout.Designer.cs similarity index 100% rename from BreaksAPU/APUPlayer/FormAbout.Designer.cs rename to Tools/APUPlayer/FormAbout.Designer.cs diff --git a/BreaksAPU/APUPlayer/FormAbout.cs b/Tools/APUPlayer/FormAbout.cs similarity index 100% rename from BreaksAPU/APUPlayer/FormAbout.cs rename to Tools/APUPlayer/FormAbout.cs diff --git a/BreaksAPU/APUPlayer/FormAbout.resx b/Tools/APUPlayer/FormAbout.resx similarity index 100% rename from BreaksAPU/APUPlayer/FormAbout.resx rename to Tools/APUPlayer/FormAbout.resx diff --git a/BreaksAPU/APUPlayer/FormMain.Designer.cs b/Tools/APUPlayer/FormMain.Designer.cs similarity index 100% rename from BreaksAPU/APUPlayer/FormMain.Designer.cs rename to Tools/APUPlayer/FormMain.Designer.cs diff --git a/BreaksAPU/APUPlayer/FormMain.cs b/Tools/APUPlayer/FormMain.cs similarity index 100% rename from BreaksAPU/APUPlayer/FormMain.cs rename to Tools/APUPlayer/FormMain.cs diff --git a/BreaksAPU/APUPlayer/FormMain.resx b/Tools/APUPlayer/FormMain.resx similarity index 100% rename from BreaksAPU/APUPlayer/FormMain.resx rename to Tools/APUPlayer/FormMain.resx diff --git a/BreaksAPU/APUPlayer/FormMainWorker.cs b/Tools/APUPlayer/FormMainWorker.cs similarity index 100% rename from BreaksAPU/APUPlayer/FormMainWorker.cs rename to Tools/APUPlayer/FormMainWorker.cs diff --git a/BreaksAPU/APUPlayer/FormSettings.Designer.cs b/Tools/APUPlayer/FormSettings.Designer.cs similarity index 100% rename from BreaksAPU/APUPlayer/FormSettings.Designer.cs rename to Tools/APUPlayer/FormSettings.Designer.cs diff --git a/BreaksAPU/APUPlayer/FormSettings.cs b/Tools/APUPlayer/FormSettings.cs similarity index 100% rename from BreaksAPU/APUPlayer/FormSettings.cs rename to Tools/APUPlayer/FormSettings.cs diff --git a/BreaksAPU/APUPlayer/FormSettings.resx b/Tools/APUPlayer/FormSettings.resx similarity index 100% rename from BreaksAPU/APUPlayer/FormSettings.resx rename to Tools/APUPlayer/FormSettings.resx diff --git a/BreaksAPU/APUPlayer/FormSnatch.Designer.cs b/Tools/APUPlayer/FormSnatch.Designer.cs similarity index 100% rename from BreaksAPU/APUPlayer/FormSnatch.Designer.cs rename to Tools/APUPlayer/FormSnatch.Designer.cs diff --git a/BreaksAPU/APUPlayer/FormSnatch.cs b/Tools/APUPlayer/FormSnatch.cs similarity index 100% rename from BreaksAPU/APUPlayer/FormSnatch.cs rename to Tools/APUPlayer/FormSnatch.cs diff --git a/BreaksAPU/APUPlayer/FormSnatch.resx b/Tools/APUPlayer/FormSnatch.resx similarity index 100% rename from BreaksAPU/APUPlayer/FormSnatch.resx rename to Tools/APUPlayer/FormSnatch.resx diff --git a/BreaksAPU/APUPlayer/Program.cs b/Tools/APUPlayer/Program.cs similarity index 100% rename from BreaksAPU/APUPlayer/Program.cs rename to Tools/APUPlayer/Program.cs diff --git a/BreaksAPU/APUPlayer/Properties/Resources.Designer.cs b/Tools/APUPlayer/Properties/Resources.Designer.cs similarity index 100% rename from BreaksAPU/APUPlayer/Properties/Resources.Designer.cs rename to Tools/APUPlayer/Properties/Resources.Designer.cs diff --git a/BreaksAPU/APUPlayer/Properties/Resources.resx b/Tools/APUPlayer/Properties/Resources.resx similarity index 100% rename from BreaksAPU/APUPlayer/Properties/Resources.resx rename to Tools/APUPlayer/Properties/Resources.resx diff --git a/BreaksAPU/APUPlayer/Properties/Settings.Designer.cs b/Tools/APUPlayer/Properties/Settings.Designer.cs similarity index 100% rename from BreaksAPU/APUPlayer/Properties/Settings.Designer.cs rename to Tools/APUPlayer/Properties/Settings.Designer.cs diff --git a/BreaksAPU/APUPlayer/Properties/Settings.settings b/Tools/APUPlayer/Properties/Settings.settings similarity index 100% rename from BreaksAPU/APUPlayer/Properties/Settings.settings rename to Tools/APUPlayer/Properties/Settings.settings diff --git a/BreaksAPU/APUPlayer/Properties/launchSettings.json b/Tools/APUPlayer/Properties/launchSettings.json similarity index 100% rename from BreaksAPU/APUPlayer/Properties/launchSettings.json rename to Tools/APUPlayer/Properties/launchSettings.json diff --git a/BreaksAPU/APUPlayer/Readme.md b/Tools/APUPlayer/Readme.md similarity index 100% rename from BreaksAPU/APUPlayer/Readme.md rename to Tools/APUPlayer/Readme.md diff --git a/BreaksAPU/APUPlayer/WavesSupport.cs b/Tools/APUPlayer/WavesSupport.cs similarity index 100% rename from BreaksAPU/APUPlayer/WavesSupport.cs rename to Tools/APUPlayer/WavesSupport.cs diff --git a/BreaksAPU/APUPlayer/button_get_debug.png b/Tools/APUPlayer/button_get_debug.png similarity index 100% rename from BreaksAPU/APUPlayer/button_get_debug.png rename to Tools/APUPlayer/button_get_debug.png diff --git a/BreaksAPU/APUPlayer/waves.png b/Tools/APUPlayer/waves.png similarity index 100% rename from BreaksAPU/APUPlayer/waves.png rename to Tools/APUPlayer/waves.png diff --git a/Demos/ApuPumpkin/.gitignore b/Tools/ApuPumpkin/.gitignore similarity index 100% rename from Demos/ApuPumpkin/.gitignore rename to Tools/ApuPumpkin/.gitignore diff --git a/Demos/ApuPumpkin/ApuPumpkin.cpp b/Tools/ApuPumpkin/ApuPumpkin.cpp similarity index 100% rename from Demos/ApuPumpkin/ApuPumpkin.cpp rename to Tools/ApuPumpkin/ApuPumpkin.cpp diff --git a/Demos/ApuPumpkin/ApuPumpkin.sln b/Tools/ApuPumpkin/ApuPumpkin.sln similarity index 93% rename from Demos/ApuPumpkin/ApuPumpkin.sln rename to Tools/ApuPumpkin/ApuPumpkin.sln index 511779f0..6546353f 100644 --- a/Demos/ApuPumpkin/ApuPumpkin.sln +++ b/Tools/ApuPumpkin/ApuPumpkin.sln @@ -7,11 +7,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApuPumpkin", "ApuPumpkin.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseLogicLib", "..\..\Common\BaseLogicLib\Scripts\VS2022\BaseLogicLib.vcxproj", "{11AAD192-46EB-4D5D-B81F-BCEE11D6AF8E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Breaks6502\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\BreaksAPU\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FastAPU", "..\..\BreaksAPU\FastAPU\FastAPU.vcxproj", "{2C9982F5-51F1-4BDA-B331-C88690CC3BEE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FastAPU", "..\..\Chips\FastAPU\FastAPU.vcxproj", "{2C9982F5-51F1-4BDA-B331-C88690CC3BEE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Demos/ApuPumpkin/ApuPumpkin.vcxproj b/Tools/ApuPumpkin/ApuPumpkin.vcxproj similarity index 97% rename from Demos/ApuPumpkin/ApuPumpkin.vcxproj rename to Tools/ApuPumpkin/ApuPumpkin.vcxproj index 0ff0fa43..437707f9 100644 --- a/Demos/ApuPumpkin/ApuPumpkin.vcxproj +++ b/Tools/ApuPumpkin/ApuPumpkin.vcxproj @@ -154,13 +154,13 @@ - + {75210c0a-a812-4246-a179-b50d8a25a121} - + {50e93d78-36dc-46c3-82ea-cab373e18729} - + {2c9982f5-51f1-4bda-b331-c88690cc3bee} diff --git a/Demos/ApuPumpkin/ApuPumpkin.vcxproj.filters b/Tools/ApuPumpkin/ApuPumpkin.vcxproj.filters similarity index 100% rename from Demos/ApuPumpkin/ApuPumpkin.vcxproj.filters rename to Tools/ApuPumpkin/ApuPumpkin.vcxproj.filters diff --git a/Demos/ApuPumpkin/Readme.md b/Tools/ApuPumpkin/Readme.md similarity index 100% rename from Demos/ApuPumpkin/Readme.md rename to Tools/ApuPumpkin/Readme.md diff --git a/BreaksAPU/FastAPU/pch.cpp b/Tools/ApuPumpkin/pch.cpp similarity index 100% rename from BreaksAPU/FastAPU/pch.cpp rename to Tools/ApuPumpkin/pch.cpp diff --git a/Demos/ApuPumpkin/pch.h b/Tools/ApuPumpkin/pch.h similarity index 60% rename from Demos/ApuPumpkin/pch.h rename to Tools/ApuPumpkin/pch.h index 85ba9ffa..929106df 100644 --- a/Demos/ApuPumpkin/pch.h +++ b/Tools/ApuPumpkin/pch.h @@ -1,6 +1,6 @@ #pragma once -#define FAST_APU 1 +#define FAST_APU 0 #include #include @@ -11,10 +11,10 @@ #include #include "../../Common/BaseLogicLib/BaseLogic.h" -#include "../../Breaks6502/M6502Core/core.h" +#include "../../Chips/M6502Core/core.h" #if FAST_APU -#include "../../BreaksAPU/FastAPU/apu.h" +#include "../../Chips/FastAPU/apu.h" #else -#include "../../BreaksAPU/APUSim/apu.h" +#include "../../Chips/APUSim/apu.h" #endif diff --git a/Breaks6502/Breakasm/.gitignore b/Tools/Breakasm/.gitignore similarity index 100% rename from Breaks6502/Breakasm/.gitignore rename to Tools/Breakasm/.gitignore diff --git a/Breaks6502/Breakasm/ASM.cpp b/Tools/Breakasm/ASM.cpp similarity index 100% rename from Breaks6502/Breakasm/ASM.cpp rename to Tools/Breakasm/ASM.cpp diff --git a/Breaks6502/Breakasm/ASM.h b/Tools/Breakasm/ASM.h similarity index 100% rename from Breaks6502/Breakasm/ASM.h rename to Tools/Breakasm/ASM.h diff --git a/Breaks6502/Breakasm/ASMOPS.cpp b/Tools/Breakasm/ASMOPS.cpp similarity index 100% rename from Breaks6502/Breakasm/ASMOPS.cpp rename to Tools/Breakasm/ASMOPS.cpp diff --git a/Breaks6502/Breakasm/ASMOPS.h b/Tools/Breakasm/ASMOPS.h similarity index 100% rename from Breaks6502/Breakasm/ASMOPS.h rename to Tools/Breakasm/ASMOPS.h diff --git a/Breaks6502/Breakasm/CMakeLists.txt b/Tools/Breakasm/CMakeLists.txt similarity index 100% rename from Breaks6502/Breakasm/CMakeLists.txt rename to Tools/Breakasm/CMakeLists.txt diff --git a/Breaks6502/Breakasm/Readme.md b/Tools/Breakasm/Readme.md similarity index 100% rename from Breaks6502/Breakasm/Readme.md rename to Tools/Breakasm/Readme.md diff --git a/Breaks6502/Breakasm/ReadmeRus.md b/Tools/Breakasm/ReadmeRus.md similarity index 100% rename from Breaks6502/Breakasm/ReadmeRus.md rename to Tools/Breakasm/ReadmeRus.md diff --git a/Breaks6502/Breakasm/Scripts/VS2022/Breakasm.sln b/Tools/Breakasm/Scripts/VS2022/Breakasm.sln similarity index 100% rename from Breaks6502/Breakasm/Scripts/VS2022/Breakasm.sln rename to Tools/Breakasm/Scripts/VS2022/Breakasm.sln diff --git a/Breaks6502/Breakasm/Scripts/VS2022/Breakasm.vcxproj b/Tools/Breakasm/Scripts/VS2022/Breakasm.vcxproj similarity index 100% rename from Breaks6502/Breakasm/Scripts/VS2022/Breakasm.vcxproj rename to Tools/Breakasm/Scripts/VS2022/Breakasm.vcxproj diff --git a/Breaks6502/Breakasm/Scripts/VS2022/Breakasm.vcxproj.filters b/Tools/Breakasm/Scripts/VS2022/Breakasm.vcxproj.filters similarity index 100% rename from Breaks6502/Breakasm/Scripts/VS2022/Breakasm.vcxproj.filters rename to Tools/Breakasm/Scripts/VS2022/Breakasm.vcxproj.filters diff --git a/Breaks6502/Breakasm/Test.asm b/Tools/Breakasm/Test.asm similarity index 100% rename from Breaks6502/Breakasm/Test.asm rename to Tools/Breakasm/Test.asm diff --git a/Breaks6502/Breakasm/TestAll.asm b/Tools/Breakasm/TestAll.asm similarity index 100% rename from Breaks6502/Breakasm/TestAll.asm rename to Tools/Breakasm/TestAll.asm diff --git a/Breaks6502/Breakasm/main.cpp b/Tools/Breakasm/main.cpp similarity index 100% rename from Breaks6502/Breakasm/main.cpp rename to Tools/Breakasm/main.cpp diff --git a/Demos/ApuPumpkin/pch.cpp b/Tools/Breakasm/pch.cpp similarity index 100% rename from Demos/ApuPumpkin/pch.cpp rename to Tools/Breakasm/pch.cpp diff --git a/Breaks6502/Breakasm/pch.h b/Tools/Breakasm/pch.h similarity index 100% rename from Breaks6502/Breakasm/pch.h rename to Tools/Breakasm/pch.h diff --git a/Breaks6502/BreaksDebug/.gitignore b/Tools/BreaksDebug/.gitignore similarity index 100% rename from Breaks6502/BreaksDebug/.gitignore rename to Tools/BreaksDebug/.gitignore diff --git a/Breaks6502/BreaksDebug/App.config b/Tools/BreaksDebug/App.config similarity index 100% rename from Breaks6502/BreaksDebug/App.config rename to Tools/BreaksDebug/App.config diff --git a/Breaks6502/BreaksDebug/BreaksDebug.csproj b/Tools/BreaksDebug/BreaksDebug.csproj similarity index 100% rename from Breaks6502/BreaksDebug/BreaksDebug.csproj rename to Tools/BreaksDebug/BreaksDebug.csproj diff --git a/Breaks6502/BreaksDebug/BreaksDebug.csproj.user b/Tools/BreaksDebug/BreaksDebug.csproj.user similarity index 100% rename from Breaks6502/BreaksDebug/BreaksDebug.csproj.user rename to Tools/BreaksDebug/BreaksDebug.csproj.user diff --git a/Breaks6502/BreaksDebug/BreaksDebug.sln b/Tools/BreaksDebug/BreaksDebug.sln similarity index 97% rename from Breaks6502/BreaksDebug/BreaksDebug.sln rename to Tools/BreaksDebug/BreaksDebug.sln index ddc79a00..5cdc47ad 100644 --- a/Breaks6502/BreaksDebug/BreaksDebug.sln +++ b/Tools/BreaksDebug/BreaksDebug.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32319.34 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BreaksDebug", "BreaksDebug.csproj", "{F609D0B4-2EB2-491C-BE8F-E2B5D65ECDA4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseLogicLib", "..\..\Common\BaseLogicLib\Scripts\VS2022\BaseLogicLib.vcxproj", "{11AAD192-46EB-4D5D-B81F-BCEE11D6AF8E}" EndProject @@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpTools", "..\..\Common\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BreaksCore", "..\..\Breaknes\BreaksCore\Scripts\VS2022\BreaksCore.vcxproj", "{88908FB4-0012-4533-BFFB-30AA9F72EBDC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\BreaksPPU\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonLib", "..\..\Common\JsonLib\Scripts\VS2022\JsonLib.vcxproj", "{8782459B-4E38-4227-AA98-6E7E8E06659C}" EndProject @@ -21,7 +21,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mappers", "..\..\Mappers\Sc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseBoardLib", "..\..\Common\BaseBoardLib\Scripts\VS2022\BaseBoardLib.vcxproj", "{36F535AD-B87B-4F4D-A5F9-0F2377FBA7EA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\BreaksAPU\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BreaksCore Libs", "BreaksCore Libs", "{E71BE94D-A2B9-4175-B510-261ACD5576A7}" EndProject diff --git a/Breaks6502/BreaksDebug/Build/Test.asm b/Tools/BreaksDebug/Build/Test.asm similarity index 100% rename from Breaks6502/BreaksDebug/Build/Test.asm rename to Tools/BreaksDebug/Build/Test.asm diff --git a/Breaks6502/BreaksDebug/Build/Test.json b/Tools/BreaksDebug/Build/Test.json similarity index 100% rename from Breaks6502/BreaksDebug/Build/Test.json rename to Tools/BreaksDebug/Build/Test.json diff --git a/Breaks6502/BreaksDebug/Build/TestIllegal.asm b/Tools/BreaksDebug/Build/TestIllegal.asm similarity index 100% rename from Breaks6502/BreaksDebug/Build/TestIllegal.asm rename to Tools/BreaksDebug/Build/TestIllegal.asm diff --git a/Breaks6502/BreaksDebug/Build/TestRora.asm b/Tools/BreaksDebug/Build/TestRora.asm similarity index 100% rename from Breaks6502/BreaksDebug/Build/TestRora.asm rename to Tools/BreaksDebug/Build/TestRora.asm diff --git a/Breaks6502/BreaksDebug/Build/Visual6502.asm b/Tools/BreaksDebug/Build/Visual6502.asm similarity index 100% rename from Breaks6502/BreaksDebug/Build/Visual6502.asm rename to Tools/BreaksDebug/Build/Visual6502.asm diff --git a/Breaks6502/BreaksDebug/DumpMarkdown.cs b/Tools/BreaksDebug/DumpMarkdown.cs similarity index 100% rename from Breaks6502/BreaksDebug/DumpMarkdown.cs rename to Tools/BreaksDebug/DumpMarkdown.cs diff --git a/Breaks6502/BreaksDebug/FormAbout.Designer.cs b/Tools/BreaksDebug/FormAbout.Designer.cs similarity index 100% rename from Breaks6502/BreaksDebug/FormAbout.Designer.cs rename to Tools/BreaksDebug/FormAbout.Designer.cs diff --git a/Breaks6502/BreaksDebug/FormAbout.cs b/Tools/BreaksDebug/FormAbout.cs similarity index 100% rename from Breaks6502/BreaksDebug/FormAbout.cs rename to Tools/BreaksDebug/FormAbout.cs diff --git a/Breaks6502/BreaksDebug/FormAbout.resx b/Tools/BreaksDebug/FormAbout.resx similarity index 100% rename from Breaks6502/BreaksDebug/FormAbout.resx rename to Tools/BreaksDebug/FormAbout.resx diff --git a/Breaks6502/BreaksDebug/FormMain.Designer.cs b/Tools/BreaksDebug/FormMain.Designer.cs similarity index 100% rename from Breaks6502/BreaksDebug/FormMain.Designer.cs rename to Tools/BreaksDebug/FormMain.Designer.cs diff --git a/Breaks6502/BreaksDebug/FormMain.cs b/Tools/BreaksDebug/FormMain.cs similarity index 100% rename from Breaks6502/BreaksDebug/FormMain.cs rename to Tools/BreaksDebug/FormMain.cs diff --git a/Breaks6502/BreaksDebug/FormMain.resx b/Tools/BreaksDebug/FormMain.resx similarity index 100% rename from Breaks6502/BreaksDebug/FormMain.resx rename to Tools/BreaksDebug/FormMain.resx diff --git a/Breaks6502/BreaksDebug/Program.cs b/Tools/BreaksDebug/Program.cs similarity index 100% rename from Breaks6502/BreaksDebug/Program.cs rename to Tools/BreaksDebug/Program.cs diff --git a/Breaks6502/BreaksDebug/Properties/AssemblyInfo.cs b/Tools/BreaksDebug/Properties/AssemblyInfo.cs similarity index 100% rename from Breaks6502/BreaksDebug/Properties/AssemblyInfo.cs rename to Tools/BreaksDebug/Properties/AssemblyInfo.cs diff --git a/Breaks6502/BreaksDebug/Properties/Resources.Designer.cs b/Tools/BreaksDebug/Properties/Resources.Designer.cs similarity index 100% rename from Breaks6502/BreaksDebug/Properties/Resources.Designer.cs rename to Tools/BreaksDebug/Properties/Resources.Designer.cs diff --git a/Breaks6502/BreaksDebug/Properties/Resources.resx b/Tools/BreaksDebug/Properties/Resources.resx similarity index 100% rename from Breaks6502/BreaksDebug/Properties/Resources.resx rename to Tools/BreaksDebug/Properties/Resources.resx diff --git a/Breaks6502/BreaksDebug/Properties/Settings.Designer.cs b/Tools/BreaksDebug/Properties/Settings.Designer.cs similarity index 100% rename from Breaks6502/BreaksDebug/Properties/Settings.Designer.cs rename to Tools/BreaksDebug/Properties/Settings.Designer.cs diff --git a/Breaks6502/BreaksDebug/Properties/Settings.settings b/Tools/BreaksDebug/Properties/Settings.settings similarity index 100% rename from Breaks6502/BreaksDebug/Properties/Settings.settings rename to Tools/BreaksDebug/Properties/Settings.settings diff --git a/Breaks6502/BreaksDebug/Properties/launchSettings.json b/Tools/BreaksDebug/Properties/launchSettings.json similarity index 100% rename from Breaks6502/BreaksDebug/Properties/launchSettings.json rename to Tools/BreaksDebug/Properties/launchSettings.json diff --git a/Breaks6502/BreaksDebug/QuickDisasm.cs b/Tools/BreaksDebug/QuickDisasm.cs similarity index 100% rename from Breaks6502/BreaksDebug/QuickDisasm.cs rename to Tools/BreaksDebug/QuickDisasm.cs diff --git a/Breaks6502/BreaksDebug/Readme.md b/Tools/BreaksDebug/Readme.md similarity index 98% rename from Breaks6502/BreaksDebug/Readme.md rename to Tools/BreaksDebug/Readme.md index 5177db31..cf982b73 100644 --- a/Breaks6502/BreaksDebug/Readme.md +++ b/Tools/BreaksDebug/Readme.md @@ -63,7 +63,7 @@ About that: |ADL|0x0E| |ADH|0xC0| -![20_JSR_T1_PHI1](/UserManual/imgstore/20_JSR_T1_PHI1.jpg) +![20_JSR_T1_PHI1](/Wiki/imgstore/20_JSR_T1_PHI1.jpg) ## UnitTest diff --git a/Breaks6502/BreaksDebug/UnitTest.cs b/Tools/BreaksDebug/UnitTest.cs similarity index 100% rename from Breaks6502/BreaksDebug/UnitTest.cs rename to Tools/BreaksDebug/UnitTest.cs diff --git a/Breaks6502/BreaksDebug/WavesSupport.cs b/Tools/BreaksDebug/WavesSupport.cs similarity index 100% rename from Breaks6502/BreaksDebug/WavesSupport.cs rename to Tools/BreaksDebug/WavesSupport.cs diff --git a/Breaks6502/BreaksDebug/concept.jpg b/Tools/BreaksDebug/concept.jpg similarity index 100% rename from Breaks6502/BreaksDebug/concept.jpg rename to Tools/BreaksDebug/concept.jpg diff --git a/Breaks6502/BreaksDebug/hand-holding-hammer-icon-png.ico b/Tools/BreaksDebug/hand-holding-hammer-icon-png.ico similarity index 100% rename from Breaks6502/BreaksDebug/hand-holding-hammer-icon-png.ico rename to Tools/BreaksDebug/hand-holding-hammer-icon-png.ico diff --git a/Breaks6502/BreaksDebug/step.png b/Tools/BreaksDebug/step.png similarity index 100% rename from Breaks6502/BreaksDebug/step.png rename to Tools/BreaksDebug/step.png diff --git a/Demos/DumpRegdump/.gitignore b/Tools/DumpRegdump/.gitignore similarity index 100% rename from Demos/DumpRegdump/.gitignore rename to Tools/DumpRegdump/.gitignore diff --git a/Demos/DumpRegdump/DumpRegdump.py b/Tools/DumpRegdump/DumpRegdump.py similarity index 100% rename from Demos/DumpRegdump/DumpRegdump.py rename to Tools/DumpRegdump/DumpRegdump.py diff --git a/Demos/FurryPlotDemo/.gitignore b/Tools/FurryPlotDemo/.gitignore similarity index 100% rename from Demos/FurryPlotDemo/.gitignore rename to Tools/FurryPlotDemo/.gitignore diff --git a/Demos/FurryPlotDemo/FormMain.Designer.cs b/Tools/FurryPlotDemo/FormMain.Designer.cs similarity index 100% rename from Demos/FurryPlotDemo/FormMain.Designer.cs rename to Tools/FurryPlotDemo/FormMain.Designer.cs diff --git a/Demos/FurryPlotDemo/FormMain.cs b/Tools/FurryPlotDemo/FormMain.cs similarity index 100% rename from Demos/FurryPlotDemo/FormMain.cs rename to Tools/FurryPlotDemo/FormMain.cs diff --git a/Demos/FurryPlotDemo/FormMain.resx b/Tools/FurryPlotDemo/FormMain.resx similarity index 100% rename from Demos/FurryPlotDemo/FormMain.resx rename to Tools/FurryPlotDemo/FormMain.resx diff --git a/Demos/FurryPlotDemo/FurryPlotControl.cs b/Tools/FurryPlotDemo/FurryPlotControl.cs similarity index 100% rename from Demos/FurryPlotDemo/FurryPlotControl.cs rename to Tools/FurryPlotDemo/FurryPlotControl.cs diff --git a/Demos/FurryPlotDemo/FurryPlotDemo.csproj b/Tools/FurryPlotDemo/FurryPlotDemo.csproj similarity index 100% rename from Demos/FurryPlotDemo/FurryPlotDemo.csproj rename to Tools/FurryPlotDemo/FurryPlotDemo.csproj diff --git a/Demos/FurryPlotDemo/FurryPlotDemo.sln b/Tools/FurryPlotDemo/FurryPlotDemo.sln similarity index 100% rename from Demos/FurryPlotDemo/FurryPlotDemo.sln rename to Tools/FurryPlotDemo/FurryPlotDemo.sln diff --git a/Demos/FurryPlotDemo/Program.cs b/Tools/FurryPlotDemo/Program.cs similarity index 100% rename from Demos/FurryPlotDemo/Program.cs rename to Tools/FurryPlotDemo/Program.cs diff --git a/Demos/InfernoColormap/.gitignore b/Tools/InfernoColormap/.gitignore similarity index 100% rename from Demos/InfernoColormap/.gitignore rename to Tools/InfernoColormap/.gitignore diff --git a/Demos/InfernoColormap/FormMain.Designer.cs b/Tools/InfernoColormap/FormMain.Designer.cs similarity index 100% rename from Demos/InfernoColormap/FormMain.Designer.cs rename to Tools/InfernoColormap/FormMain.Designer.cs diff --git a/Demos/InfernoColormap/FormMain.cs b/Tools/InfernoColormap/FormMain.cs similarity index 100% rename from Demos/InfernoColormap/FormMain.cs rename to Tools/InfernoColormap/FormMain.cs diff --git a/Demos/InfernoColormap/FormMain.resx b/Tools/InfernoColormap/FormMain.resx similarity index 100% rename from Demos/InfernoColormap/FormMain.resx rename to Tools/InfernoColormap/FormMain.resx diff --git a/Demos/InfernoColormap/InfernoColormap.cs b/Tools/InfernoColormap/InfernoColormap.cs similarity index 100% rename from Demos/InfernoColormap/InfernoColormap.cs rename to Tools/InfernoColormap/InfernoColormap.cs diff --git a/Demos/InfernoColormap/InfernoColormap.csproj b/Tools/InfernoColormap/InfernoColormap.csproj similarity index 100% rename from Demos/InfernoColormap/InfernoColormap.csproj rename to Tools/InfernoColormap/InfernoColormap.csproj diff --git a/Demos/InfernoColormap/InfernoColormap.sln b/Tools/InfernoColormap/InfernoColormap.sln similarity index 100% rename from Demos/InfernoColormap/InfernoColormap.sln rename to Tools/InfernoColormap/InfernoColormap.sln diff --git a/Demos/InfernoColormap/Program.cs b/Tools/InfernoColormap/Program.cs similarity index 100% rename from Demos/InfernoColormap/Program.cs rename to Tools/InfernoColormap/Program.cs diff --git a/Demos/InfernoColormap/Readme.md b/Tools/InfernoColormap/Readme.md similarity index 80% rename from Demos/InfernoColormap/Readme.md rename to Tools/InfernoColormap/Readme.md index 20a1e4f2..a7db08a7 100644 --- a/Demos/InfernoColormap/Readme.md +++ b/Tools/InfernoColormap/Readme.md @@ -1,6 +1,6 @@ # InfernoColormap -![InfernoColormap](/UserManual/imgstore/InfernoColormap.png) +![InfernoColormap](/Wiki/imgstore/InfernoColormap.png) Demo to test the inferno palette from Matplotlib (https://matplotlib.org/stable/gallery/color/colormap_reference.html#sphx-glr-gallery-color-colormap-reference-py) diff --git a/BreaksPPU/PPUPlayer/.gitignore b/Tools/PPUPlayer/.gitignore similarity index 100% rename from BreaksPPU/PPUPlayer/.gitignore rename to Tools/PPUPlayer/.gitignore diff --git a/BreaksPPU/PPUPlayer/Build/.gitignore b/Tools/PPUPlayer/Build/.gitignore similarity index 100% rename from BreaksPPU/PPUPlayer/Build/.gitignore rename to Tools/PPUPlayer/Build/.gitignore diff --git a/BreaksPPU/PPUPlayer/Build/Readme.md b/Tools/PPUPlayer/Build/Readme.md similarity index 100% rename from BreaksPPU/PPUPlayer/Build/Readme.md rename to Tools/PPUPlayer/Build/Readme.md diff --git a/BreaksPPU/PPUPlayer/DummyNrom.cs b/Tools/PPUPlayer/DummyNrom.cs similarity index 100% rename from BreaksPPU/PPUPlayer/DummyNrom.cs rename to Tools/PPUPlayer/DummyNrom.cs diff --git a/BreaksPPU/PPUPlayer/DumpsProcessing.cs b/Tools/PPUPlayer/DumpsProcessing.cs similarity index 100% rename from BreaksPPU/PPUPlayer/DumpsProcessing.cs rename to Tools/PPUPlayer/DumpsProcessing.cs diff --git a/BreaksPPU/PPUPlayer/FormAbout.Designer.cs b/Tools/PPUPlayer/FormAbout.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormAbout.Designer.cs rename to Tools/PPUPlayer/FormAbout.Designer.cs diff --git a/BreaksPPU/PPUPlayer/FormAbout.cs b/Tools/PPUPlayer/FormAbout.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormAbout.cs rename to Tools/PPUPlayer/FormAbout.cs diff --git a/BreaksPPU/PPUPlayer/FormAbout.resx b/Tools/PPUPlayer/FormAbout.resx similarity index 100% rename from BreaksPPU/PPUPlayer/FormAbout.resx rename to Tools/PPUPlayer/FormAbout.resx diff --git a/BreaksPPU/PPUPlayer/FormColorSpace.Designer.cs b/Tools/PPUPlayer/FormColorSpace.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormColorSpace.Designer.cs rename to Tools/PPUPlayer/FormColorSpace.Designer.cs diff --git a/BreaksPPU/PPUPlayer/FormColorSpace.cs b/Tools/PPUPlayer/FormColorSpace.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormColorSpace.cs rename to Tools/PPUPlayer/FormColorSpace.cs diff --git a/BreaksPPU/PPUPlayer/FormColorSpace.resx b/Tools/PPUPlayer/FormColorSpace.resx similarity index 100% rename from BreaksPPU/PPUPlayer/FormColorSpace.resx rename to Tools/PPUPlayer/FormColorSpace.resx diff --git a/BreaksPPU/PPUPlayer/FormComponentViewer.Designer.cs b/Tools/PPUPlayer/FormComponentViewer.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormComponentViewer.Designer.cs rename to Tools/PPUPlayer/FormComponentViewer.Designer.cs diff --git a/BreaksPPU/PPUPlayer/FormComponentViewer.cs b/Tools/PPUPlayer/FormComponentViewer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormComponentViewer.cs rename to Tools/PPUPlayer/FormComponentViewer.cs diff --git a/BreaksPPU/PPUPlayer/FormComponentViewer.resx b/Tools/PPUPlayer/FormComponentViewer.resx similarity index 100% rename from BreaksPPU/PPUPlayer/FormComponentViewer.resx rename to Tools/PPUPlayer/FormComponentViewer.resx diff --git a/BreaksPPU/PPUPlayer/FormCompositeViewer.Designer.cs b/Tools/PPUPlayer/FormCompositeViewer.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormCompositeViewer.Designer.cs rename to Tools/PPUPlayer/FormCompositeViewer.Designer.cs diff --git a/BreaksPPU/PPUPlayer/FormCompositeViewer.cs b/Tools/PPUPlayer/FormCompositeViewer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormCompositeViewer.cs rename to Tools/PPUPlayer/FormCompositeViewer.cs diff --git a/BreaksPPU/PPUPlayer/FormCompositeViewer.resx b/Tools/PPUPlayer/FormCompositeViewer.resx similarity index 100% rename from BreaksPPU/PPUPlayer/FormCompositeViewer.resx rename to Tools/PPUPlayer/FormCompositeViewer.resx diff --git a/BreaksPPU/PPUPlayer/FormMain.Designer.cs b/Tools/PPUPlayer/FormMain.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormMain.Designer.cs rename to Tools/PPUPlayer/FormMain.Designer.cs diff --git a/BreaksPPU/PPUPlayer/FormMain.cs b/Tools/PPUPlayer/FormMain.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormMain.cs rename to Tools/PPUPlayer/FormMain.cs diff --git a/BreaksPPU/PPUPlayer/FormMain.resx b/Tools/PPUPlayer/FormMain.resx similarity index 100% rename from BreaksPPU/PPUPlayer/FormMain.resx rename to Tools/PPUPlayer/FormMain.resx diff --git a/BreaksPPU/PPUPlayer/FormMainWorker.cs b/Tools/PPUPlayer/FormMainWorker.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormMainWorker.cs rename to Tools/PPUPlayer/FormMainWorker.cs diff --git a/BreaksPPU/PPUPlayer/FormRawViewer.Designer.cs b/Tools/PPUPlayer/FormRawViewer.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormRawViewer.Designer.cs rename to Tools/PPUPlayer/FormRawViewer.Designer.cs diff --git a/BreaksPPU/PPUPlayer/FormRawViewer.cs b/Tools/PPUPlayer/FormRawViewer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormRawViewer.cs rename to Tools/PPUPlayer/FormRawViewer.cs diff --git a/BreaksPPU/PPUPlayer/FormRawViewer.resx b/Tools/PPUPlayer/FormRawViewer.resx similarity index 100% rename from BreaksPPU/PPUPlayer/FormRawViewer.resx rename to Tools/PPUPlayer/FormRawViewer.resx diff --git a/BreaksPPU/PPUPlayer/FormSettings.Designer.cs b/Tools/PPUPlayer/FormSettings.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormSettings.Designer.cs rename to Tools/PPUPlayer/FormSettings.Designer.cs diff --git a/BreaksPPU/PPUPlayer/FormSettings.cs b/Tools/PPUPlayer/FormSettings.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormSettings.cs rename to Tools/PPUPlayer/FormSettings.cs diff --git a/BreaksPPU/PPUPlayer/FormSettings.resx b/Tools/PPUPlayer/FormSettings.resx similarity index 100% rename from BreaksPPU/PPUPlayer/FormSettings.resx rename to Tools/PPUPlayer/FormSettings.resx diff --git a/BreaksPPU/PPUPlayer/FormSnatch.Designer.cs b/Tools/PPUPlayer/FormSnatch.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormSnatch.Designer.cs rename to Tools/PPUPlayer/FormSnatch.Designer.cs diff --git a/BreaksPPU/PPUPlayer/FormSnatch.cs b/Tools/PPUPlayer/FormSnatch.cs similarity index 100% rename from BreaksPPU/PPUPlayer/FormSnatch.cs rename to Tools/PPUPlayer/FormSnatch.cs diff --git a/BreaksPPU/PPUPlayer/FormSnatch.resx b/Tools/PPUPlayer/FormSnatch.resx similarity index 100% rename from BreaksPPU/PPUPlayer/FormSnatch.resx rename to Tools/PPUPlayer/FormSnatch.resx diff --git a/BreaksPPU/PPUPlayer/PPUPlayer.csproj b/Tools/PPUPlayer/PPUPlayer.csproj similarity index 100% rename from BreaksPPU/PPUPlayer/PPUPlayer.csproj rename to Tools/PPUPlayer/PPUPlayer.csproj diff --git a/BreaksPPU/PPUPlayer/PPUPlayer.csproj.user b/Tools/PPUPlayer/PPUPlayer.csproj.user similarity index 100% rename from BreaksPPU/PPUPlayer/PPUPlayer.csproj.user rename to Tools/PPUPlayer/PPUPlayer.csproj.user diff --git a/BreaksPPU/PPUPlayer/PPUPlayer.sln b/Tools/PPUPlayer/PPUPlayer.sln similarity index 97% rename from BreaksPPU/PPUPlayer/PPUPlayer.sln rename to Tools/PPUPlayer/PPUPlayer.sln index 9552ac1a..e30af0f8 100644 --- a/BreaksPPU/PPUPlayer/PPUPlayer.sln +++ b/Tools/PPUPlayer/PPUPlayer.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32319.34 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PPUPlayer", "PPUPlayer.csproj", "{14D56ED1-75C4-4479-AEF2-CAA392122019}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseBoardLib", "..\..\Common\BaseBoardLib\Scripts\VS2022\BaseBoardLib.vcxproj", "{36F535AD-B87B-4F4D-A5F9-0F2377FBA7EA}" EndProject @@ -17,11 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpTools", "..\..\Common\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BreaksCore", "..\..\Breaknes\BreaksCore\Scripts\VS2022\BreaksCore.vcxproj", "{88908FB4-0012-4533-BFFB-30AA9F72EBDC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Breaks6502\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Breaks Core", "Breaks Core", "{A8AE6809-CB40-4389-B27B-B767576D0D5C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\BreaksAPU\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonLib", "..\..\Common\JsonLib\Scripts\VS2022\JsonLib.vcxproj", "{8782459B-4E38-4227-AA98-6E7E8E06659C}" EndProject diff --git a/BreaksPPU/PPUPlayer/PPU_Player.png b/Tools/PPUPlayer/PPU_Player.png similarity index 100% rename from BreaksPPU/PPUPlayer/PPU_Player.png rename to Tools/PPUPlayer/PPU_Player.png diff --git a/BreaksPPU/PPUPlayer/PPU_Player_Diag_Eng.png b/Tools/PPUPlayer/PPU_Player_Diag_Eng.png similarity index 100% rename from BreaksPPU/PPUPlayer/PPU_Player_Diag_Eng.png rename to Tools/PPUPlayer/PPU_Player_Diag_Eng.png diff --git a/BreaksPPU/PPUPlayer/Program.cs b/Tools/PPUPlayer/Program.cs similarity index 100% rename from BreaksPPU/PPUPlayer/Program.cs rename to Tools/PPUPlayer/Program.cs diff --git a/BreaksPPU/PPUPlayer/Properties/Resources.Designer.cs b/Tools/PPUPlayer/Properties/Resources.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/Properties/Resources.Designer.cs rename to Tools/PPUPlayer/Properties/Resources.Designer.cs diff --git a/BreaksPPU/PPUPlayer/Properties/Resources.resx b/Tools/PPUPlayer/Properties/Resources.resx similarity index 100% rename from BreaksPPU/PPUPlayer/Properties/Resources.resx rename to Tools/PPUPlayer/Properties/Resources.resx diff --git a/BreaksPPU/PPUPlayer/Properties/Settings.Designer.cs b/Tools/PPUPlayer/Properties/Settings.Designer.cs similarity index 100% rename from BreaksPPU/PPUPlayer/Properties/Settings.Designer.cs rename to Tools/PPUPlayer/Properties/Settings.Designer.cs diff --git a/BreaksPPU/PPUPlayer/Properties/Settings.settings b/Tools/PPUPlayer/Properties/Settings.settings similarity index 100% rename from BreaksPPU/PPUPlayer/Properties/Settings.settings rename to Tools/PPUPlayer/Properties/Settings.settings diff --git a/BreaksPPU/PPUPlayer/Properties/launchSettings.json b/Tools/PPUPlayer/Properties/launchSettings.json similarity index 100% rename from BreaksPPU/PPUPlayer/Properties/launchSettings.json rename to Tools/PPUPlayer/Properties/launchSettings.json diff --git a/BreaksPPU/PPUPlayer/Readme.md b/Tools/PPUPlayer/Readme.md similarity index 100% rename from BreaksPPU/PPUPlayer/Readme.md rename to Tools/PPUPlayer/Readme.md diff --git a/BreaksPPU/PPUPlayer/VideoProcessing.cs b/Tools/PPUPlayer/VideoProcessing.cs similarity index 100% rename from BreaksPPU/PPUPlayer/VideoProcessing.cs rename to Tools/PPUPlayer/VideoProcessing.cs diff --git a/BreaksPPU/PPUPlayer/WavesSupport.cs b/Tools/PPUPlayer/WavesSupport.cs similarity index 100% rename from BreaksPPU/PPUPlayer/WavesSupport.cs rename to Tools/PPUPlayer/WavesSupport.cs diff --git a/BreaksPPU/PPUPlayer/button_get_debug.png b/Tools/PPUPlayer/button_get_debug.png similarity index 100% rename from BreaksPPU/PPUPlayer/button_get_debug.png rename to Tools/PPUPlayer/button_get_debug.png diff --git a/BreaksPPU/PPUPlayer/button_pause.png b/Tools/PPUPlayer/button_pause.png similarity index 100% rename from BreaksPPU/PPUPlayer/button_pause.png rename to Tools/PPUPlayer/button_pause.png diff --git a/BreaksPPU/PPUPlayer/button_play.png b/Tools/PPUPlayer/button_play.png similarity index 100% rename from BreaksPPU/PPUPlayer/button_play.png rename to Tools/PPUPlayer/button_play.png diff --git a/BreaksPPU/PPUPlayer/button_stop.png b/Tools/PPUPlayer/button_stop.png similarity index 100% rename from BreaksPPU/PPUPlayer/button_stop.png rename to Tools/PPUPlayer/button_stop.png diff --git a/BreaksPPU/PPUPlayer/ppu_player_logo.png b/Tools/PPUPlayer/ppu_player_logo.png similarity index 100% rename from BreaksPPU/PPUPlayer/ppu_player_logo.png rename to Tools/PPUPlayer/ppu_player_logo.png diff --git a/Demos/PpuPumpkin/.gitignore b/Tools/PpuPumpkin/.gitignore similarity index 100% rename from Demos/PpuPumpkin/.gitignore rename to Tools/PpuPumpkin/.gitignore diff --git a/Demos/PpuPumpkin/PpuPumpkin.cpp b/Tools/PpuPumpkin/PpuPumpkin.cpp similarity index 100% rename from Demos/PpuPumpkin/PpuPumpkin.cpp rename to Tools/PpuPumpkin/PpuPumpkin.cpp diff --git a/Demos/PpuPumpkin/PpuPumpkin.sln b/Tools/PpuPumpkin/PpuPumpkin.sln similarity index 96% rename from Demos/PpuPumpkin/PpuPumpkin.sln rename to Tools/PpuPumpkin/PpuPumpkin.sln index 1741c0ee..5e20f9d0 100644 --- a/Demos/PpuPumpkin/PpuPumpkin.sln +++ b/Tools/PpuPumpkin/PpuPumpkin.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PpuPumpkin", "PpuPumpkin.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseLogicLib", "..\..\Common\BaseLogicLib\Scripts\VS2022\BaseLogicLib.vcxproj", "{11AAD192-46EB-4D5D-B81F-BCEE11D6AF8E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\BreaksPPU\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Demos/PpuPumpkin/PpuPumpkin.vcxproj b/Tools/PpuPumpkin/PpuPumpkin.vcxproj similarity index 99% rename from Demos/PpuPumpkin/PpuPumpkin.vcxproj rename to Tools/PpuPumpkin/PpuPumpkin.vcxproj index be1c64c6..97c8c01f 100644 --- a/Demos/PpuPumpkin/PpuPumpkin.vcxproj +++ b/Tools/PpuPumpkin/PpuPumpkin.vcxproj @@ -162,7 +162,7 @@ - + {ebd9b3eb-3c04-43ed-b454-e9442b21f5a0} diff --git a/Demos/PpuPumpkin/PpuPumpkin.vcxproj.filters b/Tools/PpuPumpkin/PpuPumpkin.vcxproj.filters similarity index 100% rename from Demos/PpuPumpkin/PpuPumpkin.vcxproj.filters rename to Tools/PpuPumpkin/PpuPumpkin.vcxproj.filters diff --git a/Demos/PpuPumpkin/Readme.md b/Tools/PpuPumpkin/Readme.md similarity index 100% rename from Demos/PpuPumpkin/Readme.md rename to Tools/PpuPumpkin/Readme.md diff --git a/Demos/PpuPumpkin/pch.cpp b/Tools/PpuPumpkin/pch.cpp similarity index 100% rename from Demos/PpuPumpkin/pch.cpp rename to Tools/PpuPumpkin/pch.cpp diff --git a/Demos/PpuPumpkin/pch.h b/Tools/PpuPumpkin/pch.h similarity index 82% rename from Demos/PpuPumpkin/pch.h rename to Tools/PpuPumpkin/pch.h index 70d184d7..2bc7018b 100644 --- a/Demos/PpuPumpkin/pch.h +++ b/Tools/PpuPumpkin/pch.h @@ -9,4 +9,4 @@ #include #include "../../Common/BaseLogicLib/BaseLogic.h" -#include "../../BreaksPPU/PPUSim/ppu.h" +#include "../../Chips/PPUSim/ppu.h" diff --git a/Demos/PpuPumpkin/ppusim_profiler.png b/Tools/PpuPumpkin/ppusim_profiler.png similarity index 100% rename from Demos/PpuPumpkin/ppusim_profiler.png rename to Tools/PpuPumpkin/ppusim_profiler.png diff --git a/Demos/SignalPlotDemo/Readme.md b/Tools/SignalPlotDemo/Readme.md similarity index 73% rename from Demos/SignalPlotDemo/Readme.md rename to Tools/SignalPlotDemo/Readme.md index b0e61c80..79a5e605 100644 --- a/Demos/SignalPlotDemo/Readme.md +++ b/Tools/SignalPlotDemo/Readme.md @@ -1,6 +1,6 @@ # SignalPlotDemo -![SignalPlotDemo](/UserManual/imgstore/SignalPlotDemo.png) +![SignalPlotDemo](/Wiki/imgstore/SignalPlotDemo.png) Demonstration of the custom WinForms SignalPlotControl. diff --git a/Demos/SignalPlotDemo/SignalPlotDemo.sln b/Tools/SignalPlotDemo/SignalPlotDemo.sln similarity index 100% rename from Demos/SignalPlotDemo/SignalPlotDemo.sln rename to Tools/SignalPlotDemo/SignalPlotDemo.sln diff --git a/Demos/SignalPlotDemo/SignalPlotDemo/.gitignore b/Tools/SignalPlotDemo/SignalPlotDemo/.gitignore similarity index 100% rename from Demos/SignalPlotDemo/SignalPlotDemo/.gitignore rename to Tools/SignalPlotDemo/SignalPlotDemo/.gitignore diff --git a/Demos/SignalPlotDemo/SignalPlotDemo/FormMain.Designer.cs b/Tools/SignalPlotDemo/SignalPlotDemo/FormMain.Designer.cs similarity index 100% rename from Demos/SignalPlotDemo/SignalPlotDemo/FormMain.Designer.cs rename to Tools/SignalPlotDemo/SignalPlotDemo/FormMain.Designer.cs diff --git a/Demos/SignalPlotDemo/SignalPlotDemo/FormMain.cs b/Tools/SignalPlotDemo/SignalPlotDemo/FormMain.cs similarity index 100% rename from Demos/SignalPlotDemo/SignalPlotDemo/FormMain.cs rename to Tools/SignalPlotDemo/SignalPlotDemo/FormMain.cs diff --git a/Demos/SignalPlotDemo/SignalPlotDemo/FormMain.resx b/Tools/SignalPlotDemo/SignalPlotDemo/FormMain.resx similarity index 100% rename from Demos/SignalPlotDemo/SignalPlotDemo/FormMain.resx rename to Tools/SignalPlotDemo/SignalPlotDemo/FormMain.resx diff --git a/Demos/SignalPlotDemo/SignalPlotDemo/Program.cs b/Tools/SignalPlotDemo/SignalPlotDemo/Program.cs similarity index 100% rename from Demos/SignalPlotDemo/SignalPlotDemo/Program.cs rename to Tools/SignalPlotDemo/SignalPlotDemo/Program.cs diff --git a/Demos/SignalPlotDemo/SignalPlotDemo/SignalPlotControl.cs b/Tools/SignalPlotDemo/SignalPlotDemo/SignalPlotControl.cs similarity index 100% rename from Demos/SignalPlotDemo/SignalPlotDemo/SignalPlotControl.cs rename to Tools/SignalPlotDemo/SignalPlotDemo/SignalPlotControl.cs diff --git a/Demos/SignalPlotDemo/SignalPlotDemo/SignalPlotDemo.csproj b/Tools/SignalPlotDemo/SignalPlotDemo/SignalPlotDemo.csproj similarity index 100% rename from Demos/SignalPlotDemo/SignalPlotDemo/SignalPlotDemo.csproj rename to Tools/SignalPlotDemo/SignalPlotDemo/SignalPlotDemo.csproj diff --git a/Demos/SlooowPlaaayer/.gitignore b/Tools/SlooowPlaaayer/.gitignore similarity index 100% rename from Demos/SlooowPlaaayer/.gitignore rename to Tools/SlooowPlaaayer/.gitignore diff --git a/Demos/SlooowPlaaayer/FormAbout.Designer.cs b/Tools/SlooowPlaaayer/FormAbout.Designer.cs similarity index 100% rename from Demos/SlooowPlaaayer/FormAbout.Designer.cs rename to Tools/SlooowPlaaayer/FormAbout.Designer.cs diff --git a/Demos/SlooowPlaaayer/FormAbout.cs b/Tools/SlooowPlaaayer/FormAbout.cs similarity index 100% rename from Demos/SlooowPlaaayer/FormAbout.cs rename to Tools/SlooowPlaaayer/FormAbout.cs diff --git a/Demos/SlooowPlaaayer/FormAbout.resx b/Tools/SlooowPlaaayer/FormAbout.resx similarity index 100% rename from Demos/SlooowPlaaayer/FormAbout.resx rename to Tools/SlooowPlaaayer/FormAbout.resx diff --git a/Demos/SlooowPlaaayer/FormMain.Designer.cs b/Tools/SlooowPlaaayer/FormMain.Designer.cs similarity index 100% rename from Demos/SlooowPlaaayer/FormMain.Designer.cs rename to Tools/SlooowPlaaayer/FormMain.Designer.cs diff --git a/Demos/SlooowPlaaayer/FormMain.cs b/Tools/SlooowPlaaayer/FormMain.cs similarity index 100% rename from Demos/SlooowPlaaayer/FormMain.cs rename to Tools/SlooowPlaaayer/FormMain.cs diff --git a/Demos/SlooowPlaaayer/FormMain.resx b/Tools/SlooowPlaaayer/FormMain.resx similarity index 100% rename from Demos/SlooowPlaaayer/FormMain.resx rename to Tools/SlooowPlaaayer/FormMain.resx diff --git a/Demos/SlooowPlaaayer/FormSnatch.Designer.cs b/Tools/SlooowPlaaayer/FormSnatch.Designer.cs similarity index 100% rename from Demos/SlooowPlaaayer/FormSnatch.Designer.cs rename to Tools/SlooowPlaaayer/FormSnatch.Designer.cs diff --git a/Demos/SlooowPlaaayer/FormSnatch.cs b/Tools/SlooowPlaaayer/FormSnatch.cs similarity index 100% rename from Demos/SlooowPlaaayer/FormSnatch.cs rename to Tools/SlooowPlaaayer/FormSnatch.cs diff --git a/Demos/SlooowPlaaayer/FormSnatch.resx b/Tools/SlooowPlaaayer/FormSnatch.resx similarity index 100% rename from Demos/SlooowPlaaayer/FormSnatch.resx rename to Tools/SlooowPlaaayer/FormSnatch.resx diff --git a/Demos/SlooowPlaaayer/Program.cs b/Tools/SlooowPlaaayer/Program.cs similarity index 100% rename from Demos/SlooowPlaaayer/Program.cs rename to Tools/SlooowPlaaayer/Program.cs diff --git a/Demos/SlooowPlaaayer/Properties/Resources.Designer.cs b/Tools/SlooowPlaaayer/Properties/Resources.Designer.cs similarity index 100% rename from Demos/SlooowPlaaayer/Properties/Resources.Designer.cs rename to Tools/SlooowPlaaayer/Properties/Resources.Designer.cs diff --git a/Demos/SlooowPlaaayer/Properties/Resources.resx b/Tools/SlooowPlaaayer/Properties/Resources.resx similarity index 100% rename from Demos/SlooowPlaaayer/Properties/Resources.resx rename to Tools/SlooowPlaaayer/Properties/Resources.resx diff --git a/Demos/SlooowPlaaayer/Readme.md b/Tools/SlooowPlaaayer/Readme.md similarity index 90% rename from Demos/SlooowPlaaayer/Readme.md rename to Tools/SlooowPlaaayer/Readme.md index eb1e97a7..8174236f 100644 --- a/Demos/SlooowPlaaayer/Readme.md +++ b/Tools/SlooowPlaaayer/Readme.md @@ -1,6 +1,6 @@ # Slooow Plaaayer -![SlooowPlaaayer](/UserManual/imgstore/SlooowPlaaayer.png) +![SlooowPlaaayer](/Wiki/imgstore/SlooowPlaaayer.png) Utility for playing audio samples that were obtained from a slow source (such as APUSim). diff --git a/Demos/SlooowPlaaayer/SlooowPlaaayer.csproj b/Tools/SlooowPlaaayer/SlooowPlaaayer.csproj similarity index 100% rename from Demos/SlooowPlaaayer/SlooowPlaaayer.csproj rename to Tools/SlooowPlaaayer/SlooowPlaaayer.csproj diff --git a/Demos/SlooowPlaaayer/SlooowPlaaayer.jpg b/Tools/SlooowPlaaayer/SlooowPlaaayer.jpg similarity index 100% rename from Demos/SlooowPlaaayer/SlooowPlaaayer.jpg rename to Tools/SlooowPlaaayer/SlooowPlaaayer.jpg diff --git a/Demos/SlooowPlaaayer/SlooowPlaaayer.sln b/Tools/SlooowPlaaayer/SlooowPlaaayer.sln similarity index 100% rename from Demos/SlooowPlaaayer/SlooowPlaaayer.sln rename to Tools/SlooowPlaaayer/SlooowPlaaayer.sln diff --git a/Demos/SlooowPlaaayer/WavLoad.cs b/Tools/SlooowPlaaayer/WavLoad.cs similarity index 100% rename from Demos/SlooowPlaaayer/WavLoad.cs rename to Tools/SlooowPlaaayer/WavLoad.cs diff --git a/UnitTest/Readme.md b/UnitTest/Readme.md index b307ab1f..ac635b20 100644 --- a/UnitTest/Readme.md +++ b/UnitTest/Readme.md @@ -2,7 +2,7 @@ Unit tests for emulated chips and cores. -![UnitTest](/UserManual/imgstore/UnitTest.jpg) +![UnitTest](/Wiki/imgstore/UnitTest.jpg) Each emulated chip class contains a friendly class that has access to all internals. diff --git a/UnitTest/UnitTest.sln b/UnitTest/UnitTest.sln index f26d3534..fe940233 100644 --- a/UnitTest/UnitTest.sln +++ b/UnitTest/UnitTest.sln @@ -5,11 +5,11 @@ VisualStudioVersion = 17.1.32319.34 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest.vcxproj", "{A40DADDC-798D-4C21-A34B-3098410E17C3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\Breaks6502\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M6502Core", "..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj", "{75210C0A-A812-4246-A179-B50D8A25A121}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\BreaksAPU\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APUSim", "..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj", "{50E93D78-36DC-46C3-82EA-CAB373E18729}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\BreaksPPU\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPUSim", "..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj", "{EBD9B3EB-3C04-43ED-B454-E9442B21F5A0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseLogicLib", "..\Common\BaseLogicLib\Scripts\VS2022\BaseLogicLib.vcxproj", "{11AAD192-46EB-4D5D-B81F-BCEE11D6AF8E}" EndProject diff --git a/UnitTest/UnitTest.vcxproj b/UnitTest/UnitTest.vcxproj index e53f3cbb..cdae655d 100644 --- a/UnitTest/UnitTest.vcxproj +++ b/UnitTest/UnitTest.vcxproj @@ -182,13 +182,13 @@ - + {75210c0a-a812-4246-a179-b50d8a25a121} - + {50e93d78-36dc-46c3-82ea-cab373e18729} - + {ebd9b3eb-3c04-43ed-b454-e9442b21f5a0} diff --git a/UnitTest/pch.h b/UnitTest/pch.h index 979a2c0f..07c2ba29 100644 --- a/UnitTest/pch.h +++ b/UnitTest/pch.h @@ -9,9 +9,9 @@ #include "../Common/BaseLogicLib/BaseLogic.h" -#include "../Breaks6502/M6502Core/core.h" -#include "../BreaksAPU/APUSim/apu.h" -#include "../BreaksPPU/PPUSim/ppu.h" +#include "../Chips/M6502Core/core.h" +#include "../Chips/APUSim/apu.h" +#include "../Chips/PPUSim/ppu.h" #include "../IO/CD4021.h" diff --git a/UserManual/PPUPlayer/DumpVideoSignalEng.md b/Wiki/DumpVideoSignalEng.md similarity index 85% rename from UserManual/PPUPlayer/DumpVideoSignalEng.md rename to Wiki/DumpVideoSignalEng.md index 35a36efc..20da2dd9 100644 --- a/UserManual/PPUPlayer/DumpVideoSignalEng.md +++ b/Wiki/DumpVideoSignalEng.md @@ -8,15 +8,15 @@ Requirements: Start PPUPlayer: -![dump_video_001](/UserManual/imgstore/dump_video_001.png) +![dump_video_001](/Wiki/imgstore/dump_video_001.png) Select in the settings the PPU revision for which you want to get the video signal dump: -![dump_video_002](/UserManual/imgstore/dump_video_002.png) +![dump_video_002](/Wiki/imgstore/dump_video_002.png) Run PPUPlayer in "free flight" (Run PPU). Go to the Current Scan tab and make sure the PPU is alive: -![dump_video_003](/UserManual/imgstore/dump_video_003.png) +![dump_video_003](/Wiki/imgstore/dump_video_003.png) ## Dump of PPU state in Nintendulator @@ -24,7 +24,7 @@ Run some game in Nintendulator, preferably without a complicated mapper. Open the debugger and save all of the PPU memory: -![dump_video_004](/UserManual/imgstore/dump_video_004.png) +![dump_video_004](/Wiki/imgstore/dump_video_004.png) You will get a file with the extension .ppumem, which can be found somewhere in the depths of your Users/AppData folder. @@ -34,7 +34,7 @@ Select `Load Nintendulator PPU Dump` in the menu `PPU Dumps` and load the PPU me This will result in something like this: -![dump_video_005](/UserManual/imgstore/dump_video_005.png) +![dump_video_005](/Wiki/imgstore/dump_video_005.png) But oops. Something's wrong. @@ -44,11 +44,11 @@ Especially important is register $2000, which sets the Pattern table addresses a To fix this, go to the Debug tab and change the value of register $2000 (for Contra you need to set it to 0x30): -![dump_video_006](/UserManual/imgstore/dump_video_006.png) +![dump_video_006](/Wiki/imgstore/dump_video_006.png) It turned out like this: -![dump_video_007](/UserManual/imgstore/dump_video_007.png) +![dump_video_007](/Wiki/imgstore/dump_video_007.png) ## Turn on the video signal dump @@ -63,7 +63,7 @@ In the menu `PPU Dumps` you need to select `Start video signal dump`, specify th It is possible to get the pixel value before the DAC circuitry instead of the PPU video signal: -![dump_video_008](/UserManual/imgstore/dump_video_008.png) +![dump_video_008](/Wiki/imgstore/dump_video_008.png) In this case uint16_t values of the following format will be dumped: diff --git a/UserManual/PPUPlayer/DumpVideoSignalRus.md b/Wiki/DumpVideoSignalRus.md similarity index 89% rename from UserManual/PPUPlayer/DumpVideoSignalRus.md rename to Wiki/DumpVideoSignalRus.md index 182f7d8e..6f19f451 100644 --- a/UserManual/PPUPlayer/DumpVideoSignalRus.md +++ b/Wiki/DumpVideoSignalRus.md @@ -8,15 +8,15 @@ Запустить PPUPlayer: -![dump_video_001](/UserManual/imgstore/dump_video_001.png) +![dump_video_001](/Wiki/imgstore/dump_video_001.png) Выбрать в настройках ревизию PPU, для которого нужно получить дамп видеосигнала: -![dump_video_002](/UserManual/imgstore/dump_video_002.png) +![dump_video_002](/Wiki/imgstore/dump_video_002.png) Запустить PPUPlayer в "свободный полёт" (Run PPU). Перейти на вкладку Current Scan и убедиться что PPU живой: -![dump_video_003](/UserManual/imgstore/dump_video_003.png) +![dump_video_003](/Wiki/imgstore/dump_video_003.png) ## Дамп состояния PPU в Nintendulator @@ -24,7 +24,7 @@ Открыть отладачик и сдампить всю память PPU: -![dump_video_004](/UserManual/imgstore/dump_video_004.png) +![dump_video_004](/Wiki/imgstore/dump_video_004.png) Получится файл с расширением .ppumem, который можно найти где-то в недрах вашей папки Users/AppData. @@ -34,7 +34,7 @@ Получится примерно такое: -![dump_video_005](/UserManual/imgstore/dump_video_005.png) +![dump_video_005](/Wiki/imgstore/dump_video_005.png) Но упс. Что-то не так. @@ -44,11 +44,11 @@ Чтобы это исправить, переходим на вкладку Debug и меняем значение регистра $2000 (для Contra нужно установить значение 0x30): -![dump_video_006](/UserManual/imgstore/dump_video_006.png) +![dump_video_006](/Wiki/imgstore/dump_video_006.png) Получилось такое: -![dump_video_007](/UserManual/imgstore/dump_video_007.png) +![dump_video_007](/Wiki/imgstore/dump_video_007.png) ## Включить дамп видеосигнала @@ -63,7 +63,7 @@ Есть возможность вместо видеосигнала PPU получать значение пикселей до схемы ЦАП: -![dump_video_008](/UserManual/imgstore/dump_video_008.png) +![dump_video_008](/Wiki/imgstore/dump_video_008.png) В этом случае будут дампиться значения uint16_t следующего формата: diff --git a/UserManual/PPUPlayer/PPU_Player_Eng.pdf b/Wiki/PPUPlayer/PPU_Player_Eng.pdf similarity index 100% rename from UserManual/PPUPlayer/PPU_Player_Eng.pdf rename to Wiki/PPUPlayer/PPU_Player_Eng.pdf diff --git a/UserManual/PPUPlayer/PPU_Player_Eng.pptx b/Wiki/PPUPlayer/PPU_Player_Eng.pptx similarity index 100% rename from UserManual/PPUPlayer/PPU_Player_Eng.pptx rename to Wiki/PPUPlayer/PPU_Player_Eng.pptx diff --git a/UserManual/PPUPlayer/PPU_Player_Rus.pdf b/Wiki/PPUPlayer/PPU_Player_Rus.pdf similarity index 100% rename from UserManual/PPUPlayer/PPU_Player_Rus.pdf rename to Wiki/PPUPlayer/PPU_Player_Rus.pdf diff --git a/UserManual/PPUPlayer/PPU_Player_Rus.pptx b/Wiki/PPUPlayer/PPU_Player_Rus.pptx similarity index 100% rename from UserManual/PPUPlayer/PPU_Player_Rus.pptx rename to Wiki/PPUPlayer/PPU_Player_Rus.pptx diff --git a/UserManual/Runtime.md b/Wiki/Runtime.md similarity index 100% rename from UserManual/Runtime.md rename to Wiki/Runtime.md diff --git a/UserManual/Readme.md b/Wiki/UserManual.md similarity index 71% rename from UserManual/Readme.md rename to Wiki/UserManual.md index bb3de73e..920e4344 100644 --- a/UserManual/Readme.md +++ b/Wiki/UserManual.md @@ -2,7 +2,7 @@ ## Main Window -![main](/UserManual/imgstore/main.jpg) +![main](/Wiki/imgstore/main.jpg) - File->Load ROM Dump...: Select the .nes ROM image. The emulation will start right away. @@ -12,6 +12,6 @@ ## Settings -![settings](/UserManual/imgstore/settings.jpg) +![settings](/Wiki/imgstore/settings.jpg) - Save: Save and close diff --git a/UserManual/debug.graphml b/Wiki/debug.graphml similarity index 100% rename from UserManual/debug.graphml rename to Wiki/debug.graphml diff --git a/UserManual/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.png b/Wiki/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.png similarity index 100% rename from UserManual/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.png rename to Wiki/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.png diff --git a/UserManual/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.psd b/Wiki/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.psd similarity index 100% rename from UserManual/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.psd rename to Wiki/imgstore/157481692-2ecd4e71-2599-4050-9ce0-815c0336ad27.psd diff --git a/UserManual/imgstore/20_JSR_T1_PHI1.jpg b/Wiki/imgstore/20_JSR_T1_PHI1.jpg similarity index 100% rename from UserManual/imgstore/20_JSR_T1_PHI1.jpg rename to Wiki/imgstore/20_JSR_T1_PHI1.jpg diff --git a/Wiki/imgstore/40H368.jpg b/Wiki/imgstore/40H368.jpg new file mode 100644 index 00000000..8b051005 Binary files /dev/null and b/Wiki/imgstore/40H368.jpg differ diff --git a/UserManual/imgstore/APUPlayer.jpg b/Wiki/imgstore/APUPlayer.jpg similarity index 100% rename from UserManual/imgstore/APUPlayer.jpg rename to Wiki/imgstore/APUPlayer.jpg diff --git a/UserManual/imgstore/BogusBoard.jpg b/Wiki/imgstore/BogusBoard.jpg similarity index 100% rename from UserManual/imgstore/BogusBoard.jpg rename to Wiki/imgstore/BogusBoard.jpg diff --git a/UserManual/imgstore/InfernoColormap.png b/Wiki/imgstore/InfernoColormap.png similarity index 100% rename from UserManual/imgstore/InfernoColormap.png rename to Wiki/imgstore/InfernoColormap.png diff --git a/Wiki/imgstore/LS139.jpg b/Wiki/imgstore/LS139.jpg new file mode 100644 index 00000000..7cb53e6d Binary files /dev/null and b/Wiki/imgstore/LS139.jpg differ diff --git a/Wiki/imgstore/LS373.jpg b/Wiki/imgstore/LS373.jpg new file mode 100644 index 00000000..99633dc6 Binary files /dev/null and b/Wiki/imgstore/LS373.jpg differ diff --git a/UserManual/imgstore/PPUPlayer_All.png b/Wiki/imgstore/PPUPlayer_All.png similarity index 100% rename from UserManual/imgstore/PPUPlayer_All.png rename to Wiki/imgstore/PPUPlayer_All.png diff --git a/Wiki/imgstore/SRAM.jpg b/Wiki/imgstore/SRAM.jpg new file mode 100644 index 00000000..66a29c53 Binary files /dev/null and b/Wiki/imgstore/SRAM.jpg differ diff --git a/UserManual/imgstore/SignalPlotDemo.png b/Wiki/imgstore/SignalPlotDemo.png similarity index 100% rename from UserManual/imgstore/SignalPlotDemo.png rename to Wiki/imgstore/SignalPlotDemo.png diff --git a/UserManual/imgstore/SlooowPlaaayer.png b/Wiki/imgstore/SlooowPlaaayer.png similarity index 100% rename from UserManual/imgstore/SlooowPlaaayer.png rename to Wiki/imgstore/SlooowPlaaayer.png diff --git a/UserManual/imgstore/UnitTest.jpg b/Wiki/imgstore/UnitTest.jpg similarity index 100% rename from UserManual/imgstore/UnitTest.jpg rename to Wiki/imgstore/UnitTest.jpg diff --git a/UserManual/imgstore/debug.jpg b/Wiki/imgstore/debug.jpg similarity index 100% rename from UserManual/imgstore/debug.jpg rename to Wiki/imgstore/debug.jpg diff --git a/UserManual/imgstore/dendy_controller.png b/Wiki/imgstore/dendy_controller.png similarity index 100% rename from UserManual/imgstore/dendy_controller.png rename to Wiki/imgstore/dendy_controller.png diff --git a/UserManual/imgstore/dump_video_001.png b/Wiki/imgstore/dump_video_001.png similarity index 100% rename from UserManual/imgstore/dump_video_001.png rename to Wiki/imgstore/dump_video_001.png diff --git a/UserManual/imgstore/dump_video_002.png b/Wiki/imgstore/dump_video_002.png similarity index 100% rename from UserManual/imgstore/dump_video_002.png rename to Wiki/imgstore/dump_video_002.png diff --git a/UserManual/imgstore/dump_video_003.png b/Wiki/imgstore/dump_video_003.png similarity index 100% rename from UserManual/imgstore/dump_video_003.png rename to Wiki/imgstore/dump_video_003.png diff --git a/UserManual/imgstore/dump_video_004.png b/Wiki/imgstore/dump_video_004.png similarity index 100% rename from UserManual/imgstore/dump_video_004.png rename to Wiki/imgstore/dump_video_004.png diff --git a/UserManual/imgstore/dump_video_005.png b/Wiki/imgstore/dump_video_005.png similarity index 100% rename from UserManual/imgstore/dump_video_005.png rename to Wiki/imgstore/dump_video_005.png diff --git a/UserManual/imgstore/dump_video_006.png b/Wiki/imgstore/dump_video_006.png similarity index 100% rename from UserManual/imgstore/dump_video_006.png rename to Wiki/imgstore/dump_video_006.png diff --git a/UserManual/imgstore/dump_video_007.png b/Wiki/imgstore/dump_video_007.png similarity index 100% rename from UserManual/imgstore/dump_video_007.png rename to Wiki/imgstore/dump_video_007.png diff --git a/UserManual/imgstore/dump_video_008.png b/Wiki/imgstore/dump_video_008.png similarity index 100% rename from UserManual/imgstore/dump_video_008.png rename to Wiki/imgstore/dump_video_008.png diff --git a/UserManual/imgstore/fami_logisim.jpg b/Wiki/imgstore/fami_logisim.jpg similarity index 100% rename from UserManual/imgstore/fami_logisim.jpg rename to Wiki/imgstore/fami_logisim.jpg diff --git a/UserManual/imgstore/famicom_controller1.png b/Wiki/imgstore/famicom_controller1.png similarity index 100% rename from UserManual/imgstore/famicom_controller1.png rename to Wiki/imgstore/famicom_controller1.png diff --git a/UserManual/imgstore/famicom_controller2.png b/Wiki/imgstore/famicom_controller2.png similarity index 100% rename from UserManual/imgstore/famicom_controller2.png rename to Wiki/imgstore/famicom_controller2.png diff --git a/UserManual/imgstore/main.jpg b/Wiki/imgstore/main.jpg similarity index 100% rename from UserManual/imgstore/main.jpg rename to Wiki/imgstore/main.jpg diff --git a/UserManual/imgstore/mariwa.png b/Wiki/imgstore/mariwa.png similarity index 100% rename from UserManual/imgstore/mariwa.png rename to Wiki/imgstore/mariwa.png diff --git a/UserManual/imgstore/nes.png b/Wiki/imgstore/nes.png similarity index 100% rename from UserManual/imgstore/nes.png rename to Wiki/imgstore/nes.png diff --git a/UserManual/imgstore/nes_controller.png b/Wiki/imgstore/nes_controller.png similarity index 100% rename from UserManual/imgstore/nes_controller.png rename to Wiki/imgstore/nes_controller.png diff --git a/UserManual/imgstore/progress.png b/Wiki/imgstore/progress.png similarity index 100% rename from UserManual/imgstore/progress.png rename to Wiki/imgstore/progress.png diff --git a/UserManual/imgstore/settings.jpg b/Wiki/imgstore/settings.jpg similarity index 100% rename from UserManual/imgstore/settings.jpg rename to Wiki/imgstore/settings.jpg diff --git a/UserManual/imgstore/slow_player_stable_diffusion.jpg b/Wiki/imgstore/slow_player_stable_diffusion.jpg similarity index 100% rename from UserManual/imgstore/slow_player_stable_diffusion.jpg rename to Wiki/imgstore/slow_player_stable_diffusion.jpg diff --git a/UserManual/imgstore/virt_dendy_controller.png b/Wiki/imgstore/virt_dendy_controller.png similarity index 100% rename from UserManual/imgstore/virt_dendy_controller.png rename to Wiki/imgstore/virt_dendy_controller.png diff --git a/UserManual/imgstore/virt_famicom_controller1.png b/Wiki/imgstore/virt_famicom_controller1.png similarity index 100% rename from UserManual/imgstore/virt_famicom_controller1.png rename to Wiki/imgstore/virt_famicom_controller1.png diff --git a/UserManual/imgstore/virt_famicom_controller2.png b/Wiki/imgstore/virt_famicom_controller2.png similarity index 100% rename from UserManual/imgstore/virt_famicom_controller2.png rename to Wiki/imgstore/virt_famicom_controller2.png diff --git a/UserManual/imgstore/virt_nes_controller.png b/Wiki/imgstore/virt_nes_controller.png similarity index 100% rename from UserManual/imgstore/virt_nes_controller.png rename to Wiki/imgstore/virt_nes_controller.png