Merge branch 'master' of https://github.com/hashcat/hashcat

2016-11-12 22:31:36 +01:00
parent 0c5d32c455 306fc8a59a
commit cb6e2107b6
2 changed files with 44 additions and 20 deletions
@@ -165,15 +165,30 @@
 #ifdef IS_AMD
 #ifdef IS_GPU

-#if KERN_TYPE == 3200
+#if KERN_TYPE == 1450
+#undef _unroll
+#endif
+#if KERN_TYPE == 1460
+#undef _unroll
+#endif
+#if KERN_TYPE == 1700
+#undef _unroll
+#endif
+#if KERN_TYPE == 1710
+#undef _unroll
+#endif
+#if KERN_TYPE == 1720
+#undef _unroll
+#endif
+#if KERN_TYPE == 1800
+#undef _unroll
+#endif
+#if KERN_TYPE == 3000
 #undef _unroll
 #endif
 #if KERN_TYPE == 5200
 #undef _unroll
 #endif
-#if KERN_TYPE == 6100
-#undef _unroll
-#endif
 #if KERN_TYPE == 6221
 #undef _unroll
 #endif
@@ -186,15 +201,9 @@
 #if KERN_TYPE == 6400
 #undef _unroll
 #endif
-#if KERN_TYPE == 6500
-#undef _unroll
-#endif
 #if KERN_TYPE == 6800
 #undef _unroll
 #endif
-#if KERN_TYPE == 7100
-#undef _unroll
-#endif
 #if KERN_TYPE == 7400
 #undef _unroll
 #endif
@@ -204,24 +213,30 @@
 #if KERN_TYPE == 8200
 #undef _unroll
 #endif
+#if KERN_TYPE == 8900
+#undef _unroll
+#endif
+#if KERN_TYPE == 10400
+#undef _unroll
+#endif
+#if KERN_TYPE == 10410
+#undef _unroll
+#endif
+#if KERN_TYPE == 10700
+#undef _unroll
+#endif
+#if KERN_TYPE == 10800
+#undef _unroll
+#endif
 #if KERN_TYPE == 10900
 #undef _unroll
 #endif
-#if KERN_TYPE == 11600
-#undef _unroll
-#endif
-#if KERN_TYPE == 12300
-#undef _unroll
-#endif
 #if KERN_TYPE == 12800
 #undef _unroll
 #endif
 #if KERN_TYPE == 12900
 #undef _unroll
 #endif
-#if KERN_TYPE == 13000
-#undef _unroll
-#endif
 #if KERN_TYPE == 13721
 #undef _unroll
 #endif
@@ -231,12 +246,20 @@
 #if KERN_TYPE == 13723
 #undef _unroll
 #endif
+#if KERN_TYPE == 13800
+#undef _unroll
+#endif
+#if KERN_TYPE == 14000
+#undef _unroll
+#endif
+#if KERN_TYPE == 14100
+#undef _unroll
+#endif

 #endif
 #endif

 // Some algorithms break due to loop unrolling, it's unknown why, probably compiler bugs
-// Can overlap with above cases

 #ifdef IS_AMD
 #ifdef IS_GPU