more hardnested switch to handle

This commit is contained in:
Philippe Teuwen 2020-05-12 00:50:49 +02:00
parent 7f6c078de2
commit 3e05d28678

View file

@ -163,11 +163,17 @@ static int usage_hf14_hardnested(void) {
PrintAndLogEx(NORMAL, " f <name> read/write <name> instead of default name"); PrintAndLogEx(NORMAL, " f <name> read/write <name> instead of default name");
PrintAndLogEx(NORMAL, " t tests?"); PrintAndLogEx(NORMAL, " t tests?");
PrintAndLogEx(NORMAL, " i <X> set type of SIMD instructions. Without this flag programs autodetect it."); PrintAndLogEx(NORMAL, " i <X> set type of SIMD instructions. Without this flag programs autodetect it.");
#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)
PrintAndLogEx(NORMAL, " i 5 = AVX512"); PrintAndLogEx(NORMAL, " i 5 = AVX512");
#endif
PrintAndLogEx(NORMAL, " i 2 = AVX2"); PrintAndLogEx(NORMAL, " i 2 = AVX2");
PrintAndLogEx(NORMAL, " i a = AVX"); PrintAndLogEx(NORMAL, " i a = AVX");
PrintAndLogEx(NORMAL, " i s = SSE2"); PrintAndLogEx(NORMAL, " i s = SSE2");
PrintAndLogEx(NORMAL, " i m = MMX"); PrintAndLogEx(NORMAL, " i m = MMX");
#endif
#endif
PrintAndLogEx(NORMAL, " i n = none (use CPU regular instruction set)"); PrintAndLogEx(NORMAL, " i n = none (use CPU regular instruction set)");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, "Examples:");
@ -1805,9 +1811,13 @@ static int CmdHF14AMfNestedHard(const char *Cmd) {
SetSIMDInstr(SIMD_AUTO); SetSIMDInstr(SIMD_AUTO);
ctmp = tolower(param_getchar(Cmd, cmdp + 1)); ctmp = tolower(param_getchar(Cmd, cmdp + 1));
switch (ctmp) { switch (ctmp) {
#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 '5': case '5':
SetSIMDInstr(SIMD_AVX512); SetSIMDInstr(SIMD_AVX512);
break; break;
#endif
case '2': case '2':
SetSIMDInstr(SIMD_AVX2); SetSIMDInstr(SIMD_AVX2);
break; break;
@ -1820,6 +1830,8 @@ static int CmdHF14AMfNestedHard(const char *Cmd) {
case 'm': case 'm':
SetSIMDInstr(SIMD_MMX); SetSIMDInstr(SIMD_MMX);
break; break;
#endif
#endif
case 'n': case 'n':
SetSIMDInstr(SIMD_NONE); SetSIMDInstr(SIMD_NONE);
break; break;