]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfhard.c
Update cmdhf14a.c
[proxmark3-svn] / client / cmdhfmfhard.c
index ee46b79c86e181d262a293b9f50b015bd591cc18..85b772e4f2f3715ff54d7bf9435aacd47026aabc 100644 (file)
@@ -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,19 @@ static float brute_force_per_second;
 
 
 static void get_SIMD_instruction_set(char* instruction_set) {
-       #if (__GNUC__ > 4) 
+       #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
+               strcpy(instruction_set, "unsupported");
 }
 
 
@@ -243,7 +247,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;
Impressum, Datenschutz