Merge branch 'improve_crc_logging_ea' into headless_sh

Author: helmutbuhler

Core/CMakeLists.txt

@@ -1,7 +1,12 @@
 # c stands for core, i stands for Interface
 add_library(corei_libraries_include INTERFACE)
+add_library(corei_always INTERFACE)
 
 target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
+target_link_libraries(corei_always INTERFACE
+    core_utility
+    corei_libraries_include
+)
 
 # Do we want to build extra SDK stuff or just the game binary?
 option(RTS_BUILD_CORE_TOOLS "Build core tools" ON)

Core/Libraries/Source/Compression/CMakeLists.txt

@@ -1,22 +1,22 @@
 set(COMPRESSION_SRC
+    Compression.h
+    CompressionManager.cpp
     EAC/btreeabout.cpp
+    EAC/btreecodex.h
     EAC/btreedecode.cpp
     EAC/btreeencode.cpp
+    EAC/codex.h
+    EAC/gimex.h
     EAC/huffabout.cpp
+    EAC/huffcodex.h
     EAC/huffdecode.cpp
     EAC/huffencode.cpp
     EAC/refabout.cpp
+    EAC/refcodex.h
     EAC/refdecode.cpp
     EAC/refencode.cpp
-    EAC/btreecodex.h
-    EAC/codex.h
-    EAC/gimex.h
-    EAC/huffcodex.h
-    EAC/refcodex.h
     LZHCompress/NoxCompress.cpp
     LZHCompress/NoxCompress.h
-    CompressionManager.cpp
-    Compression.h
 )
 
 add_library(core_compression STATIC)

Core/Libraries/Source/Compression/CompressionManager.cpp

@@ -37,6 +37,7 @@ extern "C" {
 //#pragma message("************************************** WARNING, optimization disabled for debugging purposes")
 #endif
 
+// TheSuperHackers @todo Recover debug logging in this file?
 #define DEBUG_LOG(x) {}
 
 const char *CompressionManager::getCompressionNameByType( CompressionType compType )
@@ -328,10 +329,6 @@ Int CompressionManager::decompressData( void *srcVoid, Int srcLen, void *destVoi
 
 	if (compType >= COMPRESSION_ZLIB1 && compType <= COMPRESSION_ZLIB9)
 	{
-#ifdef DEBUG_LOGGING
-		Int level = compType - COMPRESSION_ZLIB1 + 1; // 1-9
-#endif
-
 		unsigned long outLen = destLen;
 		Int err = z_uncompress(dest, &outLen, src+8, srcLen-8);
 		if (err == Z_OK || err == Z_STREAM_END)
@@ -340,7 +337,8 @@ Int CompressionManager::decompressData( void *srcVoid, Int srcLen, void *destVoi
 		}
 		else
 		{
-			DEBUG_LOG(("ZLib decompression error (src is level %d, %d bytes long) %d\n", level, srcLen, err));
+			DEBUG_LOG(("ZLib decompression error (src is level %d, %d bytes long) %d\n",
+				compType - COMPRESSION_ZLIB1 + 1 /* 1-9 */, srcLen, err));
 			return 0;
 		}
 	}

Core/Tools/Compress/CMakeLists.txt

@@ -10,7 +10,7 @@ target_sources(core_compress PRIVATE ${COMRPESS_SRC})
 target_link_libraries(core_compress PRIVATE
     core_config
     core_compression
-    zi_always
+    corei_always
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")

Dependencies/Utility/Utility/intrin_compat.h

@@ -87,11 +87,12 @@ static inline uint32_t _lrotl(uint32_t value, int shift)
 #ifdef _WIN32
 #include <intrin.h>
 #pragma intrinsic(__rdtsc)
-#endif
-
+#endif // _WIN32
+#endif // _rdtsc
+#ifndef _rdtsc
 static inline uint64_t _rdtsc()
 {
-#if _WIN32
+#ifdef _WIN32
     return __rdtsc();
 #elif defined(__has_builtin) && __has_builtin(__builtin_readcyclecounter)
     return __builtin_readcyclecounter();
@@ -101,9 +102,9 @@ static inline uint64_t _rdtsc()
 #error "No implementation for _rdtsc"
 #endif
 }
-#endif
+#endif // _rdtsc
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include <intrin.h>
 #pragma intrinsic(_ReturnAddress)
 #elif defined(__has_builtin)
@@ -132,17 +133,20 @@ static inline uint64_t _rdtsc()
 #endif
 
 #ifndef cpuid
-#if defined(_MSC_VER)
+#if (defined _M_IX86 || defined _M_X64 || defined __i386__ || defined __amd64__)
+#ifdef _WIN32
 #include <intrin.h>
 #define cpuid(regs, cpuid_type) __cpuid(reinterpret_cast<int *>(regs), cpuid_type)
-#elif (defined __clang__ || defined __GNUC__) && (defined __i386__ || defined __amd64__)
+#elif (defined __clang__ || defined __GNUC__)
 #include <cpuid.h>
 #define cpuid(regs, cpuid_type) __cpuid(cpuid_type, regs[0], regs[1], regs[2], regs[3])
-#else
-/* Just return 0 for everything if its not x86 */
+#endif
+#endif // (defined _M_IX86 || defined _M_X64 || defined __i386__ || defined __amd64__)
+#endif // cpuid
+#ifndef cpuid
+/* Just return 0 for everything if its not x86 or as fallback */
 #include <string.h>
 #define cpuid(regs, cpuid_type) memset(regs, 0, 16)
-#endif
-#endif //cpuid
+#endif // cpuid
 
-#endif // defined(_MSC_VER) && _MSC_VER < 1300
+#endif // !(defined(_MSC_VER) && _MSC_VER < 1300)