allow disabling thread usage

Author: trillllian

src/asar/CMakeLists.txt

@@ -7,6 +7,7 @@ option(ASAR_GEN_EXE "Build Asar standalone application" ON)
 option(ASAR_GEN_DLL "Build Asar shared library" ON)
 option(ASAR_COVERAGE "Build Asar with coverage tracking support" ON)
 option(ASAR_GEN_LIB "Build Asar static library" ON)
+option(ASAR_USE_THREADS "Run Asar in a new thread to alleviate stack usage problems" ON)
 if (MSVC)
 	message(STATUS "In MSVC you can override MSVC_LIB_TYPE, valid values are D for dynamic and T for static")
 endif()
@@ -92,9 +93,11 @@ macro(set_asar_shared_properties target msvc_lib_type_param enable_sanitizer)
 		target_compile_definitions(${target} PRIVATE "linux")
 		target_compile_definitions(${target} PRIVATE "stricmp=strcasecmp")
 
-		set(THREADS_PREFER_PTHREAD_FLAG ON)
-		find_package(Threads REQUIRED)
-		target_link_libraries(${target} PRIVATE Threads::Threads)
+		if(ASAR_USE_THREADS)
+			set(THREADS_PREFER_PTHREAD_FLAG ON)
+			find_package(Threads REQUIRED)
+			target_link_libraries(${target} PRIVATE Threads::Threads)
+		endif()
 	endif()
 
 
@@ -136,6 +139,10 @@ macro(set_asar_shared_properties target msvc_lib_type_param enable_sanitizer)
 		# for some reason this isn't available on MSVC?
 		target_compile_features(${target} PRIVATE c_std_99)
 	endif()
+
+	if(NOT(ASAR_USE_THREADS))
+		target_compile_definitions(${target} PRIVATE NO_USE_THREADS)
+	endif()
 endmacro()
 
 

src/asar/asar.h

@@ -181,10 +181,12 @@ const char* get_current_block();
 const char* get_previous_file_name();
 int get_previous_file_line_no();
 
+#if !defined(NO_USE_THREADS) && !defined(RUN_VIA_THREAD)
 // RPG Hacker: This is currently disabled for debug builds, because it causes random crashes
 // when used in combination with -fsanitize=address.
-#if defined(_WIN32) && defined(NDEBUG)
-#	define RUN_VIA_FIBER
-#else
-#	define RUN_VIA_THREAD
+#  if defined(_WIN32) && defined(NDEBUG)
+#    define RUN_VIA_FIBER
+#  else
+#    define RUN_VIA_THREAD
+#  endif
 #endif

src/asar/interface-cli.cpp

@@ -545,19 +545,23 @@ int main(int argc, const char * argv[])
 
 		auto execute_patch = [&]()
 		{
-			for (pass=0;pass<3;pass++)
-			{
-				//pass 1: find which bank all labels are in, for label optimizations
-				//  freespaces are listed as above 0xFFFFFF, to find if it's in the ROM or if it's dynamic
-				//pass 2: find where exactly all labels are
-				//pass 3: assemble it all
-				initstuff();
-				assemblefile(asmname);
-				// RPG Hacker: Necessary, because finishpass() can throws warning and errors.
-				callstack_push cs_push(callstack_entry_type::FILE, filesystem->create_absolute_path(nullptr, asmname));
-				finishpass();
+			try {
+				for (pass=0;pass<3;pass++)
+				{
+					//pass 1: find which bank all labels are in, for label optimizations
+					//  freespaces are listed as above 0xFFFFFF, to find if it's in the ROM or if it's dynamic
+					//pass 2: find where exactly all labels are
+					//pass 3: assemble it all
+					initstuff();
+					assemblefile(asmname);
+					// RPG Hacker: Necessary, because finishpass() can throws warning and errors.
+					callstack_push cs_push(callstack_entry_type::FILE, filesystem->create_absolute_path(nullptr, asmname));
+					finishpass();
+				}
+				return true;
+			} catch(errfatal&) {
+				return false;
 			}
-			return true;
 		};
 #if defined(RUN_VIA_FIBER)
 		run_as_fiber(execute_patch);