Redesign of lf hid card format handler as discussed with @marshmellow42

[proxmark3-svn] / client / hardnested / hardnested_bf_core.c

diff --git a/client/hardnested/hardnested_bf_core.c b/client/hardnested/hardnested_bf_core.c
index d716f7022408f4139642c17d2b08b3fcf703bb72..d02209e9da7d0888912374af13b7c0bd025d5a40 100644 (file)
--- a/client/hardnested/hardnested_bf_core.c
+++ b/client/hardnested/hardnested_bf_core.c
@@ -544,10 +544,17 @@ out:
 
 #ifndef __MMX__
 
+// pointers to functions:
+crack_states_bitsliced_t *crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
+bitslice_test_nonces_t *bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
+
 static SIMDExecInstr intSIMDInstr = SIMD_AUTO;
 
 void SetSIMDInstr(SIMDExecInstr instr) {
        intSIMDInstr = instr;
+       
+       crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
+       bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
 }
 
 SIMDExecInstr GetSIMDInstr() {
@@ -580,16 +587,16 @@ SIMDExecInstr GetSIMDInstrAuto() {
        return instr;
 }
 
-// pointers to functions:
-crack_states_bitsliced_t *crack_states_bitsliced_function_p = &crack_states_bitsliced_dispatch;
-bitslice_test_nonces_t *bitslice_test_nonces_function_p = &bitslice_test_nonces_dispatch;
-
 // determine the available instruction set at runtime and call the correct function
 const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_bytes, statelist_t *p, uint32_t *keys_found, uint64_t *num_keys_tested, uint32_t nonces_to_bruteforce, uint8_t *bf_test_nonce_2nd_byte, noncelist_t *nonces) {
        switch(GetSIMDInstrAuto()) {
+#if defined (__i386__) || defined (__x86_64__)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2) 
                case SIMD_AVX512:
                        crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX512;
                        break;
+#endif
                case SIMD_AVX2:
                        crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX2;
                        break;
@@ -602,6 +609,8 @@ const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_firs
                case SIMD_MMX:
                        crack_states_bitsliced_function_p = &crack_states_bitsliced_MMX;
                        break;
+#endif
+#endif
                default:
                        crack_states_bitsliced_function_p = &crack_states_bitsliced_NOSIMD;
                        break;
@@ -613,9 +622,13 @@ const uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_firs
 
 void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_test_nonce, uint8_t *bf_test_nonce_par) {
        switch(GetSIMDInstrAuto()) {
+#if defined (__i386__) || defined (__x86_64__)
+#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1))
+#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2) 
                case SIMD_AVX512:
                        bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX512;
                        break;
+#endif
                case SIMD_AVX2:
                        bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX2;
                        break;
@@ -628,6 +641,8 @@ void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, uint32_t *bf_t
                case SIMD_MMX:
                        bitslice_test_nonces_function_p = &bitslice_test_nonces_MMX;
                        break;
+#endif
+#endif
                default:
                        bitslice_test_nonces_function_p = &bitslice_test_nonces_NOSIMD;
                        break;