arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-02 19:01:09 +00:00
Code Issues Releases Wiki Activity

Fix broken #ifdef in types_ocl.c

Browse Source
This commit is contained in:
Jens Steube 2016-04-25 07:10:02 +02:00
parent 81b19ddc7d
commit 15d7e41d68
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenCL/types_ocl.c
View File

@ -198,7 +198,7 @@ static inline u64 rotr64_S (const u64 a, const u32 n)
{ {
#if (DEVICE_TYPE == DEVICE_TYPE_GPU) #if (DEVICE_TYPE == DEVICE_TYPE_GPU)
#ifdef amd_bitalign #ifdef cl_amd_media_ops
const u32 a0 = h32_from_64_S (a); const u32 a0 = h32_from_64_S (a);
const u32 a1 = l32_from_64_S (a); const u32 a1 = l32_from_64_S (a);
@ -262,7 +262,8 @@ static inline u64x rotr64 (const u64x a, const u32 n)
{ {
#if (DEVICE_TYPE == DEVICE_TYPE_GPU) #if (DEVICE_TYPE == DEVICE_TYPE_GPU)
#ifdef amd_bitalign #ifdef cl_amd_media_ops
const u32x a0 = h32_from_64 (a); const u32x a0 = h32_from_64 (a);
const u32x a1 = l32_from_64 (a); const u32x a1 = l32_from_64 (a);
@ -293,26 +294,34 @@ static inline u64x rotl64 (const u64x a, const u32 n)
static inline u32 __bfe (const u32 a, const u32 b, const u32 c) static inline u32 __bfe (const u32 a, const u32 b, const u32 c)
{ {
#ifdef amd_bfe #ifdef cl_amd_media_ops2
return amd_bfe (a, b, c); return amd_bfe (a, b, c);
#else
#else
#define BIT(x) (1 << (x)) #define BIT(x) (1 << (x))
#define BIT_MASK(x) (BIT (x) - 1) #define BIT_MASK(x) (BIT (x) - 1)
#define BFE(x,y,z) (((x) >> (y)) & BIT_MASK (z)) #define BFE(x,y,z) (((x) >> (y)) & BIT_MASK (z))
return BFE (a, b, c); return BFE (a, b, c);
#endif
#endif
} }
static inline u32 amd_bytealign_S (const u32 a, const u32 b, const u32 c) static inline u32 amd_bytealign_S (const u32 a, const u32 b, const u32 c)
{ {
#ifdef amd_bytealign #ifdef cl_amd_media_ops
return amd_bytealign (a, b, c); return amd_bytealign (a, b, c);
#else
#else
const u64 tmp = ((((u64) a) << 32) | ((u64) b)) >> ((c & 3) * 8); const u64 tmp = ((((u64) a) << 32) | ((u64) b)) >> ((c & 3) * 8);
return (u32) (tmp); return (u32) (tmp);
#endif
#endif
} }
#endif #endif