Fix CPU architecture guards for x86 and x64 on MSVC

MSVC uses `_M_IX86` and `_M_AMD64` for CPU architecture guards instead of `__i386__` and `__x86_64__` [^1]. Because of that, libaegis didn't upgrade from the software implementation to those powered by AESNI or AVX when compiled with Microsoft's Visual Studio build tools. [^1]: As per the table here: https://sourceforge.net/p/predef/wiki/Architectures/ http://web.archive.org/web/20240211072249/https://sourceforge.net/p/predef/wiki/Architectures/ https://archive.is/jRq9r
aegis-aead · Apr 25, 2024 · 20bba29 · 20bba29
1 parent 5caead7
commit 20bba29
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 20 deletions.
diff --git a/src/aegis128l/aegis128l.c b/src/aegis128l/aegis128l.c
@@ -185,7 +185,7 @@ aegis128l_pick_best_implementation(void)
     }
 #endif
 
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__) || defined(_M_AMD64) || defined(__i386__) || defined(_M_IX86)
     if (aegis_runtime_has_aesni() && aegis_runtime_has_avx()) {
         implementation = &aegis128l_aesni_implementation;
         return 0;

diff --git a/src/aegis128l/aegis128l_aesni.c b/src/aegis128l/aegis128l_aesni.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis128x2/aegis128x2.c b/src/aegis128x2/aegis128x2.c
@@ -186,7 +186,7 @@ aegis128x2_pick_best_implementation(void)
     }
 #endif
 
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__) || defined(_M_AMD64) || defined(__i386__) || defined(_M_IX86)
     if (aegis_runtime_has_vaes() && aegis_runtime_has_avx2()) {
         implementation = &aegis128x2_avx2_implementation;
         return 0;

diff --git a/src/aegis128x2/aegis128x2_aesni.c b/src/aegis128x2/aegis128x2_aesni.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis128x2/aegis128x2_avx2.c b/src/aegis128x2/aegis128x2_avx2.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis128x4/aegis128x4.c b/src/aegis128x4/aegis128x4.c
@@ -187,7 +187,7 @@ aegis128x4_pick_best_implementation(void)
     }
 #endif
 
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__) || defined(_M_AMD64) || defined(__i386__) || defined(_M_IX86)
 #    ifdef HAVE_VAESINTRIN_H
     if (aegis_runtime_has_vaes() && aegis_runtime_has_avx512f()) {
         implementation = &aegis128x4_avx512_implementation;

diff --git a/src/aegis128x4/aegis128x4_aesni.c b/src/aegis128x4/aegis128x4_aesni.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis128x4/aegis128x4_avx2.c b/src/aegis128x4/aegis128x4_avx2.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis128x4/aegis128x4_avx512.c b/src/aegis128x4/aegis128x4_avx512.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis256/aegis256.c b/src/aegis256/aegis256.c
@@ -185,7 +185,7 @@ aegis256_pick_best_implementation(void)
     }
 #endif
 
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__) || defined(_M_AMD64) || defined(__i386__) || defined(_M_IX86)
     if (aegis_runtime_has_aesni() && aegis_runtime_has_avx()) {
         implementation = &aegis256_aesni_implementation;
         return 0;

diff --git a/src/aegis256/aegis256_aesni.c b/src/aegis256/aegis256_aesni.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis256x2/aegis256x2.c b/src/aegis256x2/aegis256x2.c
@@ -186,7 +186,7 @@ aegis256x2_pick_best_implementation(void)
     }
 #endif
 
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__) || defined(_M_AMD64) || defined(__i386__) || defined(_M_IX86)
     if (aegis_runtime_has_vaes() && aegis_runtime_has_avx2()) {
         implementation = &aegis256x2_avx2_implementation;
         return 0;

diff --git a/src/aegis256x2/aegis256x2_aesni.c b/src/aegis256x2/aegis256x2_aesni.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis256x2/aegis256x2_avx2.c b/src/aegis256x2/aegis256x2_avx2.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis256x4/aegis256x4.c b/src/aegis256x4/aegis256x4.c
@@ -187,7 +187,7 @@ aegis256x4_pick_best_implementation(void)
     }
 #endif
 
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__) || defined(_M_AMD64) || defined(__i386__) || defined(_M_IX86)
 #    ifdef HAVE_VAESINTRIN_H
     if (aegis_runtime_has_vaes() && aegis_runtime_has_avx512f()) {
         implementation = &aegis256x4_avx512_implementation;

diff --git a/src/aegis256x4/aegis256x4_aesni.c b/src/aegis256x4/aegis256x4_aesni.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis256x4/aegis256x4_avx2.c b/src/aegis256x4/aegis256x4_avx2.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/aegis256x4/aegis256x4_avx512.c b/src/aegis256x4/aegis256x4_avx512.c
@@ -1,4 +1,4 @@
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
 
 #    include <errno.h>
 #    include <stddef.h>

diff --git a/src/common/common.h b/src/common/common.h
@@ -14,14 +14,15 @@
 #ifdef __ANDROID_API__
 #    define HAVE_ANDROID_GETCPUFEATURES
 #endif
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_AMD64)
+
 #    define HAVE_CPUID
 #    define NATIVE_LITTLE_ENDIAN
 #    if defined(__clang__) || defined(__GNUC__)
 #        define HAVE_AVX_ASM
 #    endif
 #endif
-#ifdef __x86_64__
+#if defined(__x86_64__) || defined(_M_AMD64)
 #    define HAVE_AVXINTRIN_H
 #    define HAVE_AVX2INTRIN_H
 #    define HAVE_AVX512FINTRIN_H