Merge pull request hrydgard#13497 from hrydgard/move-native-util-to-c…

…ommon Move native util to common
sum2012 · Oct 4, 2020 · 1fb47d4 · 1fb47d4
2 parents 5c9b7bb + de3b460
commit 1fb47d4
Show file tree

Hide file tree

Showing 193 changed files with 585 additions and 797 deletions.
diff --git a/.gitignore b/.gitignore
@@ -116,3 +116,6 @@ debian/ppsspp/
 
 # RenderDoc
 *.rdc
+
+# bad output from libretro. don't want to accidentally add it
+nul
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -433,6 +433,27 @@ add_library(Common STATIC
 	Common/Crypto/sha1.h
 	Common/Crypto/sha256.cpp
 	Common/Crypto/sha256.h
+	Common/Data/Collections/ConstMap.h
+	Common/Data/Collections/TinySet.h
+	Common/Data/Color/RGBAUtil.cpp
+	Common/Data/Color/RGBAUtil.h
+	Common/Data/Encoding/Base64.cpp
+	Common/Data/Encoding/Base64.h
+	Common/Data/Encoding/Compression.cpp
+	Common/Data/Encoding/Compression.h
+	Common/Data/Encoding/Shiftjis.h
+	Common/Data/Encoding/Utf8.cpp
+	Common/Data/Encoding/Utf8.h
+	Common/Data/Encoding/Utf16.h
+	Common/Data/Hash/Hash.cpp
+	Common/Data/Hash/Hash.h
+	Common/Data/Text/I18n.cpp
+	Common/Data/Text/I18n.h
+	Common/Data/Text/Parsers.cpp
+	Common/Data/Text/Parsers.h
+	Common/Data/Text/WrapText.cpp
+	Common/Data/Text/WrapText.h
+	Common/Data/Random/Rng.h
 	Common/Input/GestureDetector.cpp
 	Common/Input/GestureDetector.h
 	Common/Input/KeyCodes.h
@@ -957,14 +978,8 @@ endif()
 
 add_library(native STATIC
 	${nativeExtra}
-	ext/native/base/colorutil.cpp
-	ext/native/base/colorutil.h
 	ext/native/base/display.cpp
 	ext/native/base/display.h
-	ext/native/data/base64.cpp
-	ext/native/data/base64.h
-	ext/native/data/compression.cpp
-	ext/native/data/compression.h
 	ext/native/file/chunk_file.cpp
 	ext/native/file/chunk_file.h
 	ext/native/file/fd_util.cpp
@@ -1005,8 +1020,6 @@ add_library(native STATIC
 	ext/native/gfx_es2/glsl_program.h
 	ext/native/gfx_es2/gl3stub.c
 	ext/native/gfx_es2/gl3stub.h
-	ext/native/i18n/i18n.cpp
-	ext/native/i18n/i18n.h
 	ext/native/image/png_load.cpp
 	ext/native/image/png_load.h
 	ext/native/image/zim_load.cpp
@@ -1069,17 +1082,6 @@ add_library(native STATIC
 	ext/native/ui/view.h
 	ext/native/ui/viewgroup.cpp
 	ext/native/ui/viewgroup.h
-	ext/native/util/hash/hash.cpp
-	ext/native/util/hash/hash.h
-	ext/native/util/random/rng.h
-	ext/native/util/text/utf8.h
-	ext/native/util/text/utf8.cpp
-	ext/native/util/text/parsers.h
-	ext/native/util/text/parsers.cpp
-	ext/native/util/text/wrap_text.h
-	ext/native/util/text/wrap_text.cpp
-	ext/native/util/const_map.h
-	ext/native/util/tiny_set.h
 	ext/jpge/jpgd.cpp
 	ext/jpge/jpgd.h
 	ext/jpge/jpge.cpp
@@ -1096,7 +1098,7 @@ if(ANDROID)
 	set(ATOMIC_LIB atomic)
 endif()
 
-target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARY} gason udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB})
+target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARY} gason udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB} Common)
 if(TARGET Ext::GLEW)
 	target_link_libraries(native Ext::GLEW)
 endif()

diff --git a/Common/ArmCPUDetect.cpp b/Common/ArmCPUDetect.cpp
@@ -26,7 +26,7 @@
 #include "CPUDetect.h"
 #include "StringUtils.h"
 #include "FileUtil.h"
-#include "util/text/utf8.h"
+#include "Common/Data/Encoding/Utf8.h"
 
 #if PPSSPP_PLATFORM(WINDOWS) 
 #if PPSSPP_PLATFORM(UWP)

diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
@@ -359,6 +359,19 @@
     <ClInclude Include="BitScan.h" />
     <ClInclude Include="BitSet.h" />
     <ClInclude Include="Buffer.h" />
+    <ClInclude Include="Data\Collections\ConstMap.h" />
+    <ClInclude Include="Data\Collections\TinySet.h" />
+    <ClInclude Include="Data\Color\RGBAUtil.h" />
+    <ClInclude Include="Data\Encoding\Base64.h" />
+    <ClInclude Include="Data\Encoding\Compression.h" />
+    <ClInclude Include="Data\Encoding\Shiftjis.h" />
+    <ClInclude Include="Data\Encoding\Utf16.h" />
+    <ClInclude Include="Data\Encoding\Utf8.h" />
+    <ClInclude Include="Data\Hash\Hash.h" />
+    <ClInclude Include="Data\Random\Rng.h" />
+    <ClInclude Include="Data\Text\I18n.h" />
+    <ClInclude Include="Data\Text\Parsers.h" />
+    <ClInclude Include="Data\Text\WrapText.h" />
     <ClInclude Include="FakeEmitter.h" />
     <ClInclude Include="Input\GestureDetector.h" />
     <ClInclude Include="Input\InputState.h" />
@@ -614,6 +627,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="Data\Color\RGBAUtil.cpp" />
+    <ClCompile Include="Data\Encoding\Base64.cpp" />
+    <ClCompile Include="Data\Encoding\Compression.cpp" />
+    <ClCompile Include="Data\Encoding\Utf8.cpp" />
+    <ClCompile Include="Data\Hash\Hash.cpp" />
+    <ClCompile Include="Data\Text\I18n.cpp" />
+    <ClCompile Include="Data\Text\Parsers.cpp" />
+    <ClCompile Include="Data\Text\WrapText.cpp" />
     <ClCompile Include="Input\GestureDetector.cpp" />
     <ClCompile Include="Input\InputState.cpp" />
     <ClCompile Include="Log.cpp" />

diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
@@ -137,6 +137,45 @@
     <ClInclude Include="Input\KeyCodes.h">
       <Filter>Input</Filter>
     </ClInclude>
+    <ClInclude Include="Data\Random\Rng.h">
+      <Filter>Data\Random</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Text\I18n.h">
+      <Filter>Data\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Text\Parsers.h">
+      <Filter>Data\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Text\WrapText.h">
+      <Filter>Data\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Encoding\Base64.h">
+      <Filter>Data\Encoding</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Encoding\Compression.h">
+      <Filter>Data\Encoding</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Encoding\Shiftjis.h">
+      <Filter>Data\Encoding</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Encoding\Utf8.h">
+      <Filter>Data\Encoding</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Encoding\Utf16.h">
+      <Filter>Data\Encoding</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Hash\Hash.h">
+      <Filter>Data\Hash</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Collections\ConstMap.h">
+      <Filter>Data\Collections</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Collections\TinySet.h">
+      <Filter>Data\Collections</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Color\RGBAUtil.h">
+      <Filter>Data\Color</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ABI.cpp" />
@@ -270,6 +309,30 @@
     <ClCompile Include="Input\InputState.cpp">
       <Filter>Input</Filter>
     </ClCompile>
+    <ClCompile Include="Data\Text\I18n.cpp">
+      <Filter>Data\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Data\Text\Parsers.cpp">
+      <Filter>Data\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Data\Text\WrapText.cpp">
+      <Filter>Data\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="Data\Encoding\Base64.cpp">
+      <Filter>Data\Encoding</Filter>
+    </ClCompile>
+    <ClCompile Include="Data\Encoding\Compression.cpp">
+      <Filter>Data\Encoding</Filter>
+    </ClCompile>
+    <ClCompile Include="Data\Encoding\Utf8.cpp">
+      <Filter>Data\Encoding</Filter>
+    </ClCompile>
+    <ClCompile Include="Data\Hash\Hash.cpp">
+      <Filter>Data\Hash</Filter>
+    </ClCompile>
+    <ClCompile Include="Data\Color\RGBAUtil.cpp">
+      <Filter>Data\Color</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">
@@ -299,6 +362,27 @@
     <Filter Include="Input">
       <UniqueIdentifier>{fd0bac4f-e3e2-4201-8902-2d19b50d5bf7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Data">
+      <UniqueIdentifier>{072c36eb-a283-40b2-b8b1-02ec57d3bbae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Data\Collections">
+      <UniqueIdentifier>{a162915f-e53a-4f42-a222-e863235a2d37}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Data\Hash">
+      <UniqueIdentifier>{891eae07-622d-46d5-9fc6-a4c320649eb9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Data\Encoding">
+      <UniqueIdentifier>{0bd9bfae-7d4e-4f54-9aae-8fb11ab8c999}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Data\Random">
+      <UniqueIdentifier>{16fc7858-b6db-4eb2-bd4c-1354ffacda5f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Data\Text">
+      <UniqueIdentifier>{c2d25b54-23fc-4e80-8d9b-5d7e94fe557e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Data\Color">
+      <UniqueIdentifier>{1ada1f0f-6f1c-4bf2-8450-1fc63d77da17}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\ext\libpng17\CMakeLists.txt">

diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp
@@ -33,7 +33,7 @@
 
 #include "ppsspp_config.h"
 #include "Common/Thread/ThreadUtil.h"
-#include "util/text/utf8.h"
+#include "Common/Data/Encoding/Utf8.h"
 #include "Common/Common.h"
 #include "Common/ConsoleListener.h"
 #include "Common/StringUtils.h"

diff --git a/ext/native/util/const_map.h → Common/Data/Collections/ConstMap.h b/ext/native/util/const_map.h → Common/Data/Collections/ConstMap.h
diff --git a/ext/native/util/tiny_set.h → Common/Data/Collections/TinySet.h b/ext/native/util/tiny_set.h → Common/Data/Collections/TinySet.h
diff --git a/ext/native/base/colorutil.cpp → Common/Data/Color/RGBAUtil.cpp b/ext/native/base/colorutil.cpp → Common/Data/Color/RGBAUtil.cpp
@@ -1,4 +1,4 @@
-#include "base/colorutil.h"
+#include "Common/Data/Color/RGBAUtil.h"
 
 template <typename T>
 static T clamp(T f, T low, T high) {

diff --git a/ext/native/base/colorutil.h → Common/Data/Color/RGBAUtil.h b/ext/native/base/colorutil.h → Common/Data/Color/RGBAUtil.h
diff --git a/ext/native/data/base64.cpp → Common/Data/Encoding/Base64.cpp b/ext/native/data/base64.cpp → Common/Data/Encoding/Base64.cpp
@@ -1,4 +1,4 @@
-#include "data/base64.h"
+#include "Common/Data/Encoding/Base64.h"
 
 // TODO: This is a simple but not very efficient implementation.
 std::string Base64Encode(const uint8_t *p, size_t sz) {

diff --git a/ext/native/data/base64.h → Common/Data/Encoding/Base64.h b/ext/native/data/base64.h → Common/Data/Encoding/Base64.h
diff --git a/ext/native/data/compression.cpp → Common/Data/Encoding/Compression.cpp b/ext/native/data/compression.cpp → Common/Data/Encoding/Compression.cpp
diff --git a/ext/native/data/compression.h → Common/Data/Encoding/Compression.h b/ext/native/data/compression.h → Common/Data/Encoding/Compression.h
diff --git a/ext/native/util/text/shiftjis.h → Common/Data/Encoding/Shiftjis.h b/ext/native/util/text/shiftjis.h → Common/Data/Encoding/Shiftjis.h
diff --git a/ext/native/util/text/utf16.h → Common/Data/Encoding/Utf16.h b/ext/native/util/text/utf16.h → Common/Data/Encoding/Utf16.h
diff --git a/ext/native/util/text/utf8.cpp → Common/Data/Encoding/Utf8.cpp b/ext/native/util/text/utf8.cpp → Common/Data/Encoding/Utf8.cpp
@@ -27,8 +27,8 @@
 #include <algorithm>
 #include <string>
 
-#include "utf8.h"
-#include "utf16.h"
+#include "Common/Data/Encoding/Utf8.h"
+#include "Common/Data/Encoding/Utf16.h"
 
 // is start of UTF sequence
 inline bool isutf(char c) {

diff --git a/ext/native/util/text/utf8.h → Common/Data/Encoding/Utf8.h b/ext/native/util/text/utf8.h → Common/Data/Encoding/Utf8.h
diff --git a/ext/native/util/hash/hash.cpp → Common/Data/Hash/Hash.cpp b/ext/native/util/hash/hash.cpp → Common/Data/Hash/Hash.cpp
@@ -1,5 +1,5 @@
 #include <cstdint>
-#include "util/hash/hash.h"
+#include "Common/Data/Hash/Hash.h"
 
 namespace hash {
 

diff --git a/ext/native/util/hash/hash.h → Common/Data/Hash/Hash.h b/ext/native/util/hash/hash.h → Common/Data/Hash/Hash.h
diff --git a/ext/native/util/random/rng.h → Common/Data/Random/Rng.h b/ext/native/util/random/rng.h → Common/Data/Random/Rng.h
diff --git a/ext/native/i18n/i18n.cpp → Common/Data/Text/I18n.cpp b/ext/native/i18n/i18n.cpp → Common/Data/Text/I18n.cpp
@@ -1,4 +1,4 @@
-#include "i18n/i18n.h"
+#include "Common/Data/Text/I18n.h"
 #include "file/ini_file.h"
 #include "file/vfs.h"
 

diff --git a/ext/native/i18n/i18n.h → Common/Data/Text/I18n.h b/ext/native/i18n/i18n.h → Common/Data/Text/I18n.h
diff --git a/ext/native/util/text/parsers.cpp → Common/Data/Text/Parsers.cpp b/ext/native/util/text/parsers.cpp → Common/Data/Text/Parsers.cpp
@@ -2,7 +2,7 @@
 #include <cstdio>
 #include <string>
 
-#include "util/text/parsers.h"
+#include "Common/Data/Text/Parsers.h"
 
 #include "Common/StringUtils.h"
 

diff --git a/ext/native/util/text/parsers.h → Common/Data/Text/Parsers.h b/ext/native/util/text/parsers.h → Common/Data/Text/Parsers.h
diff --git a/ext/native/util/text/wrap_text.cpp → Common/Data/Text/WrapText.cpp b/ext/native/util/text/wrap_text.cpp → Common/Data/Text/WrapText.cpp
@@ -1,7 +1,7 @@
 #include <cstring>
 #include "gfx_es2/draw_buffer.h"
-#include "util/text/utf8.h"
-#include "util/text/wrap_text.h"
+#include "Common/Data/Encoding/Utf8.h"
+#include "Common/Data/Text/WrapText.h"
 
 bool WordWrapper::IsCJK(uint32_t c) {
 	if (c < 0x1000) {

diff --git a/ext/native/util/text/wrap_text.h → Common/Data/Text/WrapText.h b/ext/native/util/text/wrap_text.h → Common/Data/Text/WrapText.h
diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp
@@ -60,7 +60,7 @@
 #endif  // !defined(IOS)
 #endif  // __APPLE__
 
-#include "util/text/utf8.h"
+#include "Common/Data/Encoding/Utf8.h"
 
 #include <sys/stat.h>
 

diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
@@ -24,11 +24,11 @@
 #include "CommonWindows.h"
 #endif
 
+#include "ppsspp_config.h"
+
 #include "base/NativeApp.h"
 #include "file/ini_file.h"
 #include "Common/Input/InputState.h"
-#include "ppsspp_config.h"
-
 #include "Common/Log.h"
 #include "Common/KeyMap.h"
 #include "Common/StringUtils.h"

diff --git a/Common/Log.cpp b/Common/Log.cpp
@@ -22,7 +22,7 @@
 #include "Common.h"
 #include "Common/Log.h"
 #include "StringUtils.h"
-#include "util/text/utf8.h"
+#include "Common/Data/Encoding/Utf8.h"
 
 #if PPSSPP_PLATFORM(ANDROID)
 #include <android/log.h>

diff --git a/Common/LogManager.cpp b/Common/LogManager.cpp
@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <cstring>
 
-#include "util/text/utf8.h"
+#include "Common/Data/Encoding/Utf8.h"
 
 #include "Common/LogManager.h"
 #include "Common/ConsoleListener.h"

diff --git a/Common/SysError.cpp b/Common/SysError.cpp
@@ -18,7 +18,7 @@
 #include <cstring>
 #include <string>
 
-#include "util/text/utf8.h"
+#include "Common/Data/Encoding/Utf8.h"
 #include "SysError.h"
 
 #ifdef _WIN32

diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -26,11 +26,11 @@
 #include "base/display.h"
 #include "base/NativeApp.h"
 #include "file/ini_file.h"
-#include "i18n/i18n.h"
+#include "Common/Data/Text/I18n.h"
 #include "json/json_reader.h"
 #include "gfx_es2/gpu_features.h"
 #include "net/http_client.h"
-#include "util/text/parsers.h"
+#include "Common/Data/Text/Parsers.h"
 #include "net/url.h"
 
 #include "Common/CPUDetect.h"

diff --git a/Core/CwCheat.cpp b/Core/CwCheat.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
 #include <cctype>
 #include <cstdint>
-#include "i18n/i18n.h"
+#include "Common/Data/Text/I18n.h"
 #include "Common/StringUtils.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
@@ -19,7 +19,7 @@
 #include "GPU/Common/PostShader.h"
 
 #ifdef _WIN32
-#include "util/text/utf8.h"
+#include "Common/Data/Encoding/Utf8.h"
 #endif
 
 static int CheatEvent = -1;

diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp
@@ -31,7 +31,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "util/text/utf8.h"
+#include "Common/Data/Encoding/Utf8.h"
 #include "zlib.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"

diff --git a/Core/Debugger/WebSocket/DisasmSubscriber.cpp b/Core/Debugger/WebSocket/DisasmSubscriber.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cctype>
 
-#include "util/text/utf8.h"
+#include "Common/Data/Encoding/Utf8.h"
 
 #include "Common/StringUtils.h"
 #include "Core/Debugger/Breakpoints.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,3 +116,6 @@ debian/ppsspp/ @@
     # RenderDoc
     *.rdc
+    # bad output from libretro. don't want to accidentally add it
+    nul