X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a4a6780efe814fd8ad96ffd85d01c1d71d3b7176..refs/pull/344/head:/client/cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 01dcc35d..bd4aef71 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -28,6 +28,7 @@
 #include "cmdmain.h"
 #include "ui.h"
 #include "util.h"
+#include "util_posix.h"
 #include "crapto1/crapto1.h"
 #include "parity.h"
 #include "hardnested/hardnested_bruteforce.h"
@@ -69,16 +70,21 @@ static float brute_force_per_second;
 
 
 static void get_SIMD_instruction_set(char* instruction_set) {
-	#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2) 
+#if defined (__i386__) || defined (__x86_64__)	
+	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8))
+		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) strcpy(instruction_set, "AVX512F");
 	else if (__builtin_cpu_supports("avx2")) strcpy(instruction_set, "AVX2");
-	#else 
+		#else 
 	if (__builtin_cpu_supports("avx2")) strcpy(instruction_set, "AVX2");
-	#endif
+		#endif
 	else if (__builtin_cpu_supports("avx")) strcpy(instruction_set, "AVX");
 	else if (__builtin_cpu_supports("sse2")) strcpy(instruction_set, "SSE2");
 	else if (__builtin_cpu_supports("mmx")) strcpy(instruction_set, "MMX");
-	else strcpy(instruction_set, "unsupported");
+	else 
+	#endif
+#endif
+		strcpy(instruction_set, "no");
 }
 
 
@@ -243,7 +249,7 @@ static void init_bitflip_bitarrays(void)
 #endif	
 
 	char state_files_path[strlen(get_my_executable_directory()) + strlen(STATE_FILES_DIRECTORY) + strlen(STATE_FILE_TEMPLATE) + 1];
-	char state_file_name[strlen(STATE_FILE_TEMPLATE)];
+	char state_file_name[strlen(STATE_FILE_TEMPLATE)+1];
 	
 	for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {
 		num_effective_bitflips[odd_even] = 0;