Merge pull request #466 from ogamespec/main

Reorganized source tree

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

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;

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

Breaknes/BreaknesSDL/BreaknesSDL.vcxproj

@@ -149,13 +149,13 @@
     <ProjectReference Include="..\BreaksCore\Scripts\VS2022\BreaksCoreStatic.vcxproj">
       <Project>{59610324-ce90-474c-89f1-8a998c52b346}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\Breaks6502\M6502Core\Scripts\VS2022\M6502Core.vcxproj">
+    <ProjectReference Include="..\..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj">
       <Project>{75210c0a-a812-4246-a179-b50d8a25a121}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\BreaksAPU\APUSim\Scripts\VS2022\APUSim.vcxproj">
+    <ProjectReference Include="..\..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj">
       <Project>{50e93d78-36dc-46c3-82ea-cab373e18729}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\BreaksPPU\PPUSim\Scripts\VS2022\PPUSim.vcxproj">
+    <ProjectReference Include="..\..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj">
       <Project>{ebd9b3eb-3c04-43ed-b454-e9442b21f5a0}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\Common\BaseBoardLib\Scripts\VS2022\BaseBoardLib.vcxproj">

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,15 +46,15 @@ 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).
 
 ### APUPlayer Board
 
 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
 

Breaknes/BreaksCore/Scripts/VS2022/BreaksCore.vcxproj

@@ -19,8 +19,8 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\Breaks6502\Breakasm\ASM.cpp" />
-    <ClCompile Include="..\..\..\..\Breaks6502\Breakasm\ASMOPS.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\ASM.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\ASMOPS.cpp" />
     <ClCompile Include="..\..\AbstractBoard.cpp" />
     <ClCompile Include="..\..\APUPlayerBoard.cpp" />
     <ClCompile Include="..\..\APUPlayerBoardDebug.cpp" />
@@ -45,8 +45,8 @@
     <ClCompile Include="..\..\SignalDefs.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\Breaks6502\Breakasm\ASM.h" />
-    <ClInclude Include="..\..\..\..\Breaks6502\Breakasm\ASMOPS.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\ASM.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\ASMOPS.h" />
     <ClInclude Include="..\..\AbstractBoard.h" />
     <ClInclude Include="..\..\APUPlayerBoard.h" />
     <ClInclude Include="..\..\BoardFactory.h" />
@@ -65,13 +65,13 @@
     <None Include="..\..\Readme.md" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Breaks6502\M6502Core\Scripts\VS2022\M6502Core.vcxproj">
+    <ProjectReference Include="..\..\..\..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj">
       <Project>{75210c0a-a812-4246-a179-b50d8a25a121}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\BreaksAPU\APUSim\Scripts\VS2022\APUSim.vcxproj">
+    <ProjectReference Include="..\..\..\..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj">
       <Project>{50e93d78-36dc-46c3-82ea-cab373e18729}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\BreaksPPU\PPUSim\Scripts\VS2022\PPUSim.vcxproj">
+    <ProjectReference Include="..\..\..\..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj">
       <Project>{ebd9b3eb-3c04-43ed-b454-e9442b21f5a0}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Common\BaseBoardLib\Scripts\VS2022\BaseBoardLib.vcxproj">

Breaknes/BreaksCore/Scripts/VS2022/BreaksCoreStatic.vcxproj

@@ -19,8 +19,8 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\Breaks6502\Breakasm\ASM.cpp" />
-    <ClCompile Include="..\..\..\..\Breaks6502\Breakasm\ASMOPS.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\ASM.cpp" />
+    <ClCompile Include="..\..\..\..\Tools\Breakasm\ASMOPS.cpp" />
     <ClCompile Include="..\..\AbstractBoard.cpp" />
     <ClCompile Include="..\..\APUPlayerBoard.cpp" />
     <ClCompile Include="..\..\APUPlayerBoardDebug.cpp" />
@@ -44,8 +44,8 @@
     <ClCompile Include="..\..\SignalDefs.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\Breaks6502\Breakasm\ASM.h" />
-    <ClInclude Include="..\..\..\..\Breaks6502\Breakasm\ASMOPS.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\ASM.h" />
+    <ClInclude Include="..\..\..\..\Tools\Breakasm\ASMOPS.h" />
     <ClInclude Include="..\..\AbstractBoard.h" />
     <ClInclude Include="..\..\APUPlayerBoard.h" />
     <ClInclude Include="..\..\BoardFactory.h" />
@@ -64,13 +64,13 @@
     <None Include="..\..\Readme.md" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Breaks6502\M6502Core\Scripts\VS2022\M6502Core.vcxproj">
+    <ProjectReference Include="..\..\..\..\Chips\M6502Core\Scripts\VS2022\M6502Core.vcxproj">
       <Project>{75210c0a-a812-4246-a179-b50d8a25a121}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\BreaksAPU\APUSim\Scripts\VS2022\APUSim.vcxproj">
+    <ProjectReference Include="..\..\..\..\Chips\APUSim\Scripts\VS2022\APUSim.vcxproj">
       <Project>{50e93d78-36dc-46c3-82ea-cab373e18729}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\BreaksPPU\PPUSim\Scripts\VS2022\PPUSim.vcxproj">
+    <ProjectReference Include="..\..\..\..\Chips\PPUSim\Scripts\VS2022\PPUSim.vcxproj">
       <Project>{ebd9b3eb-3c04-43ed-b454-e9442b21f5a0}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Common\BaseBoardLib\Scripts\VS2022\BaseBoardLib.vcxproj">

Breaknes/BreaksCore/pch.h

@@ -11,8 +11,8 @@
 #include <Windows.h>
 #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
 

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

BreaksAPU/APUSim/pch.h → Chips/APUSim/pch.h

@@ -5,6 +5,6 @@
 #include <cstdio>
 
 #include "../../Common/BaseLogicLib/BaseLogic.h"
-#include "../../Breaks6502/M6502Core/core.h"
+#include "../../Chips/M6502Core/core.h"
 
 #include "apu.h"

BreaksAPU/FastAPU/pch.h → Chips/FastAPU/pch.h

@@ -5,6 +5,6 @@
 #include <cstdio>
 
 #include "../../Common/BaseLogicLib/BaseLogic.h"
-#include "../../Breaks6502/M6502Core/core.h"
+#include "../../Chips/M6502Core/core.h"
 
 #include "apu.h"

Chips/Readme.md

@@ -0,0 +1,3 @@
+# Chips
+
+This is where the functional simulators of large chips and cores are located.

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.

Common/BaseBoardLib/pch.h

@@ -6,7 +6,7 @@
 #include <cassert>
 
 #include "../BaseLogicLib/BaseLogic.h"
-#include "../../Breaks6502/M6502Core/core.h"
+#include "../../Chips/M6502Core/core.h"
 
 #include "LS139.h"
 #include "LS368.h"