1.1 --- a/kconfig/zconf.hash.c Fri Oct 17 12:47:53 2008 +0000
1.2 +++ b/kconfig/zconf.hash.c Sun May 08 14:14:40 2011 +0200
1.3 @@ -30,7 +30,9 @@
1.4 #endif
1.5
1.6 struct kconf_id;
1.7 -/* maximum key range = 47, duplicates = 0 */
1.8 +
1.9 +static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
1.10 +/* maximum key range = 50, duplicates = 0 */
1.11
1.12 #ifdef __GNUC__
1.13 __inline
1.14 @@ -44,32 +46,32 @@
1.15 {
1.16 static unsigned char asso_values[] =
1.17 {
1.18 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.19 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.20 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.21 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.22 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.23 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.24 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.25 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.26 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.27 - 49, 49, 49, 49, 49, 49, 49, 49, 11, 5,
1.28 - 0, 0, 5, 49, 5, 20, 49, 49, 5, 20,
1.29 - 5, 0, 30, 49, 0, 15, 0, 10, 0, 49,
1.30 - 25, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.31 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.32 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.33 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.34 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.35 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.36 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.37 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.38 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.39 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.40 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.41 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.42 - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
1.43 - 49, 49, 49, 49, 49, 49
1.44 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.45 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.46 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.47 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.48 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.49 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.50 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.51 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.52 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.53 + 52, 52, 52, 52, 52, 52, 52, 52, 40, 5,
1.54 + 0, 0, 5, 52, 0, 20, 52, 52, 10, 20,
1.55 + 5, 0, 35, 52, 0, 30, 0, 15, 0, 52,
1.56 + 15, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.57 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.58 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.59 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.60 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.61 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.62 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.63 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.64 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.65 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.66 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.67 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.68 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1.69 + 52, 52, 52, 52, 52, 52
1.70 };
1.71 register int hval = len;
1.72
1.73 @@ -100,25 +102,26 @@
1.74 char kconf_id_strings_str12[sizeof("default")];
1.75 char kconf_id_strings_str13[sizeof("def_bool")];
1.76 char kconf_id_strings_str14[sizeof("help")];
1.77 - char kconf_id_strings_str15[sizeof("bool")];
1.78 char kconf_id_strings_str16[sizeof("config")];
1.79 char kconf_id_strings_str17[sizeof("def_tristate")];
1.80 - char kconf_id_strings_str18[sizeof("boolean")];
1.81 + char kconf_id_strings_str18[sizeof("hex")];
1.82 char kconf_id_strings_str19[sizeof("defconfig_list")];
1.83 - char kconf_id_strings_str21[sizeof("string")];
1.84 char kconf_id_strings_str22[sizeof("if")];
1.85 char kconf_id_strings_str23[sizeof("int")];
1.86 - char kconf_id_strings_str26[sizeof("select")];
1.87 char kconf_id_strings_str27[sizeof("modules")];
1.88 char kconf_id_strings_str28[sizeof("tristate")];
1.89 char kconf_id_strings_str29[sizeof("menu")];
1.90 - char kconf_id_strings_str31[sizeof("source")];
1.91 char kconf_id_strings_str32[sizeof("comment")];
1.92 - char kconf_id_strings_str33[sizeof("hex")];
1.93 char kconf_id_strings_str35[sizeof("menuconfig")];
1.94 - char kconf_id_strings_str36[sizeof("prompt")];
1.95 - char kconf_id_strings_str37[sizeof("depends")];
1.96 + char kconf_id_strings_str36[sizeof("string")];
1.97 + char kconf_id_strings_str37[sizeof("visible")];
1.98 + char kconf_id_strings_str41[sizeof("prompt")];
1.99 + char kconf_id_strings_str42[sizeof("depends")];
1.100 + char kconf_id_strings_str44[sizeof("bool")];
1.101 + char kconf_id_strings_str46[sizeof("select")];
1.102 + char kconf_id_strings_str47[sizeof("boolean")];
1.103 char kconf_id_strings_str48[sizeof("mainmenu")];
1.104 + char kconf_id_strings_str51[sizeof("source")];
1.105 };
1.106 static struct kconf_id_strings_t kconf_id_strings_contents =
1.107 {
1.108 @@ -134,25 +137,26 @@
1.109 "default",
1.110 "def_bool",
1.111 "help",
1.112 - "bool",
1.113 "config",
1.114 "def_tristate",
1.115 - "boolean",
1.116 + "hex",
1.117 "defconfig_list",
1.118 - "string",
1.119 "if",
1.120 "int",
1.121 - "select",
1.122 "modules",
1.123 "tristate",
1.124 "menu",
1.125 - "source",
1.126 "comment",
1.127 - "hex",
1.128 "menuconfig",
1.129 + "string",
1.130 + "visible",
1.131 "prompt",
1.132 "depends",
1.133 - "mainmenu"
1.134 + "bool",
1.135 + "select",
1.136 + "boolean",
1.137 + "mainmenu",
1.138 + "source"
1.139 };
1.140 #define kconf_id_strings ((const char *) &kconf_id_strings_contents)
1.141 #ifdef __GNUC__
1.142 @@ -166,11 +170,11 @@
1.143 {
1.144 enum
1.145 {
1.146 - TOTAL_KEYWORDS = 31,
1.147 + TOTAL_KEYWORDS = 32,
1.148 MIN_WORD_LENGTH = 2,
1.149 MAX_WORD_LENGTH = 14,
1.150 MIN_HASH_VALUE = 2,
1.151 - MAX_HASH_VALUE = 48
1.152 + MAX_HASH_VALUE = 51
1.153 };
1.154
1.155 static struct kconf_id wordlist[] =
1.156 @@ -189,31 +193,35 @@
1.157 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_UNKNOWN},
1.158 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN},
1.159 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_HELP, TF_COMMAND},
1.160 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str15, T_TYPE, TF_COMMAND, S_BOOLEAN},
1.161 + {-1},
1.162 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_CONFIG, TF_COMMAND},
1.163 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_DEFAULT, TF_COMMAND, S_TRISTATE},
1.164 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_BOOLEAN},
1.165 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_HEX},
1.166 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19, T_OPT_DEFCONFIG_LIST,TF_OPTION},
1.167 - {-1},
1.168 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_TYPE, TF_COMMAND, S_STRING},
1.169 + {-1}, {-1},
1.170 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_IF, TF_COMMAND|TF_PARAM},
1.171 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_TYPE, TF_COMMAND, S_INT},
1.172 - {-1}, {-1},
1.173 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26, T_SELECT, TF_COMMAND},
1.174 + {-1}, {-1}, {-1},
1.175 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_OPT_MODULES, TF_OPTION},
1.176 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28, T_TYPE, TF_COMMAND, S_TRISTATE},
1.177 {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29, T_MENU, TF_COMMAND},
1.178 + {-1}, {-1},
1.179 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND},
1.180 + {-1}, {-1},
1.181 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_MENUCONFIG, TF_COMMAND},
1.182 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_TYPE, TF_COMMAND, S_STRING},
1.183 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_VISIBLE, TF_COMMAND},
1.184 + {-1}, {-1}, {-1},
1.185 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_PROMPT, TF_COMMAND},
1.186 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42, T_DEPENDS, TF_COMMAND},
1.187 {-1},
1.188 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SOURCE, TF_COMMAND},
1.189 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND},
1.190 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_TYPE, TF_COMMAND, S_HEX},
1.191 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str44, T_TYPE, TF_COMMAND, S_BOOLEAN},
1.192 {-1},
1.193 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_MENUCONFIG, TF_COMMAND},
1.194 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_PROMPT, TF_COMMAND},
1.195 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_DEPENDS, TF_COMMAND},
1.196 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1.197 - {-1},
1.198 - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48, T_MAINMENU, TF_COMMAND}
1.199 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46, T_SELECT, TF_COMMAND},
1.200 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47, T_TYPE, TF_COMMAND, S_BOOLEAN},
1.201 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48, T_MAINMENU, TF_COMMAND},
1.202 + {-1}, {-1},
1.203 + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51, T_SOURCE, TF_COMMAND}
1.204 };
1.205
1.206 if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)