Move macros DGST_R0 - DGST_R3 to host, define dgst_size for opencl kernel from host...

[hashcat.git] / OpenCL / m13500_a0.cl

diff --git a/OpenCL/m13500_a0.cl b/OpenCL/m13500_a0.cl
index 85f318c..d7995da 100644 (file)
--- a/OpenCL/m13500_a0.cl
+++ b/OpenCL/m13500_a0.cl
@@ -8,22 +8,16 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "include/constants.h"
-#include "include/kernel_vendor.h"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
-#include "include/kernel_functions.c"
-#include "OpenCL/types_ocl.c"
-#include "OpenCL/common.c"
-#include "include/rp_kernel.h"
-#include "OpenCL/rp.c"
-#include "OpenCL/simd.c"
-
-static void memcat64c_be (u32x block[16], const u32 offset, u32x carry[16])
+#include "inc_vendor.cl"
+#include "inc_hash_constants.h"
+#include "inc_hash_functions.cl"
+#include "inc_types.cl"
+#include "inc_common.cl"
+#include "inc_rp.h"
+#include "inc_rp.cl"
+#include "inc_simd.cl"
+
+void memcat64c_be (u32x block[16], const u32 offset, u32x carry[16])
 {
   const u32 mod = offset & 3;
   const u32 div = offset / 4;
@@ -86,27 +80,6 @@ static void memcat64c_be (u32x block[16], const u32 offset, u32x carry[16])
   tmp14 = amd_bytealign (carry[13], carry[14], offset);
   tmp15 = amd_bytealign (carry[14], carry[15], offset);
   tmp16 = amd_bytealign (carry[15],         0, offset);
-
-  if (mod == 0)
-  {
-    tmp00 = tmp01;
-    tmp01 = tmp02;
-    tmp02 = tmp03;
-    tmp03 = tmp04;
-    tmp04 = tmp05;
-    tmp05 = tmp06;
-    tmp06 = tmp07;
-    tmp07 = tmp08;
-    tmp08 = tmp09;
-    tmp09 = tmp10;
-    tmp10 = tmp11;
-    tmp11 = tmp12;
-    tmp12 = tmp13;
-    tmp13 = tmp14;
-    tmp14 = tmp15;
-    tmp15 = tmp16;
-    tmp16 = 0;
-  }
   #endif
 
   carry[ 0] = 0;