mk_clib_fuzz_constexpr

MarekKnapek · Dec 19, 2024 · a4dc055 · a4dc055
1 parent 1637ad0
commit a4dc055
Show file tree

Hide file tree

Showing 20 changed files with 252 additions and 69 deletions.
diff --git a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj
@@ -172,6 +172,7 @@
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_test.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_vc.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_fuzz.h"/>
+		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_fuzz_constexpr.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_test.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_abs.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_alignas.h"/>
@@ -906,6 +907,7 @@
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_test.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_vc.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_fuzz.c"/>
+		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_fuzz_constexpr.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_test.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_alignof_test.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_bi_info.c"/>

diff --git a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters
@@ -135,6 +135,7 @@
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_test.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_vc.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_fuzz.h"><Filter>src</Filter></ClInclude>
+		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_fuzz_constexpr.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_test.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_abs.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_alignas.h"><Filter>src</Filter></ClInclude>
@@ -874,6 +875,7 @@
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_bi_info.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_bi_test.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_bui_fuzz.c"><Filter>src</Filter></ClCompile>
+<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_fuzz_constexpr.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_bui_fuzz_str_offset_bin_n.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_bui_fuzz_str_offset_bin_w.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_lang_bui_fuzz_str_offset_dec_n.c"><Filter>src</Filter></ClCompile>

diff --git a/mk_clib/projects/vs2022/mkcf/mkcf.vcxproj b/mk_clib/projects/vs2022/mkcf/mkcf.vcxproj
@@ -19,7 +19,9 @@
 		</ProjectConfiguration>
 	</ItemGroup>
 	<ItemGroup>
-		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\app\mkcf.c"/>
+		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\app\mkcf.c">
+			<CompileAs>CompileAsCpp</CompileAs>
+		</ClCompile>
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
@@ -93,7 +95,8 @@
 			<ConformanceMode>true</ConformanceMode>
 			<MultiProcessorCompilation>true</MultiProcessorCompilation>
 			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -110,7 +113,8 @@
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
 			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -129,7 +133,8 @@
 			<ConformanceMode>true</ConformanceMode>
 			<MultiProcessorCompilation>true</MultiProcessorCompilation>
 			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -146,7 +151,8 @@
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
 			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>

diff --git a/mk_clib/projects/vs2022/mkct/mkct.vcxproj b/mk_clib/projects/vs2022/mkct/mkct.vcxproj
@@ -43,7 +43,9 @@
 		</ProjectConfiguration>
 	</ItemGroup>
 	<ItemGroup>
-		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\app\mkct.c"/>
+		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\app\mkct.c">
+			<CompileAs>CompileAsCpp</CompileAs>
+		</ClCompile>
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<VCProjectVersion>16.0</VCProjectVersion>
@@ -172,8 +174,9 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;mk_clib_test_smol_want=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -191,8 +194,9 @@
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -209,8 +213,9 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;mk_clib_test_smol_want=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -228,8 +233,9 @@
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -246,8 +252,9 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;mk_clib_test_smol_want=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -265,8 +272,9 @@
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -283,8 +291,9 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;mk_clib_test_smol_want=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -302,8 +311,9 @@
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -320,8 +330,9 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;mk_clib_test_smol_want=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>
@@ -339,8 +350,9 @@
 			<PreprocessorDefinitions>mk_lang_jumbo_want=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-			<LanguageStandard_C>stdc11</LanguageStandard_C>
-			<LanguageStandard>stdcpp14</LanguageStandard>
+			<LanguageStandard_C>stdc17</LanguageStandard_C>
+			<LanguageStandard>stdcpp20</LanguageStandard>
+			<AdditionalOptions>/constexpr:steps1073741824 %(AdditionalOptions)</AdditionalOptions>
 		</ClCompile>
 		<Link>
 			<SubSystem>Console</SubSystem>

diff --git a/mk_clib/src/mk_clib_app_fuzz.c b/mk_clib/src/mk_clib_app_fuzz.c
@@ -1,6 +1,7 @@
 #include "mk_clib_app_fuzz.h"
 
 #include "mk_clib_fuzz.h"
+#include "mk_clib_fuzz_constexpr.h"
 #include "mk_clib_test.h"
 #include "mk_lang_jumbo.h"
 #include "mk_lang_noexcept.h"
@@ -16,6 +17,7 @@ mk_lang_jumbo int mk_clib_app_fuzz(unsigned char const* const data, mk_lang_type
 	{
 		g_clib_app_fuzz_once = mk_lang_true;
 		mk_clib_test();
+		mk_clib_fuzz_constexpr();
 	}
 	mk_clib_fuzz(data, size);
 	return 0;

diff --git a/mk_clib/src/mk_clib_fuzz.c b/mk_clib/src/mk_clib_fuzz.c
@@ -1,11 +1,13 @@
 #include "mk_clib_fuzz.h"
 
-#include "mk_lang_bui_fuzz.h"
+#include "mk_lang_constexpr.h"
 #include "mk_lang_jumbo.h"
 #include "mk_lang_noexcept.h"
+#include "mk_lang_types.h"
+
+#include "mk_lang_bui_fuzz.h"
 #include "mk_lang_num_longdivmod_fuzz_bui.h"
 #include "mk_lang_num_longdivmod_fuzz_cui.h"
-#include "mk_lang_types.h"
 #include "mk_lib_crypto_alg_aes_fuzz.h"
 #include "mk_lib_crypto_alg_des_fuzz.h"
 #include "mk_lib_crypto_alg_serpent_fuzz.h"
@@ -24,17 +26,14 @@
 #endif
 
 
-mk_lang_jumbo void mk_clib_fuzz(unsigned char const* const data, mk_lang_types_usize_t const size) mk_lang_noexcept
+mk_lang_constexpr mk_lang_jumbo void mk_clib_fuzz(unsigned char const* const data, mk_lang_types_usize_t const size) mk_lang_noexcept
 {
 	mk_lang_bui_fuzz(data, size);
 	mk_lang_num_longdivmod_fuzz_bui(data, size);
 	mk_lang_num_longdivmod_fuzz_cui(data, size);
 	mk_lib_crypto_alg_aes_fuzz(data, size);
 	mk_lib_crypto_alg_des_fuzz(data, size);
 	mk_lib_crypto_alg_serpent_fuzz(data, size);
-	#if(!(defined __GNUC__ && defined __GNUC_MINOR__))
-	mk_lib_crypto_alg_tdes2_fuzz(data, size);
-	#endif
 	mk_lib_crypto_alg_tdes3_fuzz(data, size);
 	mk_lib_crypto_alg_twofish_fuzz(data, size);
 	mk_lib_crypto_xof_stream_blake3_fuzz(data, size);
@@ -43,6 +42,10 @@ mk_lang_jumbo void mk_clib_fuzz(unsigned char const* const data, mk_lang_types_u
 	mk_lib_fmt_fuzz(data, size);
 	mk_sl_sort_merge_fuzz(data, size);
 
+	#if(!(defined __GNUC__ && defined __GNUC_MINOR__))
+	mk_lib_crypto_alg_tdes2_fuzz(data, size);
+	#endif
+
 	#if defined mk_clib_test_smol_want && mk_clib_test_smol_want == 1
 	#else
 	mk_sl_flt_fuzz(data, size);

diff --git a/mk_clib/src/mk_clib_fuzz.h b/mk_clib/src/mk_clib_fuzz.h
@@ -2,12 +2,13 @@
 #define mk_include_guard_mk_clib_fuzz
 
 
+#include "mk_lang_constexpr.h"
 #include "mk_lang_jumbo.h"
 #include "mk_lang_noexcept.h"
 #include "mk_lang_types.h"
 
 
-mk_lang_jumbo void mk_clib_fuzz(unsigned char const* const data, mk_lang_types_usize_t const size) mk_lang_noexcept;
+mk_lang_constexpr mk_lang_jumbo void mk_clib_fuzz(unsigned char const* const data, mk_lang_types_usize_t const size) mk_lang_noexcept;
 
 
 #if mk_lang_jumbo_want == 1