format inc files

Author: Xor-el

HashLib/src/Include/HashLib.inc

@@ -20,19 +20,13 @@
   {$IF CompilerVersion < 21.0}
     {$MESSAGE ERROR 'This Library requires Delphi 2010 or higher.'}
   {$IFEND}
-  
+
   {$DEFINE DELPHI}
 
   {$DEFINITIONINFO ON} // Enable code browsing (Ctrl+Click)
   {$STRINGCHECKS OFF}
   {$WARN DUPLICATE_CTOR_DTOR OFF}
 
-  {$DEFINE HASHLIB_LITTLE_ENDIAN}
-
-  {$IFDEF CPUARM}
-    {$DEFINE HASHLIB_REQUIRES_PROPER_ALIGNMENT}
-  {$ENDIF}
-
   {$DEFINE USE_UNROLLED_VARIANT}
 
   {$IF CompilerVersion >= 25.0}
@@ -43,21 +37,27 @@
     {$DEFINE HASHLIB_USE_PPL} // Use Parallel Programming Library
   {$IFEND}
 
-  {============================== CPU Architecture ==============================}
+  {============================= CPU Architecture =============================}
+
+  {$DEFINE HASHLIB_LITTLE_ENDIAN}
+
+  {$IFDEF CPUARM}
+    {$DEFINE HASHLIB_REQUIRES_PROPER_ALIGNMENT}
+  {$ENDIF}
 
-  {$IF DEFINED(CPU386)}
+  {$IFDEF CPU386}
     {$DEFINE HASHLIB_I386}
     {$IFDEF MSWINDOWS}
       {$DEFINE HASHLIB_I386_ASM}
     {$ENDIF}
-  {$IFEND}
+  {$ENDIF}
 
-  {$IF DEFINED(CPUX64)}
+  {$IFDEF CPUX64}
     {$DEFINE HASHLIB_X86_64}
     {$IFDEF MSWINDOWS}
       {$DEFINE HASHLIB_X86_64_ASM}
     {$ENDIF}
-  {$IFEND}
+  {$ENDIF}
 
   {$IFDEF CPUARM32}
     {$DEFINE HASHLIB_ARM32}
@@ -67,7 +67,7 @@
     {$DEFINE HASHLIB_AARCH64}
   {$ENDIF}
 
-  {================================= Target OS ==================================}
+  {================================ Target OS =================================}
 
   {$IFDEF MSWINDOWS}
     {$DEFINE HASHLIB_MSWINDOWS}
@@ -93,6 +93,12 @@
 
 {$ENDIF}
 
+{========================== Common Feature Detection ==========================}
+
+{$IF DEFINED(HASHLIB_LITTLE_ENDIAN) AND NOT DEFINED(HASHLIB_REQUIRES_PROPER_ALIGNMENT)}
+  {$DEFINE HASHLIB_HAS_FAST_UNALIGNED_ACCESS_LE}
+{$IFEND}
+
 {========================== Common Compiler Settings ==========================}
 
 {$HINTS OFF}
@@ -131,8 +137,8 @@
 // {$DEFINE HASHLIB_FORCE_SSSE3}
 
 {$IF (DEFINED(HASHLIB_FORCE_SCALAR) AND DEFINED(HASHLIB_FORCE_SSE2))
-  OR (DEFINED(HASHLIB_FORCE_SCALAR) AND DEFINED(HASHLIB_FORCE_SSSE3))
-  OR (DEFINED(HASHLIB_FORCE_SSE2) AND DEFINED(HASHLIB_FORCE_SSSE3))}
+   OR (DEFINED(HASHLIB_FORCE_SCALAR) AND DEFINED(HASHLIB_FORCE_SSSE3))
+   OR (DEFINED(HASHLIB_FORCE_SSE2) AND DEFINED(HASHLIB_FORCE_SSSE3))}
   {$MESSAGE ERROR 'Only one HASHLIB_FORCE_* define may be enabled at a time.'}
 {$IFEND}
 
@@ -144,8 +150,8 @@
 // {$DEFINE HASHLIB_FORCE_SVE}
 
 {$IF (DEFINED(HASHLIB_FORCE_SCALAR) AND DEFINED(HASHLIB_FORCE_NEON))
-  OR (DEFINED(HASHLIB_FORCE_SCALAR) AND DEFINED(HASHLIB_FORCE_SVE))
-  OR (DEFINED(HASHLIB_FORCE_NEON) AND DEFINED(HASHLIB_FORCE_SVE))}
+   OR (DEFINED(HASHLIB_FORCE_SCALAR) AND DEFINED(HASHLIB_FORCE_SVE))
+   OR (DEFINED(HASHLIB_FORCE_NEON) AND DEFINED(HASHLIB_FORCE_SVE))}
   {$MESSAGE ERROR 'Only one HASHLIB_FORCE_* define may be enabled at a time.'}
 {$IFEND}
 

HashLib/src/Include/HashLibFPC.inc

@@ -20,15 +20,7 @@
   {$MESSAGE FATAL 'This Library does not support "Big Endian" processors yet.'}
 {$ENDIF}
 
-{$IFDEF FPC_LITTLE_ENDIAN}
-  {$DEFINE HASHLIB_LITTLE_ENDIAN}
-{$ENDIF}
-
-{$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
-  {$DEFINE HASHLIB_REQUIRES_PROPER_ALIGNMENT}
-{$ENDIF}
-
-{========================= FPC Version Features ===============================}
+{============================ FPC Version Features ============================}
 
 {$IF FPC_FULLVERSION >= 30301}
   {.$DEFINE HASHLIB_USE_PPL} // Use Parallel Programming Library
@@ -38,15 +30,23 @@
 
 {============================== CPU Architecture ==============================}
 
-{$IF DEFINED(CPU386)}
+{$IFDEF FPC_LITTLE_ENDIAN}
+  {$DEFINE HASHLIB_LITTLE_ENDIAN}
+{$ENDIF}
+
+{$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
+  {$DEFINE HASHLIB_REQUIRES_PROPER_ALIGNMENT}
+{$ENDIF}
+
+{$IFDEF CPU386}
   {$DEFINE HASHLIB_I386}
   {$DEFINE HASHLIB_I386_ASM}
-{$IFEND}
+{$ENDIF}
 
-{$IF DEFINED(CPUX64)}
+{$IFDEF CPUX64}
   {$DEFINE HASHLIB_X86_64}
   {$DEFINE HASHLIB_X86_64_ASM}
-{$IFEND}
+{$ENDIF}
 
 {$IFDEF CPUARM}
   {$DEFINE HASHLIB_ARM32}
@@ -88,7 +88,7 @@
   {$DEFINE HASHLIB_SOLARIS}
 {$ENDIF}
 
-{========================= Compiler Mode & Optimizations ======================}
+{======================= Compiler Mode & Optimizations ========================}
 
 {$MODE DELPHI}
 {$IF DEFINED(CPU386) OR DEFINED(CPUX64)}
@@ -102,7 +102,6 @@
 {$OPTIMIZATION NOUSELOADMODIFYSTORE}
 {$OPTIMIZATION ORDERFIELDS}
 {$OPTIMIZATION DEADVALUES}
-{$IFDEF CPUI386}  {$OPTIMIZATION USEEBP} {$ENDIF}
+{$IFDEF CPUI386} {$OPTIMIZATION USEEBP} {$ENDIF}
 {$IFDEF CPUX86_64} {$OPTIMIZATION USERBP} {$ENDIF}
 *)
-