From 586441fa25a2e2f3113224ae7f26893aebaac45a Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Sun, 13 Dec 2015 18:46:21 +0100 Subject: [PATCH] Revert "Fixed a bug where oclHashcat rejected to load a rule which calls 15 functions although it is supported" This reverts commit f230ed73dc142a4a6e5ed5c61afef976d51aa4b6. Some kernel require too much constant memory and do not compile anymore --- amd/types_amd.c | 4 ++-- docs/changes.txt | 19 ++++--------------- include/types.h | 2 +- nv/types_nv.c | 4 ++-- src/shared.c | 2 +- tools/rules_test/cpu_rules.c | 2 +- tools/rules_test/cpu_rules.h | 2 +- 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/amd/types_amd.c b/amd/types_amd.c index 6f1b857..8adb2ab 100644 --- a/amd/types_amd.c +++ b/amd/types_amd.c @@ -869,7 +869,7 @@ typedef struct typedef struct { - u32 key; + u32 key; u64 val; } hcstat_table_t; @@ -883,7 +883,7 @@ typedef struct typedef struct { - u32 cmds[16]; + u32 cmds[15]; } gpu_rule_t; diff --git a/docs/changes.txt b/docs/changes.txt index fb9a626..2f99087 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -1,30 +1,19 @@ * changes v2.01 -> not-known-yet: -Type.: Feature -File.: Host -Desc.: Help integration for linux distributions; Rewrite paths to files so that it matches Linux FHS -## NOT FINISHED ## -Issue: 20 - Type.: Feature File.: Host Desc.: Implemented a new feature that allows to quit at next restore point update (and disable it) Issue: 10 -Type.: Change -File.: Docs -Desc.: Updated docs/readme.txt -- Starting with v2.01 OpenCL 2.00 is required; we need Catalyst 15.7 or higher - -Type.: Bug -File.: Host -Desc.: Fixed a bug where oclHashcat rejected to load a rule which calls 15 functions although it is supported -Issue: 21 - Type.: Bug File.: Host Desc.: Fixed a bug in combination of --restore and a user immediately aborting the session after restart Trac.: 684 +Type.: Change +File.: Docs +Desc.: Updated docs/readme.txt -- Starting with v2.01 OpenCL 2.00 is required; we need Catalyst 15.7 or higher + * changes v2.00 -> v2.01: Type.: Bug diff --git a/include/types.h b/include/types.h index 0bfef5d..309398a 100644 --- a/include/types.h +++ b/include/types.h @@ -667,7 +667,7 @@ typedef struct typedef struct { - uint cmds[16]; + uint cmds[15]; } gpu_rule_t; diff --git a/nv/types_nv.c b/nv/types_nv.c index 2687777..02c7364 100644 --- a/nv/types_nv.c +++ b/nv/types_nv.c @@ -1322,7 +1322,7 @@ typedef struct typedef struct { - u32 key; + u32 key; u64 val; } hcstat_table_t; @@ -1336,7 +1336,7 @@ typedef struct typedef struct { - u32 cmds[16]; + u32 cmds[15]; } gpu_rule_t; diff --git a/src/shared.c b/src/shared.c index ec450be..c724f95 100644 --- a/src/shared.c +++ b/src/shared.c @@ -18894,7 +18894,7 @@ char conv_itoc (char c) #define SET_NAME(rule,val) (rule)->cmds[rule_cnt] = ((val) & 0xff) << 0 #define SET_P0(rule,val) INCR_POS; (rule)->cmds[rule_cnt] |= ((val) & 0xff) << 8 #define SET_P1(rule,val) INCR_POS; (rule)->cmds[rule_cnt] |= ((val) & 0xff) << 16 -#define MAX_GPU_RULES 15 +#define MAX_GPU_RULES 14 #define GET_NAME(rule) rule_cmd = (((rule)->cmds[rule_cnt] >> 0) & 0xff) #define GET_P0(rule) INCR_POS; rule_buf[rule_pos] = (((rule)->cmds[rule_cnt] >> 8) & 0xff) #define GET_P1(rule) INCR_POS; rule_buf[rule_pos] = (((rule)->cmds[rule_cnt] >> 16) & 0xff) diff --git a/tools/rules_test/cpu_rules.c b/tools/rules_test/cpu_rules.c index 51e34f1..2b9adfe 100644 --- a/tools/rules_test/cpu_rules.c +++ b/tools/rules_test/cpu_rules.c @@ -15,7 +15,7 @@ extern int max_len; #define SET_NAME(rule,val) (rule)->cmds[rule_cnt] = ((val) & 0xff) << 0 #define SET_P0(rule,val) INCR_POS; (rule)->cmds[rule_cnt] |= ((val) & 0xff) << 8 #define SET_P1(rule,val) INCR_POS; (rule)->cmds[rule_cnt] |= ((val) & 0xff) << 16 -#define MAX_GPU_RULES 15 +#define MAX_GPU_RULES 14 #define GET_NAME(rule) rule_cmd = (((rule)->cmds[rule_cnt] >> 0) & 0xff) #define GET_P0(rule) INCR_POS; rule_buf[rule_pos] = (((rule)->cmds[rule_cnt] >> 8) & 0xff) #define GET_P1(rule) INCR_POS; rule_buf[rule_pos] = (((rule)->cmds[rule_cnt] >> 16) & 0xff) diff --git a/tools/rules_test/cpu_rules.h b/tools/rules_test/cpu_rules.h index 14f4646..d6ebd83 100644 --- a/tools/rules_test/cpu_rules.h +++ b/tools/rules_test/cpu_rules.h @@ -20,7 +20,7 @@ typedef unsigned int uint; typedef struct { - uint cmds[16]; + uint cmds[15]; } gpu_rule_t; -- 2.25.1