Merge pull request #286 from ogamespec/master

Simplified uisimple.cpp
emu-russia · Aug 13, 2023 · 8777594 · 8777594
2 parents 8026d5c + 2a3ad12
commit 8777594
Show file tree

Hide file tree

Showing 17 changed files with 413 additions and 660 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,6 +68,7 @@ add_executable (pureikyubu
 	src/sym.cpp
 	src/tev.cpp
 	src/tx.cpp
+	src/uijdi.cpp
 	src/uisimple.cpp
 	src/utils.cpp
 	src/vi.cpp

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ make
 ./pureikyubu pong.dol
 ```
 
-Requirements: CMake, pthread, OpenGL, imgui, SDL2.
+Requirements: CMake, pthread, OpenGL, imgui, SDL2. If cmake says that some components cannot be built, you should look for solutions on the Internet (`apt get install xxx`) as usual.
 
 ## Progress
 

diff --git a/scripts/pureikyubu.vcxproj b/scripts/pureikyubu.vcxproj
@@ -80,6 +80,7 @@
     <ClInclude Include="..\src\tev.h" />
     <ClInclude Include="..\src\tx.h" />
     <ClInclude Include="..\src\ui.h" />
+    <ClInclude Include="..\src\uijdi.h" />
     <ClInclude Include="..\src\utils.h" />
     <ClInclude Include="..\src\vi.h" />
     <ClInclude Include="..\src\xf.h" />
@@ -97,19 +98,19 @@
     <ClCompile Include="..\src\bootrtc.cpp" />
     <ClCompile Include="..\src\config.cpp" />
     <ClCompile Include="..\src\cp.cpp" />
-    <ClCompile Include="..\src\cui.cpp">
+    <ClCompile Include="..\src\cui.cpp" />
+    <ClCompile Include="..\src\cuinull.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\src\cuinull.cpp">
+    <ClCompile Include="..\src\cui_imgui.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\src\cui_imgui.cpp" />
     <ClCompile Include="..\src\debug.cpp" />
     <ClCompile Include="..\src\debugui.cpp" />
     <ClCompile Include="..\src\di.cpp" />
@@ -159,6 +160,7 @@
     <ClCompile Include="..\src\tev.cpp" />
     <ClCompile Include="..\src\tx.cpp" />
     <ClCompile Include="..\src\ui.cpp" />
+    <ClCompile Include="..\src\uijdi.cpp" />
     <ClCompile Include="..\src\uisimple.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

diff --git a/scripts/pureikyubu.vcxproj.filters b/scripts/pureikyubu.vcxproj.filters
@@ -205,6 +205,9 @@
     <ClInclude Include="..\src\su.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\uijdi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\ai.cpp">
@@ -390,5 +393,8 @@
     <ClCompile Include="..\thirdparty\imgui\backends\imgui_impl_sdlrenderer2.cpp">
       <Filter>imgui</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\uijdi.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/src/ai.cpp b/src/ai.cpp
@@ -442,7 +442,7 @@ namespace Flipper
 	// ---------------------------------------------------------------------------
 
 	// AI DMA and DVD Audio are played uncompetitively from different streams.
-	// All work on Sample Rate Conversion and sound mixing for convenience is done in Mixer (AX.cpp).
+	// All work on Sample Rate Conversion and sound mixing for convenience is done in Mixer (audio.cpp).
 
 	static uint16_t AdjustVolume(uint16_t sampleValue, int volume)
 	{

diff --git a/src/debug.h b/src/debug.h
@@ -9,7 +9,7 @@ This component deals with the usual debugging tasks that all developers want to
 - Code profiling
 - Performance counters
 
-This component no longer has anything to do with the debug console. The debug console code has been moved to the category of user interfaces and moved to the UI\\Legacy folder.
+This component no longer has anything to do with the debug console. The debug console code has been moved to the category of user interfaces and moved to the debugui.cpp.
 
 ## Debug report notes
 

diff --git a/src/dvd.h b/src/dvd.h
@@ -14,7 +14,7 @@ This component is designed to emulate the DDU controller. DduCore provides a hos
 
 That is, DduCore honestly tries to process transactions via DDU Bus, various control signals (BRK, RST), as well as emulation of the DVD Audio stream.
 
-On the host side (/HW/DI.cpp), the DI part is implemented, which is responsible for transmitting a 12-byte DDU command and processing following transactions via the DDU Bus (in the Immediate buffer or Main Memory via DMA).
+On the host side (di.cpp), the DI part is implemented, which is responsible for transmitting a 12-byte DDU command and processing following transactions via the DDU Bus (in the Immediate buffer or Main Memory via DMA).
 
 If you are going to understand DduCore, just imagine that the DduCore API is just signals from the DDU connector (P9).
 

diff --git a/src/exi.cpp b/src/exi.cpp
@@ -16,8 +16,8 @@
 	RTC  : 32-bit counter of seconds, since current millenium
 	AD16 : This is most likely a debugging device called `Barnacle`.
 
-	memcard should be in another module (see MC.cpp)
-	broad band adapter should be in another module (see BBA.cpp)
+	memcard should be in another module (see memcard.cpp)
+	broad band adapter should be in another module (see bba.cpp)
 
 	EXI Device Map of dedicated MX Chip :
 	-------------------------------------

diff --git a/src/jdi.cpp b/src/jdi.cpp
@@ -320,7 +320,7 @@ namespace JDI
 		return value;
 	}
 
-	// Check whether the command is implemented using JDI. Used for compatibility with the old cmd.cpp implementation in the debugger.
+	// Check whether the command is implemented using JDI.
 	bool JdiHub::CommandExists(const std::string& cmd)
 	{
 		bool exists = false;

diff --git a/src/os.cpp b/src/os.cpp
@@ -889,7 +889,7 @@ void OSSaveContext(void)
 }
 
 // OSLoadContext return is patched as RFI (not usual BLR)
-// see Symbols.cpp, SYMSetHighlevel, line 97
+// see sym.cpp, SYMSetHighlevel, line 97
 void OSLoadContext(void)
 {
 	OSContext * c = (OSContext *)(&mi.ram[PARAM(0) & RAMMASK]);

diff --git a/src/pch.h b/src/pch.h
@@ -113,6 +113,7 @@ namespace Flipper
 
 #include "config.h"
 #include "main.h"
+#include "uijdi.h"
 #include "ui.h"
 
 #define _TB(s)

diff --git a/src/si.cpp b/src/si.cpp
@@ -8,11 +8,11 @@ SIControl si;
 // so all ERROR bits/status in SI regs are not used in emulator.
 
 // polling intervals are also not critical. all controllers are polled
-// before VI blank (in VI.cpp)
+// before VI blank (in vi.cpp)
 
 // SI_EXILK is not used (same as EXI clock timing, because of instant EXI transfers)
 
-// SI.cpp polling schematics :
+// si.cpp polling schematics :
 /*/
 	 -----
 	| OUT |