diff options
author | Michal Marek <mmarek@suse.cz> | 2011-03-09 10:15:44 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2011-03-09 10:15:44 -0500 |
commit | 2d8ad8719591fa803b0d589ed057fa46f49b7155 (patch) | |
tree | 4ae051577dad1161c91dafbf4207bb10a9dc91bb /scripts | |
parent | 9b4ce7bce5f30712fd926ab4599a803314a07719 (diff) | |
parent | c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff) |
Merge commit 'v2.6.38-rc1' into kbuild/packaging
Diffstat (limited to 'scripts')
117 files changed, 8852 insertions, 3644 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore index 52cab46ae35..e2741d23bab 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore | |||
@@ -6,5 +6,5 @@ kallsyms | |||
6 | pnmtologo | 6 | pnmtologo |
7 | bin2c | 7 | bin2c |
8 | unifdef | 8 | unifdef |
9 | binoffset | ||
10 | ihex2fw | 9 | ihex2fw |
10 | recordmcount | ||
diff --git a/scripts/Makefile b/scripts/Makefile index 842dbc2d5ae..2e088109fbd 100644 --- a/scripts/Makefile +++ b/scripts/Makefile | |||
@@ -11,6 +11,7 @@ hostprogs-$(CONFIG_KALLSYMS) += kallsyms | |||
11 | hostprogs-$(CONFIG_LOGO) += pnmtologo | 11 | hostprogs-$(CONFIG_LOGO) += pnmtologo |
12 | hostprogs-$(CONFIG_VT) += conmakehash | 12 | hostprogs-$(CONFIG_VT) += conmakehash |
13 | hostprogs-$(CONFIG_IKCONFIG) += bin2c | 13 | hostprogs-$(CONFIG_IKCONFIG) += bin2c |
14 | hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount | ||
14 | 15 | ||
15 | always := $(hostprogs-y) $(hostprogs-m) | 16 | always := $(hostprogs-y) $(hostprogs-m) |
16 | 17 | ||
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index e4deb73e9a8..4eb99ab3405 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
@@ -115,7 +115,10 @@ endif | |||
115 | # --------------------------------------------------------------------------- | 115 | # --------------------------------------------------------------------------- |
116 | 116 | ||
117 | # Default is built-in, unless we know otherwise | 117 | # Default is built-in, unless we know otherwise |
118 | modkern_cflags = $(if $(part-of-module), $(CFLAGS_MODULE), $(CFLAGS_KERNEL)) | 118 | modkern_cflags = \ |
119 | $(if $(part-of-module), \ | ||
120 | $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE), \ | ||
121 | $(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL)) | ||
119 | quiet_modtag := $(empty) $(empty) | 122 | quiet_modtag := $(empty) $(empty) |
120 | 123 | ||
121 | $(real-objs-m) : part-of-module := y | 124 | $(real-objs-m) : part-of-module := y |
@@ -156,14 +159,14 @@ $(obj)/%.i: $(src)/%.c FORCE | |||
156 | 159 | ||
157 | cmd_gensymtypes = \ | 160 | cmd_gensymtypes = \ |
158 | $(CPP) -D__GENKSYMS__ $(c_flags) $< | \ | 161 | $(CPP) -D__GENKSYMS__ $(c_flags) $< | \ |
159 | $(GENKSYMS) -T $@ -a $(ARCH) \ | 162 | $(GENKSYMS) $(if $(1), -T $(2)) -a $(ARCH) \ |
160 | $(if $(KBUILD_PRESERVE),-p) \ | 163 | $(if $(KBUILD_PRESERVE),-p) \ |
161 | $(if $(1),-r $(firstword $(wildcard $(@:.symtypes=.symref) /dev/null))) | 164 | -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null)) |
162 | 165 | ||
163 | quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@ | 166 | quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@ |
164 | cmd_cc_symtypes_c = \ | 167 | cmd_cc_symtypes_c = \ |
165 | set -e; \ | 168 | set -e; \ |
166 | $(call cmd_gensymtypes, true) >/dev/null; \ | 169 | $(call cmd_gensymtypes,true,$@) >/dev/null; \ |
167 | test -s $@ || rm -f $@ | 170 | test -s $@ || rm -f $@ |
168 | 171 | ||
169 | $(obj)/%.symtypes : $(src)/%.c FORCE | 172 | $(obj)/%.symtypes : $(src)/%.c FORCE |
@@ -192,26 +195,42 @@ else | |||
192 | # the actual value of the checksum generated by genksyms | 195 | # the actual value of the checksum generated by genksyms |
193 | 196 | ||
194 | cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $< | 197 | cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $< |
195 | cmd_modversions = \ | 198 | cmd_modversions = \ |
196 | if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then \ | 199 | if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then \ |
197 | $(call cmd_gensymtypes, $(KBUILD_SYMTYPES)) \ | 200 | $(call cmd_gensymtypes,$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \ |
198 | > $(@D)/.tmp_$(@F:.o=.ver); \ | 201 | > $(@D)/.tmp_$(@F:.o=.ver); \ |
199 | \ | 202 | \ |
200 | $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \ | 203 | $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \ |
201 | -T $(@D)/.tmp_$(@F:.o=.ver); \ | 204 | -T $(@D)/.tmp_$(@F:.o=.ver); \ |
202 | rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver); \ | 205 | rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver); \ |
203 | else \ | 206 | else \ |
204 | mv -f $(@D)/.tmp_$(@F) $@; \ | 207 | mv -f $(@D)/.tmp_$(@F) $@; \ |
205 | fi; | 208 | fi; |
206 | endif | 209 | endif |
207 | 210 | ||
208 | ifdef CONFIG_FTRACE_MCOUNT_RECORD | 211 | ifdef CONFIG_FTRACE_MCOUNT_RECORD |
209 | cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ | 212 | ifdef BUILD_C_RECORDMCOUNT |
213 | # Due to recursion, we must skip empty.o. | ||
214 | # The empty.o file is created in the make process in order to determine | ||
215 | # the target endianness and word size. It is made before all other C | ||
216 | # files, including recordmcount. | ||
217 | sub_cmd_record_mcount = \ | ||
218 | if [ $(@) != "scripts/mod/empty.o" ]; then \ | ||
219 | $(objtree)/scripts/recordmcount "$(@)"; \ | ||
220 | fi; | ||
221 | else | ||
222 | sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ | ||
210 | "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ | 223 | "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ |
211 | "$(if $(CONFIG_64BIT),64,32)" \ | 224 | "$(if $(CONFIG_64BIT),64,32)" \ |
212 | "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \ | 225 | "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \ |
226 | "$(LD)" "$(NM)" "$(RM)" "$(MV)" \ | ||
213 | "$(if $(part-of-module),1,0)" "$(@)"; | 227 | "$(if $(part-of-module),1,0)" "$(@)"; |
214 | endif | 228 | endif |
229 | cmd_record_mcount = \ | ||
230 | if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then \ | ||
231 | $(sub_cmd_record_mcount) \ | ||
232 | fi; | ||
233 | endif | ||
215 | 234 | ||
216 | define rule_cc_o_c | 235 | define rule_cc_o_c |
217 | $(call echo-cmd,checksrc) $(cmd_checksrc) \ | 236 | $(call echo-cmd,checksrc) $(cmd_checksrc) \ |
@@ -248,10 +267,10 @@ $(obj)/%.lst: $(src)/%.c FORCE | |||
248 | # Compile assembler sources (.S) | 267 | # Compile assembler sources (.S) |
249 | # --------------------------------------------------------------------------- | 268 | # --------------------------------------------------------------------------- |
250 | 269 | ||
251 | modkern_aflags := $(AFLAGS_KERNEL) | 270 | modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL) |
252 | 271 | ||
253 | $(real-objs-m) : modkern_aflags := $(AFLAGS_MODULE) | 272 | $(real-objs-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) |
254 | $(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE) | 273 | $(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) |
255 | 274 | ||
256 | quiet_cmd_as_s_S = CPP $(quiet_modtag) $@ | 275 | quiet_cmd_as_s_S = CPP $(quiet_modtag) $@ |
257 | cmd_as_s_S = $(CPP) $(a_flags) -o $@ $< | 276 | cmd_as_s_S = $(CPP) $(a_flags) -o $@ $< |
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index 6f89fbb5625..686cb0d31c7 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean | |||
@@ -45,6 +45,8 @@ __clean-files := $(extra-y) $(always) \ | |||
45 | $(host-progs) \ | 45 | $(host-progs) \ |
46 | $(hostprogs-y) $(hostprogs-m) $(hostprogs-) | 46 | $(hostprogs-y) $(hostprogs-m) $(hostprogs-) |
47 | 47 | ||
48 | __clean-files := $(filter-out $(no-clean-files), $(__clean-files)) | ||
49 | |||
48 | # as clean-files is given relative to the current directory, this adds | 50 | # as clean-files is given relative to the current directory, this adds |
49 | # a $(obj) prefix, except for absolute paths | 51 | # a $(obj) prefix, except for absolute paths |
50 | 52 | ||
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 0fcd8383877..f89cb87f5c0 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst | |||
@@ -3,7 +3,6 @@ | |||
3 | # | 3 | # |
4 | # header-y - list files to be installed. They are preprocessed | 4 | # header-y - list files to be installed. They are preprocessed |
5 | # to remove __KERNEL__ section of the file | 5 | # to remove __KERNEL__ section of the file |
6 | # unifdef-y - Same as header-y. Obsolete | ||
7 | # objhdr-y - Same as header-y but for generated files | 6 | # objhdr-y - Same as header-y but for generated files |
8 | # | 7 | # |
9 | # ========================================================================== | 8 | # ========================================================================== |
@@ -20,7 +19,7 @@ include scripts/Kbuild.include | |||
20 | 19 | ||
21 | install := $(INSTALL_HDR_PATH)/$(_dst) | 20 | install := $(INSTALL_HDR_PATH)/$(_dst) |
22 | 21 | ||
23 | header-y := $(sort $(header-y) $(unifdef-y)) | 22 | header-y := $(sort $(header-y)) |
24 | subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) | 23 | subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) |
25 | header-y := $(filter-out %/, $(header-y)) | 24 | header-y := $(filter-out %/, $(header-y)) |
26 | 25 | ||
diff --git a/scripts/Makefile.help b/scripts/Makefile.help new file mode 100644 index 00000000000..d03608f5db0 --- /dev/null +++ b/scripts/Makefile.help | |||
@@ -0,0 +1,3 @@ | |||
1 | |||
2 | checker-help: | ||
3 | @echo ' coccicheck - Check with Coccinelle.' | ||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index f3ccdb1b302..1c702ca8aac 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
@@ -101,14 +101,6 @@ basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))" | |||
101 | modname_flags = $(if $(filter 1,$(words $(modname))),\ | 101 | modname_flags = $(if $(filter 1,$(words $(modname))),\ |
102 | -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))") | 102 | -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))") |
103 | 103 | ||
104 | #hash values | ||
105 | ifdef CONFIG_DYNAMIC_DEBUG | ||
106 | debug_flags = -D"DEBUG_HASH=$(shell ./scripts/basic/hash djb2 $(@D)$(modname))"\ | ||
107 | -D"DEBUG_HASH2=$(shell ./scripts/basic/hash r5 $(@D)$(modname))" | ||
108 | else | ||
109 | debug_flags = | ||
110 | endif | ||
111 | |||
112 | orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ | 104 | orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ |
113 | $(ccflags-y) $(CFLAGS_$(basetarget).o) | 105 | $(ccflags-y) $(CFLAGS_$(basetarget).o) |
114 | _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) | 106 | _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) |
@@ -128,7 +120,9 @@ _c_flags += $(if $(patsubst n%,, \ | |||
128 | endif | 120 | endif |
129 | 121 | ||
130 | ifdef CONFIG_SYMBOL_PREFIX | 122 | ifdef CONFIG_SYMBOL_PREFIX |
131 | _cpp_flags += -DSYMBOL_PREFIX=$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX)) | 123 | _sym_flags = -DSYMBOL_PREFIX=$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX)) |
124 | _cpp_flags += $(_sym_flags) | ||
125 | _a_flags += $(_sym_flags) | ||
132 | endif | 126 | endif |
133 | 127 | ||
134 | 128 | ||
@@ -152,8 +146,7 @@ endif | |||
152 | 146 | ||
153 | c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ | 147 | c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ |
154 | $(__c_flags) $(modkern_cflags) \ | 148 | $(__c_flags) $(modkern_cflags) \ |
155 | -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags) \ | 149 | -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags) |
156 | $(debug_flags) | ||
157 | 150 | ||
158 | a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ | 151 | a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ |
159 | $(__a_flags) $(modkern_aflags) | 152 | $(__a_flags) $(modkern_aflags) |
@@ -207,6 +200,29 @@ quiet_cmd_gzip = GZIP $@ | |||
207 | cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \ | 200 | cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \ |
208 | (rm -f $@ ; false) | 201 | (rm -f $@ ; false) |
209 | 202 | ||
203 | # DTC | ||
204 | # --------------------------------------------------------------------------- | ||
205 | |||
206 | # Generate an assembly file to wrap the output of the device tree compiler | ||
207 | quiet_cmd_dt_S_dtb= DTB $@ | ||
208 | cmd_dt_S_dtb= \ | ||
209 | ( \ | ||
210 | echo '\#include <asm-generic/vmlinux.lds.h>'; \ | ||
211 | echo '.section .dtb.init.rodata,"a"'; \ | ||
212 | echo '.balign STRUCT_ALIGNMENT'; \ | ||
213 | echo '.global __dtb_$(*F)_begin'; \ | ||
214 | echo '__dtb_$(*F)_begin:'; \ | ||
215 | echo '.incbin "$<" '; \ | ||
216 | echo '__dtb_$(*F)_end:'; \ | ||
217 | echo '.global __dtb_$(*F)_end'; \ | ||
218 | echo '.balign STRUCT_ALIGNMENT'; \ | ||
219 | ) > $@ | ||
220 | |||
221 | $(obj)/%.dtb.S: $(obj)/%.dtb | ||
222 | $(call cmd,dt_S_dtb) | ||
223 | |||
224 | quiet_cmd_dtc = DTC $@ | ||
225 | cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $< | ||
210 | 226 | ||
211 | # Bzip2 | 227 | # Bzip2 |
212 | # --------------------------------------------------------------------------- | 228 | # --------------------------------------------------------------------------- |
@@ -245,3 +261,35 @@ quiet_cmd_lzo = LZO $@ | |||
245 | cmd_lzo = (cat $(filter-out FORCE,$^) | \ | 261 | cmd_lzo = (cat $(filter-out FORCE,$^) | \ |
246 | lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ | 262 | lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ |
247 | (rm -f $@ ; false) | 263 | (rm -f $@ ; false) |
264 | |||
265 | # XZ | ||
266 | # --------------------------------------------------------------------------- | ||
267 | # Use xzkern to compress the kernel image and xzmisc to compress other things. | ||
268 | # | ||
269 | # xzkern uses a big LZMA2 dictionary since it doesn't increase memory usage | ||
270 | # of the kernel decompressor. A BCJ filter is used if it is available for | ||
271 | # the target architecture. xzkern also appends uncompressed size of the data | ||
272 | # using size_append. The .xz format has the size information available at | ||
273 | # the end of the file too, but it's in more complex format and it's good to | ||
274 | # avoid changing the part of the boot code that reads the uncompressed size. | ||
275 | # Note that the bytes added by size_append will make the xz tool think that | ||
276 | # the file is corrupt. This is expected. | ||
277 | # | ||
278 | # xzmisc doesn't use size_append, so it can be used to create normal .xz | ||
279 | # files. xzmisc uses smaller LZMA2 dictionary than xzkern, because a very | ||
280 | # big dictionary would increase the memory usage too much in the multi-call | ||
281 | # decompression mode. A BCJ filter isn't used either. | ||
282 | quiet_cmd_xzkern = XZKERN $@ | ||
283 | cmd_xzkern = (cat $(filter-out FORCE,$^) | \ | ||
284 | sh $(srctree)/scripts/xz_wrap.sh && \ | ||
285 | $(call size_append, $(filter-out FORCE,$^))) > $@ || \ | ||
286 | (rm -f $@ ; false) | ||
287 | |||
288 | quiet_cmd_xzmisc = XZMISC $@ | ||
289 | cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ | ||
290 | xz --check=crc32 --lzma2=dict=1MiB) > $@ || \ | ||
291 | (rm -f $@ ; false) | ||
292 | |||
293 | # misc stuff | ||
294 | # --------------------------------------------------------------------------- | ||
295 | quote:=" | ||
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin index 102a276f6ee..1adb974e695 100644 --- a/scripts/Makefile.modbuiltin +++ b/scripts/Makefile.modbuiltin | |||
@@ -14,6 +14,11 @@ __modbuiltin: | |||
14 | 14 | ||
15 | include scripts/Kbuild.include | 15 | include scripts/Kbuild.include |
16 | 16 | ||
17 | ifneq ($(KBUILD_SRC),) | ||
18 | # Create output directory if not already present | ||
19 | _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) | ||
20 | endif | ||
21 | |||
17 | # The filename Kbuild has precedence over Makefile | 22 | # The filename Kbuild has precedence over Makefile |
18 | kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) | 23 | kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) |
19 | kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile) | 24 | kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile) |
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 8f14c81abbc..7d22056582c 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost | |||
@@ -30,7 +30,7 @@ | |||
30 | # - See include/linux/module.h for more details | 30 | # - See include/linux/module.h for more details |
31 | 31 | ||
32 | # Step 4 is solely used to allow module versioning in external modules, | 32 | # Step 4 is solely used to allow module versioning in external modules, |
33 | # where the CRC of each module is retrieved from the Module.symers file. | 33 | # where the CRC of each module is retrieved from the Module.symvers file. |
34 | 34 | ||
35 | # KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined | 35 | # KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined |
36 | # symbols in the final module linking stage | 36 | # symbols in the final module linking stage |
@@ -107,7 +107,7 @@ $(modules:.ko=.mod.c): __modpost ; | |||
107 | modname = $(notdir $(@:.mod.o=)) | 107 | modname = $(notdir $(@:.mod.o=)) |
108 | 108 | ||
109 | quiet_cmd_cc_o_c = CC $@ | 109 | quiet_cmd_cc_o_c = CC $@ |
110 | cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ | 110 | cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ |
111 | -c -o $@ $< | 111 | -c -o $@ $< |
112 | 112 | ||
113 | $(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE | 113 | $(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE |
@@ -117,8 +117,9 @@ targets += $(modules:.ko=.mod.o) | |||
117 | 117 | ||
118 | # Step 6), final link of the modules | 118 | # Step 6), final link of the modules |
119 | quiet_cmd_ld_ko_o = LD [M] $@ | 119 | quiet_cmd_ld_ko_o = LD [M] $@ |
120 | cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE) -o $@ \ | 120 | cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ |
121 | $(filter-out FORCE,$^) | 121 | $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ |
122 | -o $@ $(filter-out FORCE,$^) | ||
122 | 123 | ||
123 | $(modules): %.ko :%.o %.mod.o FORCE | 124 | $(modules): %.ko :%.o %.mod.o FORCE |
124 | $(call if_changed,ld_ko_o) | 125 | $(call if_changed,ld_ko_o) |
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile index 09559951df1..4c324a1f1e0 100644 --- a/scripts/basic/Makefile +++ b/scripts/basic/Makefile | |||
@@ -9,7 +9,7 @@ | |||
9 | # fixdep: Used to generate dependency information during build process | 9 | # fixdep: Used to generate dependency information during build process |
10 | # docproc: Used in Documentation/DocBook | 10 | # docproc: Used in Documentation/DocBook |
11 | 11 | ||
12 | hostprogs-y := fixdep docproc hash | 12 | hostprogs-y := fixdep docproc |
13 | always := $(hostprogs-y) | 13 | always := $(hostprogs-y) |
14 | 14 | ||
15 | # fixdep is needed to compile other host programs | 15 | # fixdep is needed to compile other host programs |
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c index 79ab973fb43..98dec87974d 100644 --- a/scripts/basic/docproc.c +++ b/scripts/basic/docproc.c | |||
@@ -34,12 +34,14 @@ | |||
34 | * | 34 | * |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #define _GNU_SOURCE | ||
37 | #include <stdio.h> | 38 | #include <stdio.h> |
38 | #include <stdlib.h> | 39 | #include <stdlib.h> |
39 | #include <string.h> | 40 | #include <string.h> |
40 | #include <ctype.h> | 41 | #include <ctype.h> |
41 | #include <unistd.h> | 42 | #include <unistd.h> |
42 | #include <limits.h> | 43 | #include <limits.h> |
44 | #include <errno.h> | ||
43 | #include <sys/types.h> | 45 | #include <sys/types.h> |
44 | #include <sys/wait.h> | 46 | #include <sys/wait.h> |
45 | 47 | ||
@@ -54,6 +56,7 @@ typedef void FILEONLY(char * file); | |||
54 | FILEONLY *internalfunctions; | 56 | FILEONLY *internalfunctions; |
55 | FILEONLY *externalfunctions; | 57 | FILEONLY *externalfunctions; |
56 | FILEONLY *symbolsonly; | 58 | FILEONLY *symbolsonly; |
59 | FILEONLY *findall; | ||
57 | 60 | ||
58 | typedef void FILELINE(char * file, char * line); | 61 | typedef void FILELINE(char * file, char * line); |
59 | FILELINE * singlefunctions; | 62 | FILELINE * singlefunctions; |
@@ -65,12 +68,30 @@ FILELINE * docsection; | |||
65 | #define KERNELDOCPATH "scripts/" | 68 | #define KERNELDOCPATH "scripts/" |
66 | #define KERNELDOC "kernel-doc" | 69 | #define KERNELDOC "kernel-doc" |
67 | #define DOCBOOK "-docbook" | 70 | #define DOCBOOK "-docbook" |
71 | #define LIST "-list" | ||
68 | #define FUNCTION "-function" | 72 | #define FUNCTION "-function" |
69 | #define NOFUNCTION "-nofunction" | 73 | #define NOFUNCTION "-nofunction" |
70 | #define NODOCSECTIONS "-no-doc-sections" | 74 | #define NODOCSECTIONS "-no-doc-sections" |
71 | 75 | ||
72 | static char *srctree, *kernsrctree; | 76 | static char *srctree, *kernsrctree; |
73 | 77 | ||
78 | static char **all_list = NULL; | ||
79 | static int all_list_len = 0; | ||
80 | |||
81 | static void consume_symbol(const char *sym) | ||
82 | { | ||
83 | int i; | ||
84 | |||
85 | for (i = 0; i < all_list_len; i++) { | ||
86 | if (!all_list[i]) | ||
87 | continue; | ||
88 | if (strcmp(sym, all_list[i])) | ||
89 | continue; | ||
90 | all_list[i] = NULL; | ||
91 | break; | ||
92 | } | ||
93 | } | ||
94 | |||
74 | static void usage (void) | 95 | static void usage (void) |
75 | { | 96 | { |
76 | fprintf(stderr, "Usage: docproc {doc|depend} file\n"); | 97 | fprintf(stderr, "Usage: docproc {doc|depend} file\n"); |
@@ -248,6 +269,7 @@ static void docfunctions(char * filename, char * type) | |||
248 | struct symfile * sym = &symfilelist[i]; | 269 | struct symfile * sym = &symfilelist[i]; |
249 | for (j=0; j < sym->symbolcnt; j++) { | 270 | for (j=0; j < sym->symbolcnt; j++) { |
250 | vec[idx++] = type; | 271 | vec[idx++] = type; |
272 | consume_symbol(sym->symbollist[j].name); | ||
251 | vec[idx++] = sym->symbollist[j].name; | 273 | vec[idx++] = sym->symbollist[j].name; |
252 | } | 274 | } |
253 | } | 275 | } |
@@ -287,6 +309,11 @@ static void singfunc(char * filename, char * line) | |||
287 | vec[idx++] = &line[i]; | 309 | vec[idx++] = &line[i]; |
288 | } | 310 | } |
289 | } | 311 | } |
312 | for (i = 0; i < idx; i++) { | ||
313 | if (strcmp(vec[i], FUNCTION)) | ||
314 | continue; | ||
315 | consume_symbol(vec[i + 1]); | ||
316 | } | ||
290 | vec[idx++] = filename; | 317 | vec[idx++] = filename; |
291 | vec[idx] = NULL; | 318 | vec[idx] = NULL; |
292 | exec_kernel_doc(vec); | 319 | exec_kernel_doc(vec); |
@@ -306,6 +333,13 @@ static void docsect(char *filename, char *line) | |||
306 | if (*s == '\n') | 333 | if (*s == '\n') |
307 | *s = '\0'; | 334 | *s = '\0'; |
308 | 335 | ||
336 | if (asprintf(&s, "DOC: %s", line) < 0) { | ||
337 | perror("asprintf"); | ||
338 | exit(1); | ||
339 | } | ||
340 | consume_symbol(s); | ||
341 | free(s); | ||
342 | |||
309 | vec[0] = KERNELDOC; | 343 | vec[0] = KERNELDOC; |
310 | vec[1] = DOCBOOK; | 344 | vec[1] = DOCBOOK; |
311 | vec[2] = FUNCTION; | 345 | vec[2] = FUNCTION; |
@@ -315,6 +349,84 @@ static void docsect(char *filename, char *line) | |||
315 | exec_kernel_doc(vec); | 349 | exec_kernel_doc(vec); |
316 | } | 350 | } |
317 | 351 | ||
352 | static void find_all_symbols(char *filename) | ||
353 | { | ||
354 | char *vec[4]; /* kerneldoc -list file NULL */ | ||
355 | pid_t pid; | ||
356 | int ret, i, count, start; | ||
357 | char real_filename[PATH_MAX + 1]; | ||
358 | int pipefd[2]; | ||
359 | char *data, *str; | ||
360 | size_t data_len = 0; | ||
361 | |||
362 | vec[0] = KERNELDOC; | ||
363 | vec[1] = LIST; | ||
364 | vec[2] = filename; | ||
365 | vec[3] = NULL; | ||
366 | |||
367 | if (pipe(pipefd)) { | ||
368 | perror("pipe"); | ||
369 | exit(1); | ||
370 | } | ||
371 | |||
372 | switch (pid=fork()) { | ||
373 | case -1: | ||
374 | perror("fork"); | ||
375 | exit(1); | ||
376 | case 0: | ||
377 | close(pipefd[0]); | ||
378 | dup2(pipefd[1], 1); | ||
379 | memset(real_filename, 0, sizeof(real_filename)); | ||
380 | strncat(real_filename, kernsrctree, PATH_MAX); | ||
381 | strncat(real_filename, "/" KERNELDOCPATH KERNELDOC, | ||
382 | PATH_MAX - strlen(real_filename)); | ||
383 | execvp(real_filename, vec); | ||
384 | fprintf(stderr, "exec "); | ||
385 | perror(real_filename); | ||
386 | exit(1); | ||
387 | default: | ||
388 | close(pipefd[1]); | ||
389 | data = malloc(4096); | ||
390 | do { | ||
391 | while ((ret = read(pipefd[0], | ||
392 | data + data_len, | ||
393 | 4096)) > 0) { | ||
394 | data_len += ret; | ||
395 | data = realloc(data, data_len + 4096); | ||
396 | } | ||
397 | } while (ret == -EAGAIN); | ||
398 | if (ret != 0) { | ||
399 | perror("read"); | ||
400 | exit(1); | ||
401 | } | ||
402 | waitpid(pid, &ret ,0); | ||
403 | } | ||
404 | if (WIFEXITED(ret)) | ||
405 | exitstatus |= WEXITSTATUS(ret); | ||
406 | else | ||
407 | exitstatus = 0xff; | ||
408 | |||
409 | count = 0; | ||
410 | /* poor man's strtok, but with counting */ | ||
411 | for (i = 0; i < data_len; i++) { | ||
412 | if (data[i] == '\n') { | ||
413 | count++; | ||
414 | data[i] = '\0'; | ||
415 | } | ||
416 | } | ||
417 | start = all_list_len; | ||
418 | all_list_len += count; | ||
419 | all_list = realloc(all_list, sizeof(char *) * all_list_len); | ||
420 | str = data; | ||
421 | for (i = 0; i < data_len && start != all_list_len; i++) { | ||
422 | if (data[i] == '\0') { | ||
423 | all_list[start] = str; | ||
424 | str = data + i + 1; | ||
425 | start++; | ||
426 | } | ||
427 | } | ||
428 | } | ||
429 | |||
318 | /* | 430 | /* |
319 | * Parse file, calling action specific functions for: | 431 | * Parse file, calling action specific functions for: |
320 | * 1) Lines containing !E | 432 | * 1) Lines containing !E |
@@ -322,7 +434,8 @@ static void docsect(char *filename, char *line) | |||
322 | * 3) Lines containing !D | 434 | * 3) Lines containing !D |
323 | * 4) Lines containing !F | 435 | * 4) Lines containing !F |
324 | * 5) Lines containing !P | 436 | * 5) Lines containing !P |
325 | * 6) Default lines - lines not matching the above | 437 | * 6) Lines containing !C |
438 | * 7) Default lines - lines not matching the above | ||
326 | */ | 439 | */ |
327 | static void parse_file(FILE *infile) | 440 | static void parse_file(FILE *infile) |
328 | { | 441 | { |
@@ -365,6 +478,12 @@ static void parse_file(FILE *infile) | |||
365 | s++; | 478 | s++; |
366 | docsection(line + 2, s); | 479 | docsection(line + 2, s); |
367 | break; | 480 | break; |
481 | case 'C': | ||
482 | while (*s && !isspace(*s)) s++; | ||
483 | *s = '\0'; | ||
484 | if (findall) | ||
485 | findall(line+2); | ||
486 | break; | ||
368 | default: | 487 | default: |
369 | defaultline(line); | 488 | defaultline(line); |
370 | } | 489 | } |
@@ -380,6 +499,7 @@ static void parse_file(FILE *infile) | |||
380 | int main(int argc, char *argv[]) | 499 | int main(int argc, char *argv[]) |
381 | { | 500 | { |
382 | FILE * infile; | 501 | FILE * infile; |
502 | int i; | ||
383 | 503 | ||
384 | srctree = getenv("SRCTREE"); | 504 | srctree = getenv("SRCTREE"); |
385 | if (!srctree) | 505 | if (!srctree) |
@@ -415,6 +535,7 @@ int main(int argc, char *argv[]) | |||
415 | symbolsonly = find_export_symbols; | 535 | symbolsonly = find_export_symbols; |
416 | singlefunctions = noaction2; | 536 | singlefunctions = noaction2; |
417 | docsection = noaction2; | 537 | docsection = noaction2; |
538 | findall = find_all_symbols; | ||
418 | parse_file(infile); | 539 | parse_file(infile); |
419 | 540 | ||
420 | /* Rewind to start from beginning of file again */ | 541 | /* Rewind to start from beginning of file again */ |
@@ -425,8 +546,16 @@ int main(int argc, char *argv[]) | |||
425 | symbolsonly = printline; | 546 | symbolsonly = printline; |
426 | singlefunctions = singfunc; | 547 | singlefunctions = singfunc; |
427 | docsection = docsect; | 548 | docsection = docsect; |
549 | findall = NULL; | ||
428 | 550 | ||
429 | parse_file(infile); | 551 | parse_file(infile); |
552 | |||
553 | for (i = 0; i < all_list_len; i++) { | ||
554 | if (!all_list[i]) | ||
555 | continue; | ||
556 | fprintf(stderr, "Warning: didn't use docs for %s\n", | ||
557 | all_list[i]); | ||
558 | } | ||
430 | } | 559 | } |
431 | else if (strcmp("depend", argv[1]) == 0) | 560 | else if (strcmp("depend", argv[1]) == 0) |
432 | { | 561 | { |
@@ -439,6 +568,7 @@ int main(int argc, char *argv[]) | |||
439 | symbolsonly = adddep; | 568 | symbolsonly = adddep; |
440 | singlefunctions = adddep2; | 569 | singlefunctions = adddep2; |
441 | docsection = adddep2; | 570 | docsection = adddep2; |
571 | findall = adddep; | ||
442 | parse_file(infile); | 572 | parse_file(infile); |
443 | printf("\n"); | 573 | printf("\n"); |
444 | } | 574 | } |
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index ea26b23de08..c9a16abacab 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
@@ -138,38 +138,36 @@ static void print_cmdline(void) | |||
138 | printf("cmd_%s := %s\n\n", target, cmdline); | 138 | printf("cmd_%s := %s\n\n", target, cmdline); |
139 | } | 139 | } |
140 | 140 | ||
141 | char * str_config = NULL; | 141 | struct item { |
142 | int size_config = 0; | 142 | struct item *next; |
143 | int len_config = 0; | 143 | unsigned int len; |
144 | unsigned int hash; | ||
145 | char name[0]; | ||
146 | }; | ||
144 | 147 | ||
145 | /* | 148 | #define HASHSZ 256 |
146 | * Grow the configuration string to a desired length. | 149 | static struct item *hashtab[HASHSZ]; |
147 | * Usually the first growth is plenty. | ||
148 | */ | ||
149 | static void grow_config(int len) | ||
150 | { | ||
151 | while (len_config + len > size_config) { | ||
152 | if (size_config == 0) | ||
153 | size_config = 2048; | ||
154 | str_config = realloc(str_config, size_config *= 2); | ||
155 | if (str_config == NULL) | ||
156 | { perror("fixdep:malloc"); exit(1); } | ||
157 | } | ||
158 | } | ||
159 | 150 | ||
151 | static unsigned int strhash(const char *str, unsigned int sz) | ||
152 | { | ||
153 | /* fnv32 hash */ | ||
154 | unsigned int i, hash = 2166136261U; | ||
160 | 155 | ||
156 | for (i = 0; i < sz; i++) | ||
157 | hash = (hash ^ str[i]) * 0x01000193; | ||
158 | return hash; | ||
159 | } | ||
161 | 160 | ||
162 | /* | 161 | /* |
163 | * Lookup a value in the configuration string. | 162 | * Lookup a value in the configuration string. |
164 | */ | 163 | */ |
165 | static int is_defined_config(const char * name, int len) | 164 | static int is_defined_config(const char *name, int len, unsigned int hash) |
166 | { | 165 | { |
167 | const char * pconfig; | 166 | struct item *aux; |
168 | const char * plast = str_config + len_config - len; | 167 | |
169 | for ( pconfig = str_config + 1; pconfig < plast; pconfig++ ) { | 168 | for (aux = hashtab[hash % HASHSZ]; aux; aux = aux->next) { |
170 | if (pconfig[ -1] == '\n' | 169 | if (aux->hash == hash && aux->len == len && |
171 | && pconfig[len] == '\n' | 170 | memcmp(aux->name, name, len) == 0) |
172 | && !memcmp(pconfig, name, len)) | ||
173 | return 1; | 171 | return 1; |
174 | } | 172 | } |
175 | return 0; | 173 | return 0; |
@@ -178,13 +176,19 @@ static int is_defined_config(const char * name, int len) | |||
178 | /* | 176 | /* |
179 | * Add a new value to the configuration string. | 177 | * Add a new value to the configuration string. |
180 | */ | 178 | */ |
181 | static void define_config(const char * name, int len) | 179 | static void define_config(const char *name, int len, unsigned int hash) |
182 | { | 180 | { |
183 | grow_config(len + 1); | 181 | struct item *aux = malloc(sizeof(*aux) + len); |
184 | 182 | ||
185 | memcpy(str_config+len_config, name, len); | 183 | if (!aux) { |
186 | len_config += len; | 184 | perror("fixdep:malloc"); |
187 | str_config[len_config++] = '\n'; | 185 | exit(1); |
186 | } | ||
187 | memcpy(aux->name, name, len); | ||
188 | aux->len = len; | ||
189 | aux->hash = hash; | ||
190 | aux->next = hashtab[hash % HASHSZ]; | ||
191 | hashtab[hash % HASHSZ] = aux; | ||
188 | } | 192 | } |
189 | 193 | ||
190 | /* | 194 | /* |
@@ -192,40 +196,49 @@ static void define_config(const char * name, int len) | |||
192 | */ | 196 | */ |
193 | static void clear_config(void) | 197 | static void clear_config(void) |
194 | { | 198 | { |
195 | len_config = 0; | 199 | struct item *aux, *next; |
196 | define_config("", 0); | 200 | unsigned int i; |
201 | |||
202 | for (i = 0; i < HASHSZ; i++) { | ||
203 | for (aux = hashtab[i]; aux; aux = next) { | ||
204 | next = aux->next; | ||
205 | free(aux); | ||
206 | } | ||
207 | hashtab[i] = NULL; | ||
208 | } | ||
197 | } | 209 | } |
198 | 210 | ||
199 | /* | 211 | /* |
200 | * Record the use of a CONFIG_* word. | 212 | * Record the use of a CONFIG_* word. |
201 | */ | 213 | */ |
202 | static void use_config(char *m, int slen) | 214 | static void use_config(const char *m, int slen) |
203 | { | 215 | { |
204 | char s[PATH_MAX]; | 216 | unsigned int hash = strhash(m, slen); |
205 | char *p; | 217 | int c, i; |
206 | 218 | ||
207 | if (is_defined_config(m, slen)) | 219 | if (is_defined_config(m, slen, hash)) |
208 | return; | 220 | return; |
209 | 221 | ||
210 | define_config(m, slen); | 222 | define_config(m, slen, hash); |
211 | 223 | ||
212 | memcpy(s, m, slen); s[slen] = 0; | 224 | printf(" $(wildcard include/config/"); |
213 | 225 | for (i = 0; i < slen; i++) { | |
214 | for (p = s; p < s + slen; p++) { | 226 | c = m[i]; |
215 | if (*p == '_') | 227 | if (c == '_') |
216 | *p = '/'; | 228 | c = '/'; |
217 | else | 229 | else |
218 | *p = tolower((int)*p); | 230 | c = tolower(c); |
231 | putchar(c); | ||
219 | } | 232 | } |
220 | printf(" $(wildcard include/config/%s.h) \\\n", s); | 233 | printf(".h) \\\n"); |
221 | } | 234 | } |
222 | 235 | ||
223 | static void parse_config_file(char *map, size_t len) | 236 | static void parse_config_file(const char *map, size_t len) |
224 | { | 237 | { |
225 | int *end = (int *) (map + len); | 238 | const int *end = (const int *) (map + len); |
226 | /* start at +1, so that p can never be < map */ | 239 | /* start at +1, so that p can never be < map */ |
227 | int *m = (int *) map + 1; | 240 | const int *m = (const int *) map + 1; |
228 | char *p, *q; | 241 | const char *p, *q; |
229 | 242 | ||
230 | for (; m < end; m++) { | 243 | for (; m < end; m++) { |
231 | if (*m == INT_CONF) { p = (char *) m ; goto conf; } | 244 | if (*m == INT_CONF) { p = (char *) m ; goto conf; } |
@@ -265,7 +278,7 @@ static int strrcmp(char *s, char *sub) | |||
265 | return memcmp(s + slen - sublen, sub, sublen); | 278 | return memcmp(s + slen - sublen, sub, sublen); |
266 | } | 279 | } |
267 | 280 | ||
268 | static void do_config_file(char *filename) | 281 | static void do_config_file(const char *filename) |
269 | { | 282 | { |
270 | struct stat st; | 283 | struct stat st; |
271 | int fd; | 284 | int fd; |
@@ -273,7 +286,7 @@ static void do_config_file(char *filename) | |||
273 | 286 | ||
274 | fd = open(filename, O_RDONLY); | 287 | fd = open(filename, O_RDONLY); |
275 | if (fd < 0) { | 288 | if (fd < 0) { |
276 | fprintf(stderr, "fixdep: "); | 289 | fprintf(stderr, "fixdep: error opening config file: "); |
277 | perror(filename); | 290 | perror(filename); |
278 | exit(2); | 291 | exit(2); |
279 | } | 292 | } |
@@ -344,11 +357,15 @@ static void print_deps(void) | |||
344 | 357 | ||
345 | fd = open(depfile, O_RDONLY); | 358 | fd = open(depfile, O_RDONLY); |
346 | if (fd < 0) { | 359 | if (fd < 0) { |
347 | fprintf(stderr, "fixdep: "); | 360 | fprintf(stderr, "fixdep: error opening depfile: "); |
348 | perror(depfile); | 361 | perror(depfile); |
349 | exit(2); | 362 | exit(2); |
350 | } | 363 | } |
351 | fstat(fd, &st); | 364 | if (fstat(fd, &st) < 0) { |
365 | fprintf(stderr, "fixdep: error fstat'ing depfile: "); | ||
366 | perror(depfile); | ||
367 | exit(2); | ||
368 | } | ||
352 | if (st.st_size == 0) { | 369 | if (st.st_size == 0) { |
353 | fprintf(stderr,"fixdep: %s is empty\n",depfile); | 370 | fprintf(stderr,"fixdep: %s is empty\n",depfile); |
354 | close(fd); | 371 | close(fd); |
diff --git a/scripts/basic/hash.c b/scripts/basic/hash.c deleted file mode 100644 index 2ef5d3f666b..00000000000 --- a/scripts/basic/hash.c +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2008 Red Hat, Inc., Jason Baron <jbaron@redhat.com> | ||
3 | * | ||
4 | */ | ||
5 | |||
6 | #include <stdio.h> | ||
7 | #include <stdlib.h> | ||
8 | #include <string.h> | ||
9 | |||
10 | #define DYNAMIC_DEBUG_HASH_BITS 6 | ||
11 | |||
12 | static const char *program; | ||
13 | |||
14 | static void usage(void) | ||
15 | { | ||
16 | printf("Usage: %s <djb2|r5> <modname>\n", program); | ||
17 | exit(1); | ||
18 | } | ||
19 | |||
20 | /* djb2 hashing algorithm by Dan Bernstein. From: | ||
21 | * http://www.cse.yorku.ca/~oz/hash.html | ||
22 | */ | ||
23 | |||
24 | static unsigned int djb2_hash(char *str) | ||
25 | { | ||
26 | unsigned long hash = 5381; | ||
27 | int c; | ||
28 | |||
29 | c = *str; | ||
30 | while (c) { | ||
31 | hash = ((hash << 5) + hash) + c; | ||
32 | c = *++str; | ||
33 | } | ||
34 | return (unsigned int)(hash & ((1 << DYNAMIC_DEBUG_HASH_BITS) - 1)); | ||
35 | } | ||
36 | |||
37 | static unsigned int r5_hash(char *str) | ||
38 | { | ||
39 | unsigned long hash = 0; | ||
40 | int c; | ||
41 | |||
42 | c = *str; | ||
43 | while (c) { | ||
44 | hash = (hash + (c << 4) + (c >> 4)) * 11; | ||
45 | c = *++str; | ||
46 | } | ||
47 | return (unsigned int)(hash & ((1 << DYNAMIC_DEBUG_HASH_BITS) - 1)); | ||
48 | } | ||
49 | |||
50 | int main(int argc, char *argv[]) | ||
51 | { | ||
52 | program = argv[0]; | ||
53 | |||
54 | if (argc != 3) | ||
55 | usage(); | ||
56 | if (!strcmp(argv[1], "djb2")) | ||
57 | printf("%d\n", djb2_hash(argv[2])); | ||
58 | else if (!strcmp(argv[1], "r5")) | ||
59 | printf("%d\n", r5_hash(argv[2])); | ||
60 | else | ||
61 | usage(); | ||
62 | exit(0); | ||
63 | } | ||
64 | |||
diff --git a/scripts/binoffset.c b/scripts/binoffset.c deleted file mode 100644 index 1a2e39b8e3e..00000000000 --- a/scripts/binoffset.c +++ /dev/null | |||
@@ -1,163 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * binoffset.c | ||
3 | * (C) 2002 Randy Dunlap <rdunlap@xenotime.net> | ||
4 | |||
5 | # This program is free software; you can redistribute it and/or modify | ||
6 | # it under the terms of the GNU General Public License as published by | ||
7 | # the Free Software Foundation; either version 2 of the License, or | ||
8 | # (at your option) any later version. | ||
9 | # | ||
10 | # This program is distributed in the hope that it will be useful, | ||
11 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | # GNU General Public License for more details. | ||
14 | # | ||
15 | # You should have received a copy of the GNU General Public License | ||
16 | # along with this program; if not, write to the Free Software | ||
17 | # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
18 | |||
19 | # binoffset.c: | ||
20 | # - searches a (binary) file for a specified (binary) pattern | ||
21 | # - returns the offset of the located pattern or ~0 if not found | ||
22 | # - exits with exit status 0 normally or non-0 if pattern is not found | ||
23 | # or any other error occurs. | ||
24 | |||
25 | ****************************************************************/ | ||
26 | |||
27 | #include <stdio.h> | ||
28 | #include <stdlib.h> | ||
29 | #include <string.h> | ||
30 | #include <errno.h> | ||
31 | #include <unistd.h> | ||
32 | #include <fcntl.h> | ||
33 | #include <sys/types.h> | ||
34 | #include <sys/stat.h> | ||
35 | #include <sys/mman.h> | ||
36 | |||
37 | #define VERSION "0.1" | ||
38 | #define BUF_SIZE (16 * 1024) | ||
39 | #define PAT_SIZE 100 | ||
40 | |||
41 | char *progname; | ||
42 | char *inputname; | ||
43 | int inputfd; | ||
44 | unsigned int bix; /* buf index */ | ||
45 | unsigned char patterns [PAT_SIZE] = {0}; /* byte-sized pattern array */ | ||
46 | int pat_len; /* actual number of pattern bytes */ | ||
47 | unsigned char *madr; /* mmap address */ | ||
48 | size_t filesize; | ||
49 | int num_matches = 0; | ||
50 | off_t firstloc = 0; | ||
51 | |||
52 | void usage (void) | ||
53 | { | ||
54 | fprintf (stderr, "%s ver. %s\n", progname, VERSION); | ||
55 | fprintf (stderr, "usage: %s filename pattern_bytes\n", | ||
56 | progname); | ||
57 | fprintf (stderr, " [prints location of pattern_bytes in file]\n"); | ||
58 | exit (1); | ||
59 | } | ||
60 | |||
61 | void get_pattern (int pat_count, char *pats []) | ||
62 | { | ||
63 | int ix, err, tmp; | ||
64 | |||
65 | #ifdef DEBUG | ||
66 | fprintf (stderr,"get_pattern: count = %d\n", pat_count); | ||
67 | for (ix = 0; ix < pat_count; ix++) | ||
68 | fprintf (stderr, " pat # %d: [%s]\n", ix, pats[ix]); | ||
69 | #endif | ||
70 | |||
71 | for (ix = 0; ix < pat_count; ix++) { | ||
72 | tmp = 0; | ||
73 | err = sscanf (pats[ix], "%5i", &tmp); | ||
74 | if (err != 1 || tmp > 0xff) { | ||
75 | fprintf (stderr, "pattern or value error in pattern # %d [%s]\n", | ||
76 | ix, pats[ix]); | ||
77 | usage (); | ||
78 | } | ||
79 | patterns [ix] = tmp; | ||
80 | } | ||
81 | pat_len = pat_count; | ||
82 | } | ||
83 | |||
84 | void search_pattern (void) | ||
85 | { | ||
86 | for (bix = 0; bix < filesize; bix++) { | ||
87 | if (madr[bix] == patterns[0]) { | ||
88 | if (memcmp (&madr[bix], patterns, pat_len) == 0) { | ||
89 | if (num_matches == 0) | ||
90 | firstloc = bix; | ||
91 | num_matches++; | ||
92 | } | ||
93 | } | ||
94 | } | ||
95 | } | ||
96 | |||
97 | #ifdef NOTDEF | ||
98 | size_t get_filesize (int fd) | ||
99 | { | ||
100 | off_t end_off = lseek (fd, 0, SEEK_END); | ||
101 | lseek (fd, 0, SEEK_SET); | ||
102 | return (size_t) end_off; | ||
103 | } | ||
104 | #endif | ||
105 | |||
106 | size_t get_filesize (int fd) | ||
107 | { | ||
108 | int err; | ||
109 | struct stat stat; | ||
110 | |||
111 | err = fstat (fd, &stat); | ||
112 | fprintf (stderr, "filesize: %ld\n", err < 0 ? (long)err : stat.st_size); | ||
113 | if (err < 0) | ||
114 | return err; | ||
115 | return (size_t) stat.st_size; | ||
116 | } | ||
117 | |||
118 | int main (int argc, char *argv []) | ||
119 | { | ||
120 | progname = argv[0]; | ||
121 | |||
122 | if (argc < 3) | ||
123 | usage (); | ||
124 | |||
125 | get_pattern (argc - 2, argv + 2); | ||
126 | |||
127 | inputname = argv[1]; | ||
128 | |||
129 | inputfd = open (inputname, O_RDONLY); | ||
130 | if (inputfd == -1) { | ||
131 | fprintf (stderr, "%s: cannot open '%s'\n", | ||
132 | progname, inputname); | ||
133 | exit (3); | ||
134 | } | ||
135 | |||
136 | filesize = get_filesize (inputfd); | ||
137 | |||
138 | madr = mmap (0, filesize, PROT_READ, MAP_PRIVATE, inputfd, 0); | ||
139 | if (madr == MAP_FAILED) { | ||
140 | fprintf (stderr, "mmap error = %d\n", errno); | ||
141 | close (inputfd); | ||
142 | exit (4); | ||
143 | } | ||
144 | |||
145 | search_pattern (); | ||
146 | |||
147 | if (munmap (madr, filesize)) | ||
148 | fprintf (stderr, "munmap error = %d\n", errno); | ||
149 | |||
150 | if (close (inputfd)) | ||
151 | fprintf (stderr, "%s: error %d closing '%s'\n", | ||
152 | progname, errno, inputname); | ||
153 | |||
154 | fprintf (stderr, "number of pattern matches = %d\n", num_matches); | ||
155 | if (num_matches == 0) | ||
156 | firstloc = ~0; | ||
157 | printf ("%ld\n", firstloc); | ||
158 | fprintf (stderr, "%ld\n", firstloc); | ||
159 | |||
160 | exit (num_matches ? 0 : 2); | ||
161 | } | ||
162 | |||
163 | /* end binoffset.c */ | ||
diff --git a/scripts/checkkconfigsymbols.sh b/scripts/checkkconfigsymbols.sh index 46be3c5a62b..2ca49bb31ef 100755 --- a/scripts/checkkconfigsymbols.sh +++ b/scripts/checkkconfigsymbols.sh | |||
@@ -14,7 +14,7 @@ find $paths -name '*.[chS]' -o -name 'Makefile' -o -name 'Makefile*[^~]'| while | |||
14 | do | 14 | do |
15 | # Output the bare Kconfig variable and the filename; the _MODULE part at | 15 | # Output the bare Kconfig variable and the filename; the _MODULE part at |
16 | # the end is not removed here (would need perl an not-hungry regexp for that). | 16 | # the end is not removed here (would need perl an not-hungry regexp for that). |
17 | sed -ne 's!^.*\<\(UML_\)\?CONFIG_\([0-9A-Z_]\+\).*!\2 '$i'!p' < $i | 17 | sed -ne 's!^.*\<\(UML_\)\?CONFIG_\([0-9A-Za-z_]\+\).*!\2 '$i'!p' < $i |
18 | done | \ | 18 | done | \ |
19 | # Smart "sort|uniq" implemented in awk and tuned to collect the names of all | 19 | # Smart "sort|uniq" implemented in awk and tuned to collect the names of all |
20 | # files which use a given symbol | 20 | # files which use a given symbol |
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3257d3d9676..4c0383da1c9 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
@@ -2,7 +2,7 @@ | |||
2 | # (c) 2001, Dave Jones. (the file handling bit) | 2 | # (c) 2001, Dave Jones. (the file handling bit) |
3 | # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit) | 3 | # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit) |
4 | # (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite) | 4 | # (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite) |
5 | # (c) 2008,2009, Andy Whitcroft <apw@canonical.com> | 5 | # (c) 2008-2010 Andy Whitcroft <apw@canonical.com> |
6 | # Licensed under the terms of the GNU GPL License version 2 | 6 | # Licensed under the terms of the GNU GPL License version 2 |
7 | 7 | ||
8 | use strict; | 8 | use strict; |
@@ -10,7 +10,7 @@ use strict; | |||
10 | my $P = $0; | 10 | my $P = $0; |
11 | $P =~ s@.*/@@g; | 11 | $P =~ s@.*/@@g; |
12 | 12 | ||
13 | my $V = '0.30'; | 13 | my $V = '0.31'; |
14 | 14 | ||
15 | use Getopt::Long qw(:config no_auto_abbrev); | 15 | use Getopt::Long qw(:config no_auto_abbrev); |
16 | 16 | ||
@@ -103,6 +103,8 @@ for my $key (keys %debug) { | |||
103 | die "$@" if ($@); | 103 | die "$@" if ($@); |
104 | } | 104 | } |
105 | 105 | ||
106 | my $rpt_cleaners = 0; | ||
107 | |||
106 | if ($terse) { | 108 | if ($terse) { |
107 | $emacs = 1; | 109 | $emacs = 1; |
108 | $quiet++; | 110 | $quiet++; |
@@ -145,11 +147,28 @@ our $Sparse = qr{ | |||
145 | __kprobes| | 147 | __kprobes| |
146 | __ref | 148 | __ref |
147 | }x; | 149 | }x; |
150 | |||
151 | # Notes to $Attribute: | ||
152 | # We need \b after 'init' otherwise 'initconst' will cause a false positive in a check | ||
148 | our $Attribute = qr{ | 153 | our $Attribute = qr{ |
149 | const| | 154 | const| |
155 | __percpu| | ||
156 | __nocast| | ||
157 | __safe| | ||
158 | __bitwise__| | ||
159 | __packed__| | ||
160 | __packed2__| | ||
161 | __naked| | ||
162 | __maybe_unused| | ||
163 | __always_unused| | ||
164 | __noreturn| | ||
165 | __used| | ||
166 | __cold| | ||
167 | __noclone| | ||
168 | __deprecated| | ||
150 | __read_mostly| | 169 | __read_mostly| |
151 | __kprobes| | 170 | __kprobes| |
152 | __(?:mem|cpu|dev|)(?:initdata|init)| | 171 | __(?:mem|cpu|dev|)(?:initdata|initconst|init\b)| |
153 | ____cacheline_aligned| | 172 | ____cacheline_aligned| |
154 | ____cacheline_aligned_in_smp| | 173 | ____cacheline_aligned_in_smp| |
155 | ____cacheline_internodealigned_in_smp| | 174 | ____cacheline_internodealigned_in_smp| |
@@ -189,6 +208,14 @@ our $typeTypedefs = qr{(?x: | |||
189 | atomic_t | 208 | atomic_t |
190 | )}; | 209 | )}; |
191 | 210 | ||
211 | our $logFunctions = qr{(?x: | ||
212 | printk| | ||
213 | pr_(debug|dbg|vdbg|devel|info|warning|err|notice|alert|crit|emerg|cont)| | ||
214 | (dev|netdev|netif)_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)| | ||
215 | WARN| | ||
216 | panic | ||
217 | )}; | ||
218 | |||
192 | our @typeList = ( | 219 | our @typeList = ( |
193 | qr{void}, | 220 | qr{void}, |
194 | qr{(?:unsigned\s+)?char}, | 221 | qr{(?:unsigned\s+)?char}, |
@@ -213,6 +240,12 @@ our @modifierList = ( | |||
213 | qr{fastcall}, | 240 | qr{fastcall}, |
214 | ); | 241 | ); |
215 | 242 | ||
243 | our $allowed_asm_includes = qr{(?x: | ||
244 | irq| | ||
245 | memory | ||
246 | )}; | ||
247 | # memory.h: ARM has a custom one | ||
248 | |||
216 | sub build_types { | 249 | sub build_types { |
217 | my $mods = "(?x: \n" . join("|\n ", @modifierList) . "\n)"; | 250 | my $mods = "(?x: \n" . join("|\n ", @modifierList) . "\n)"; |
218 | my $all = "(?x: \n" . join("|\n ", @typeList) . "\n)"; | 251 | my $all = "(?x: \n" . join("|\n ", @typeList) . "\n)"; |
@@ -541,6 +574,9 @@ sub ctx_statement_block { | |||
541 | $type = ($level != 0)? '{' : ''; | 574 | $type = ($level != 0)? '{' : ''; |
542 | 575 | ||
543 | if ($level == 0) { | 576 | if ($level == 0) { |
577 | if (substr($blk, $off + 1, 1) eq ';') { | ||
578 | $off++; | ||
579 | } | ||
544 | last; | 580 | last; |
545 | } | 581 | } |
546 | } | 582 | } |
@@ -655,15 +691,15 @@ sub ctx_block_get { | |||
655 | $blk .= $rawlines[$line]; | 691 | $blk .= $rawlines[$line]; |
656 | 692 | ||
657 | # Handle nested #if/#else. | 693 | # Handle nested #if/#else. |
658 | if ($rawlines[$line] =~ /^.\s*#\s*(?:ifndef|ifdef|if)\s/) { | 694 | if ($lines[$line] =~ /^.\s*#\s*(?:ifndef|ifdef|if)\s/) { |
659 | push(@stack, $level); | 695 | push(@stack, $level); |
660 | } elsif ($rawlines[$line] =~ /^.\s*#\s*(?:else|elif)\b/) { | 696 | } elsif ($lines[$line] =~ /^.\s*#\s*(?:else|elif)\b/) { |
661 | $level = $stack[$#stack - 1]; | 697 | $level = $stack[$#stack - 1]; |
662 | } elsif ($rawlines[$line] =~ /^.\s*#\s*endif\b/) { | 698 | } elsif ($lines[$line] =~ /^.\s*#\s*endif\b/) { |
663 | $level = pop(@stack); | 699 | $level = pop(@stack); |
664 | } | 700 | } |
665 | 701 | ||
666 | foreach my $c (split(//, $rawlines[$line])) { | 702 | foreach my $c (split(//, $lines[$line])) { |
667 | ##print "C<$c>L<$level><$open$close>O<$off>\n"; | 703 | ##print "C<$c>L<$level><$open$close>O<$off>\n"; |
668 | if ($off > 0) { | 704 | if ($off > 0) { |
669 | $off--; | 705 | $off--; |
@@ -823,7 +859,12 @@ sub annotate_values { | |||
823 | $av_preprocessor = 0; | 859 | $av_preprocessor = 0; |
824 | } | 860 | } |
825 | 861 | ||
826 | } elsif ($cur =~ /^($Type)\s*(?:$Ident|,|\)|\()/) { | 862 | } elsif ($cur =~ /^(\(\s*$Type\s*)\)/ && $av_pending eq '_') { |
863 | print "CAST($1)\n" if ($dbg_values > 1); | ||
864 | push(@av_paren_type, $type); | ||
865 | $type = 'C'; | ||
866 | |||
867 | } elsif ($cur =~ /^($Type)\s*(?:$Ident|,|\)|\(|\s*$)/) { | ||
827 | print "DECLARE($1)\n" if ($dbg_values > 1); | 868 | print "DECLARE($1)\n" if ($dbg_values > 1); |
828 | $type = 'T'; | 869 | $type = 'T'; |
829 | 870 | ||
@@ -1288,7 +1329,11 @@ sub process { | |||
1288 | $here = "#$realline: " if ($file); | 1329 | $here = "#$realline: " if ($file); |
1289 | 1330 | ||
1290 | # extract the filename as it passes | 1331 | # extract the filename as it passes |
1291 | if ($line=~/^\+\+\+\s+(\S+)/) { | 1332 | if ($line =~ /^diff --git.*?(\S+)$/) { |
1333 | $realfile = $1; | ||
1334 | $realfile =~ s@^([^/]*)/@@; | ||
1335 | |||
1336 | } elsif ($line =~ /^\+\+\+\s+(\S+)/) { | ||
1292 | $realfile = $1; | 1337 | $realfile = $1; |
1293 | $realfile =~ s@^([^/]*)/@@; | 1338 | $realfile =~ s@^([^/]*)/@@; |
1294 | 1339 | ||
@@ -1312,6 +1357,14 @@ sub process { | |||
1312 | 1357 | ||
1313 | $cnt_lines++ if ($realcnt != 0); | 1358 | $cnt_lines++ if ($realcnt != 0); |
1314 | 1359 | ||
1360 | # Check for incorrect file permissions | ||
1361 | if ($line =~ /^new (file )?mode.*[7531]\d{0,2}$/) { | ||
1362 | my $permhere = $here . "FILE: $realfile\n"; | ||
1363 | if ($realfile =~ /(Makefile|Kconfig|\.c|\.h|\.S|\.tmpl)$/) { | ||
1364 | ERROR("do not set execute permissions for source files\n" . $permhere); | ||
1365 | } | ||
1366 | } | ||
1367 | |||
1315 | #check the patch for a signoff: | 1368 | #check the patch for a signoff: |
1316 | if ($line =~ /^\s*signed-off-by:/i) { | 1369 | if ($line =~ /^\s*signed-off-by:/i) { |
1317 | # This is a signoff, if ugly, so do not double report. | 1370 | # This is a signoff, if ugly, so do not double report. |
@@ -1369,6 +1422,38 @@ sub process { | |||
1369 | } elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) { | 1422 | } elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) { |
1370 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; | 1423 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; |
1371 | ERROR("trailing whitespace\n" . $herevet); | 1424 | ERROR("trailing whitespace\n" . $herevet); |
1425 | $rpt_cleaners = 1; | ||
1426 | } | ||
1427 | |||
1428 | # check for Kconfig help text having a real description | ||
1429 | # Only applies when adding the entry originally, after that we do not have | ||
1430 | # sufficient context to determine whether it is indeed long enough. | ||
1431 | if ($realfile =~ /Kconfig/ && | ||
1432 | $line =~ /\+\s*(?:---)?help(?:---)?$/) { | ||
1433 | my $length = 0; | ||
1434 | my $cnt = $realcnt; | ||
1435 | my $ln = $linenr + 1; | ||
1436 | my $f; | ||
1437 | my $is_end = 0; | ||
1438 | while ($cnt > 0 && defined $lines[$ln - 1]) { | ||
1439 | $f = $lines[$ln - 1]; | ||
1440 | $cnt-- if ($lines[$ln - 1] !~ /^-/); | ||
1441 | $is_end = $lines[$ln - 1] =~ /^\+/; | ||
1442 | $ln++; | ||
1443 | |||
1444 | next if ($f =~ /^-/); | ||
1445 | $f =~ s/^.//; | ||
1446 | $f =~ s/#.*//; | ||
1447 | $f =~ s/^\s+//; | ||
1448 | next if ($f =~ /^$/); | ||
1449 | if ($f =~ /^\s*config\s/) { | ||
1450 | $is_end = 1; | ||
1451 | last; | ||
1452 | } | ||
1453 | $length++; | ||
1454 | } | ||
1455 | WARN("please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($is_end && $length < 4); | ||
1456 | #print "is_end<$is_end> length<$length>\n"; | ||
1372 | } | 1457 | } |
1373 | 1458 | ||
1374 | # check we are in a valid source file if not then ignore this hunk | 1459 | # check we are in a valid source file if not then ignore this hunk |
@@ -1377,12 +1462,18 @@ sub process { | |||
1377 | #80 column limit | 1462 | #80 column limit |
1378 | if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ && | 1463 | if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ && |
1379 | $rawline !~ /^.\s*\*\s*\@$Ident\s/ && | 1464 | $rawline !~ /^.\s*\*\s*\@$Ident\s/ && |
1380 | $line !~ /^\+\s*printk\s*\(\s*(?:KERN_\S+\s*)?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ && | 1465 | !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ || |
1466 | $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) && | ||
1381 | $length > 80) | 1467 | $length > 80) |
1382 | { | 1468 | { |
1383 | WARN("line over 80 characters\n" . $herecurr); | 1469 | WARN("line over 80 characters\n" . $herecurr); |
1384 | } | 1470 | } |
1385 | 1471 | ||
1472 | # check for spaces before a quoted newline | ||
1473 | if ($rawline =~ /^.*\".*\s\\n/) { | ||
1474 | WARN("unnecessary whitespace before a quoted newline\n" . $herecurr); | ||
1475 | } | ||
1476 | |||
1386 | # check for adding lines without a newline. | 1477 | # check for adding lines without a newline. |
1387 | if ($line =~ /^\+/ && defined $lines[$linenr] && $lines[$linenr] =~ /^\\ No newline at end of file/) { | 1478 | if ($line =~ /^\+/ && defined $lines[$linenr] && $lines[$linenr] =~ /^\\ No newline at end of file/) { |
1388 | WARN("adding a line without newline at end of file\n" . $herecurr); | 1479 | WARN("adding a line without newline at end of file\n" . $herecurr); |
@@ -1409,6 +1500,23 @@ sub process { | |||
1409 | $rawline =~ /^\+\s* \s*/) { | 1500 | $rawline =~ /^\+\s* \s*/) { |
1410 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; | 1501 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; |
1411 | ERROR("code indent should use tabs where possible\n" . $herevet); | 1502 | ERROR("code indent should use tabs where possible\n" . $herevet); |
1503 | $rpt_cleaners = 1; | ||
1504 | } | ||
1505 | |||
1506 | # check for space before tabs. | ||
1507 | if ($rawline =~ /^\+/ && $rawline =~ / \t/) { | ||
1508 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; | ||
1509 | WARN("please, no space before tabs\n" . $herevet); | ||
1510 | } | ||
1511 | |||
1512 | # check for spaces at the beginning of a line. | ||
1513 | # Exceptions: | ||
1514 | # 1) within comments | ||
1515 | # 2) indented preprocessor commands | ||
1516 | # 3) hanging labels | ||
1517 | if ($rawline =~ /^\+ / && $line !~ /\+ *(?:$;|#|$Ident:)/) { | ||
1518 | my $herevet = "$here\n" . cat_vet($rawline) . "\n"; | ||
1519 | WARN("please, no spaces at the start of a line\n" . $herevet); | ||
1412 | } | 1520 | } |
1413 | 1521 | ||
1414 | # check we are in a valid C source file if not then ignore this hunk | 1522 | # check we are in a valid C source file if not then ignore this hunk |
@@ -1544,7 +1652,7 @@ sub process { | |||
1544 | 1652 | ||
1545 | if ($ctx !~ /{\s*/ && defined($lines[$ctx_ln -1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/) { | 1653 | if ($ctx !~ /{\s*/ && defined($lines[$ctx_ln -1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/) { |
1546 | ERROR("that open brace { should be on the previous line\n" . | 1654 | ERROR("that open brace { should be on the previous line\n" . |
1547 | "$here\n$ctx\n$lines[$ctx_ln - 1]\n"); | 1655 | "$here\n$ctx\n$rawlines[$ctx_ln - 1]\n"); |
1548 | } | 1656 | } |
1549 | if ($level == 0 && $pre_ctx !~ /}\s*while\s*\($/ && | 1657 | if ($level == 0 && $pre_ctx !~ /}\s*while\s*\($/ && |
1550 | $ctx =~ /\)\s*\;\s*$/ && | 1658 | $ctx =~ /\)\s*\;\s*$/ && |
@@ -1553,7 +1661,7 @@ sub process { | |||
1553 | my ($nlength, $nindent) = line_stats($lines[$ctx_ln - 1]); | 1661 | my ($nlength, $nindent) = line_stats($lines[$ctx_ln - 1]); |
1554 | if ($nindent > $indent) { | 1662 | if ($nindent > $indent) { |
1555 | WARN("trailing semicolon indicates no statements, indent implies otherwise\n" . | 1663 | WARN("trailing semicolon indicates no statements, indent implies otherwise\n" . |
1556 | "$here\n$ctx\n$lines[$ctx_ln - 1]\n"); | 1664 | "$here\n$ctx\n$rawlines[$ctx_ln - 1]\n"); |
1557 | } | 1665 | } |
1558 | } | 1666 | } |
1559 | } | 1667 | } |
@@ -1714,8 +1822,17 @@ sub process { | |||
1714 | !defined $suppress_export{$realline_next} && | 1822 | !defined $suppress_export{$realline_next} && |
1715 | ($lines[$realline_next - 1] =~ /EXPORT_SYMBOL.*\((.*)\)/ || | 1823 | ($lines[$realline_next - 1] =~ /EXPORT_SYMBOL.*\((.*)\)/ || |
1716 | $lines[$realline_next - 1] =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) { | 1824 | $lines[$realline_next - 1] =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) { |
1825 | # Handle definitions which produce identifiers with | ||
1826 | # a prefix: | ||
1827 | # XXX(foo); | ||
1828 | # EXPORT_SYMBOL(something_foo); | ||
1717 | my $name = $1; | 1829 | my $name = $1; |
1718 | if ($stat !~ /(?: | 1830 | if ($stat =~ /^.([A-Z_]+)\s*\(\s*($Ident)/ && |
1831 | $name =~ /^${Ident}_$2/) { | ||
1832 | #print "FOO C name<$name>\n"; | ||
1833 | $suppress_export{$realline_next} = 1; | ||
1834 | |||
1835 | } elsif ($stat !~ /(?: | ||
1719 | \n.}\s*$| | 1836 | \n.}\s*$| |
1720 | ^.DEFINE_$Ident\(\Q$name\E\)| | 1837 | ^.DEFINE_$Ident\(\Q$name\E\)| |
1721 | ^.DECLARE_$Ident\(\Q$name\E\)| | 1838 | ^.DECLARE_$Ident\(\Q$name\E\)| |
@@ -1741,9 +1858,9 @@ sub process { | |||
1741 | WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr); | 1858 | WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr); |
1742 | } | 1859 | } |
1743 | 1860 | ||
1744 | # check for external initialisers. | 1861 | # check for global initialisers. |
1745 | if ($line =~ /^.$Type\s*$Ident\s*(?:\s+$Modifier)*\s*=\s*(0|NULL|false)\s*;/) { | 1862 | if ($line =~ /^.$Type\s*$Ident\s*(?:\s+$Modifier)*\s*=\s*(0|NULL|false)\s*;/) { |
1746 | ERROR("do not initialise externals to 0 or NULL\n" . | 1863 | ERROR("do not initialise globals to 0 or NULL\n" . |
1747 | $herecurr); | 1864 | $herecurr); |
1748 | } | 1865 | } |
1749 | # check for static initialisers. | 1866 | # check for static initialisers. |
@@ -1752,6 +1869,23 @@ sub process { | |||
1752 | $herecurr); | 1869 | $herecurr); |
1753 | } | 1870 | } |
1754 | 1871 | ||
1872 | # check for static const char * arrays. | ||
1873 | if ($line =~ /\bstatic\s+const\s+char\s*\*\s*(\w+)\s*\[\s*\]\s*=\s*/) { | ||
1874 | WARN("static const char * array should probably be static const char * const\n" . | ||
1875 | $herecurr); | ||
1876 | } | ||
1877 | |||
1878 | # check for static char foo[] = "bar" declarations. | ||
1879 | if ($line =~ /\bstatic\s+char\s+(\w+)\s*\[\s*\]\s*=\s*"/) { | ||
1880 | WARN("static char array declaration should probably be static const char\n" . | ||
1881 | $herecurr); | ||
1882 | } | ||
1883 | |||
1884 | # check for declarations of struct pci_device_id | ||
1885 | if ($line =~ /\bstruct\s+pci_device_id\s+\w+\s*\[\s*\]\s*\=\s*\{/) { | ||
1886 | WARN("Use DEFINE_PCI_DEVICE_TABLE for struct pci_device_id\n" . $herecurr); | ||
1887 | } | ||
1888 | |||
1755 | # check for new typedefs, only function parameters and sparse annotations | 1889 | # check for new typedefs, only function parameters and sparse annotations |
1756 | # make sense. | 1890 | # make sense. |
1757 | if ($line =~ /\btypedef\s/ && | 1891 | if ($line =~ /\btypedef\s/ && |
@@ -1845,6 +1979,11 @@ sub process { | |||
1845 | ERROR("open brace '{' following $1 go on the same line\n" . $hereprev); | 1979 | ERROR("open brace '{' following $1 go on the same line\n" . $hereprev); |
1846 | } | 1980 | } |
1847 | 1981 | ||
1982 | # missing space after union, struct or enum definition | ||
1983 | if ($line =~ /^.\s*(?:typedef\s+)?(enum|union|struct)(?:\s+$Ident)?(?:\s+$Ident)?[=\{]/) { | ||
1984 | WARN("missing space after $1 definition\n" . $herecurr); | ||
1985 | } | ||
1986 | |||
1848 | # check for spacing round square brackets; allowed: | 1987 | # check for spacing round square brackets; allowed: |
1849 | # 1. with a type on the left -- int [] a; | 1988 | # 1. with a type on the left -- int [] a; |
1850 | # 2. at the beginning of a line for slice initialisers -- [0...10] = 5, | 1989 | # 2. at the beginning of a line for slice initialisers -- [0...10] = 5, |
@@ -2122,21 +2261,29 @@ sub process { | |||
2122 | my $value = $2; | 2261 | my $value = $2; |
2123 | 2262 | ||
2124 | # Flatten any parentheses | 2263 | # Flatten any parentheses |
2125 | $value =~ s/\)\(/\) \(/g; | 2264 | $value =~ s/\(/ \(/g; |
2265 | $value =~ s/\)/\) /g; | ||
2126 | while ($value =~ s/\[[^\{\}]*\]/1/ || | 2266 | while ($value =~ s/\[[^\{\}]*\]/1/ || |
2127 | $value !~ /(?:$Ident|-?$Constant)\s* | 2267 | $value !~ /(?:$Ident|-?$Constant)\s* |
2128 | $Compare\s* | 2268 | $Compare\s* |
2129 | (?:$Ident|-?$Constant)/x && | 2269 | (?:$Ident|-?$Constant)/x && |
2130 | $value =~ s/\([^\(\)]*\)/1/) { | 2270 | $value =~ s/\([^\(\)]*\)/1/) { |
2131 | } | 2271 | } |
2132 | 2272 | #print "value<$value>\n"; | |
2133 | if ($value =~ /^(?:$Ident|-?$Constant)$/) { | 2273 | if ($value =~ /^\s*(?:$Ident|-?$Constant)\s*$/) { |
2134 | ERROR("return is not a function, parentheses are not required\n" . $herecurr); | 2274 | ERROR("return is not a function, parentheses are not required\n" . $herecurr); |
2135 | 2275 | ||
2136 | } elsif ($spacing !~ /\s+/) { | 2276 | } elsif ($spacing !~ /\s+/) { |
2137 | ERROR("space required before the open parenthesis '('\n" . $herecurr); | 2277 | ERROR("space required before the open parenthesis '('\n" . $herecurr); |
2138 | } | 2278 | } |
2139 | } | 2279 | } |
2280 | # Return of what appears to be an errno should normally be -'ve | ||
2281 | if ($line =~ /^.\s*return\s*(E[A-Z]*)\s*;/) { | ||
2282 | my $name = $1; | ||
2283 | if ($name ne 'EOF' && $name ne 'ERROR') { | ||
2284 | WARN("return of an errno should typically be -ve (return -$1)\n" . $herecurr); | ||
2285 | } | ||
2286 | } | ||
2140 | 2287 | ||
2141 | # Need a space before open parenthesis after if, while etc | 2288 | # Need a space before open parenthesis after if, while etc |
2142 | if ($line=~/\b(if|while|for|switch)\(/) { | 2289 | if ($line=~/\b(if|while|for|switch)\(/) { |
@@ -2182,8 +2329,10 @@ sub process { | |||
2182 | # Find out how long the conditional actually is. | 2329 | # Find out how long the conditional actually is. |
2183 | my @newlines = ($c =~ /\n/gs); | 2330 | my @newlines = ($c =~ /\n/gs); |
2184 | my $cond_lines = 1 + $#newlines; | 2331 | my $cond_lines = 1 + $#newlines; |
2332 | my $stat_real = ''; | ||
2185 | 2333 | ||
2186 | my $stat_real = raw_line($linenr, $cond_lines); | 2334 | $stat_real = raw_line($linenr, $cond_lines) |
2335 | . "\n" if ($cond_lines); | ||
2187 | if (defined($stat_real) && $cond_lines > 1) { | 2336 | if (defined($stat_real) && $cond_lines > 1) { |
2188 | $stat_real = "[...]\n$stat_real"; | 2337 | $stat_real = "[...]\n$stat_real"; |
2189 | } | 2338 | } |
@@ -2269,7 +2418,7 @@ sub process { | |||
2269 | my $checkfile = "include/linux/$file"; | 2418 | my $checkfile = "include/linux/$file"; |
2270 | if (-f "$root/$checkfile" && | 2419 | if (-f "$root/$checkfile" && |
2271 | $realfile ne $checkfile && | 2420 | $realfile ne $checkfile && |
2272 | $1 ne 'irq') | 2421 | $1 !~ /$allowed_asm_includes/) |
2273 | { | 2422 | { |
2274 | if ($realfile =~ m{^arch/}) { | 2423 | if ($realfile =~ m{^arch/}) { |
2275 | CHK("Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr); | 2424 | CHK("Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr); |
@@ -2348,11 +2497,13 @@ sub process { | |||
2348 | DECLARE_PER_CPU| | 2497 | DECLARE_PER_CPU| |
2349 | DEFINE_PER_CPU| | 2498 | DEFINE_PER_CPU| |
2350 | __typeof__\(| | 2499 | __typeof__\(| |
2500 | union| | ||
2501 | struct| | ||
2351 | \.$Ident\s*=\s*| | 2502 | \.$Ident\s*=\s*| |
2352 | ^\"|\"$ | 2503 | ^\"|\"$ |
2353 | }x; | 2504 | }x; |
2354 | #print "REST<$rest> dstat<$dstat>\n"; | 2505 | #print "REST<$rest> dstat<$dstat> ctx<$ctx>\n"; |
2355 | if ($rest ne '') { | 2506 | if ($rest ne '' && $rest ne ',') { |
2356 | if ($rest !~ /while\s*\(/ && | 2507 | if ($rest !~ /while\s*\(/ && |
2357 | $dstat !~ /$exceptions/) | 2508 | $dstat !~ /$exceptions/) |
2358 | { | 2509 | { |
@@ -2529,6 +2680,21 @@ sub process { | |||
2529 | } | 2680 | } |
2530 | } | 2681 | } |
2531 | 2682 | ||
2683 | # prefer usleep_range over udelay | ||
2684 | if ($line =~ /\budelay\s*\(\s*(\w+)\s*\)/) { | ||
2685 | # ignore udelay's < 10, however | ||
2686 | if (! (($1 =~ /(\d+)/) && ($1 < 10)) ) { | ||
2687 | CHK("usleep_range is preferred over udelay; see Documentation/timers/timers-howto.txt\n" . $line); | ||
2688 | } | ||
2689 | } | ||
2690 | |||
2691 | # warn about unexpectedly long msleep's | ||
2692 | if ($line =~ /\bmsleep\s*\((\d+)\);/) { | ||
2693 | if ($1 < 20) { | ||
2694 | WARN("msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt\n" . $line); | ||
2695 | } | ||
2696 | } | ||
2697 | |||
2532 | # warn about #ifdefs in C files | 2698 | # warn about #ifdefs in C files |
2533 | # if ($line =~ /^.\s*\#\s*if(|n)def/ && ($realfile =~ /\.c$/)) { | 2699 | # if ($line =~ /^.\s*\#\s*if(|n)def/ && ($realfile =~ /\.c$/)) { |
2534 | # print "#ifdef in C files should be avoided\n"; | 2700 | # print "#ifdef in C files should be avoided\n"; |
@@ -2560,6 +2726,11 @@ sub process { | |||
2560 | CHK("architecture specific defines should be avoided\n" . $herecurr); | 2726 | CHK("architecture specific defines should be avoided\n" . $herecurr); |
2561 | } | 2727 | } |
2562 | 2728 | ||
2729 | # Check that the storage class is at the beginning of a declaration | ||
2730 | if ($line =~ /\b$Storage\b/ && $line !~ /^.\s*$Storage\b/) { | ||
2731 | WARN("storage class should be at the beginning of the declaration\n" . $herecurr) | ||
2732 | } | ||
2733 | |||
2563 | # check the location of the inline attribute, that it is between | 2734 | # check the location of the inline attribute, that it is between |
2564 | # storage class and type. | 2735 | # storage class and type. |
2565 | if ($line =~ /\b$Type\s+$Inline\b/ || | 2736 | if ($line =~ /\b$Type\s+$Inline\b/ || |
@@ -2572,6 +2743,16 @@ sub process { | |||
2572 | WARN("plain inline is preferred over $1\n" . $herecurr); | 2743 | WARN("plain inline is preferred over $1\n" . $herecurr); |
2573 | } | 2744 | } |
2574 | 2745 | ||
2746 | # Check for __attribute__ packed, prefer __packed | ||
2747 | if ($line =~ /\b__attribute__\s*\(\s*\(.*\bpacked\b/) { | ||
2748 | WARN("__packed is preferred over __attribute__((packed))\n" . $herecurr); | ||
2749 | } | ||
2750 | |||
2751 | # check for sizeof(&) | ||
2752 | if ($line =~ /\bsizeof\s*\(\s*\&/) { | ||
2753 | WARN("sizeof(& should be avoided\n" . $herecurr); | ||
2754 | } | ||
2755 | |||
2575 | # check for new externs in .c files. | 2756 | # check for new externs in .c files. |
2576 | if ($realfile =~ /\.c$/ && defined $stat && | 2757 | if ($realfile =~ /\.c$/ && defined $stat && |
2577 | $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s) | 2758 | $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s) |
@@ -2609,22 +2790,24 @@ sub process { | |||
2609 | } | 2790 | } |
2610 | 2791 | ||
2611 | # check for pointless casting of kmalloc return | 2792 | # check for pointless casting of kmalloc return |
2612 | if ($line =~ /\*\s*\)\s*k[czm]alloc\b/) { | 2793 | if ($line =~ /\*\s*\)\s*[kv][czm]alloc(_node){0,1}\b/) { |
2613 | WARN("unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr); | 2794 | WARN("unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr); |
2614 | } | 2795 | } |
2615 | 2796 | ||
2797 | # check for multiple semicolons | ||
2798 | if ($line =~ /;\s*;\s*$/) { | ||
2799 | WARN("Statements terminations use 1 semicolon\n" . $herecurr); | ||
2800 | } | ||
2801 | |||
2616 | # check for gcc specific __FUNCTION__ | 2802 | # check for gcc specific __FUNCTION__ |
2617 | if ($line =~ /__FUNCTION__/) { | 2803 | if ($line =~ /__FUNCTION__/) { |
2618 | WARN("__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr); | 2804 | WARN("__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr); |
2619 | } | 2805 | } |
2620 | 2806 | ||
2621 | # check for semaphores used as mutexes | 2807 | # check for semaphores initialized locked |
2622 | if ($line =~ /^.\s*(DECLARE_MUTEX|init_MUTEX)\s*\(/) { | 2808 | if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) { |
2623 | WARN("mutexes are preferred for single holder semaphores\n" . $herecurr); | ||
2624 | } | ||
2625 | # check for semaphores used as mutexes | ||
2626 | if ($line =~ /^.\s*init_MUTEX_LOCKED\s*\(/) { | ||
2627 | WARN("consider using a completion\n" . $herecurr); | 2809 | WARN("consider using a completion\n" . $herecurr); |
2810 | |||
2628 | } | 2811 | } |
2629 | # recommend strict_strto* over simple_strto* | 2812 | # recommend strict_strto* over simple_strto* |
2630 | if ($line =~ /\bsimple_(strto.*?)\s*\(/) { | 2813 | if ($line =~ /\bsimple_(strto.*?)\s*\(/) { |
@@ -2634,9 +2817,46 @@ sub process { | |||
2634 | if ($line =~ /^.\s*__initcall\s*\(/) { | 2817 | if ($line =~ /^.\s*__initcall\s*\(/) { |
2635 | WARN("please use device_initcall() instead of __initcall()\n" . $herecurr); | 2818 | WARN("please use device_initcall() instead of __initcall()\n" . $herecurr); |
2636 | } | 2819 | } |
2637 | # check for struct file_operations, ensure they are const. | 2820 | # check for various ops structs, ensure they are const. |
2821 | my $struct_ops = qr{acpi_dock_ops| | ||
2822 | address_space_operations| | ||
2823 | backlight_ops| | ||
2824 | block_device_operations| | ||
2825 | dentry_operations| | ||
2826 | dev_pm_ops| | ||
2827 | dma_map_ops| | ||
2828 | extent_io_ops| | ||
2829 | file_lock_operations| | ||
2830 | file_operations| | ||
2831 | hv_ops| | ||
2832 | ide_dma_ops| | ||
2833 | intel_dvo_dev_ops| | ||
2834 | item_operations| | ||
2835 | iwl_ops| | ||
2836 | kgdb_arch| | ||
2837 | kgdb_io| | ||
2838 | kset_uevent_ops| | ||
2839 | lock_manager_operations| | ||
2840 | microcode_ops| | ||
2841 | mtrr_ops| | ||
2842 | neigh_ops| | ||
2843 | nlmsvc_binding| | ||
2844 | pci_raw_ops| | ||
2845 | pipe_buf_operations| | ||
2846 | platform_hibernation_ops| | ||
2847 | platform_suspend_ops| | ||
2848 | proto_ops| | ||
2849 | rpc_pipe_ops| | ||
2850 | seq_operations| | ||
2851 | snd_ac97_build_ops| | ||
2852 | soc_pcmcia_socket_ops| | ||
2853 | stacktrace_ops| | ||
2854 | sysfs_ops| | ||
2855 | tty_operations| | ||
2856 | usb_mon_operations| | ||
2857 | wd_ops}x; | ||
2638 | if ($line !~ /\bconst\b/ && | 2858 | if ($line !~ /\bconst\b/ && |
2639 | $line =~ /\bstruct\s+(file_operations|seq_operations)\b/) { | 2859 | $line =~ /\bstruct\s+($struct_ops)\b/) { |
2640 | WARN("struct $1 should normally be const\n" . | 2860 | WARN("struct $1 should normally be const\n" . |
2641 | $herecurr); | 2861 | $herecurr); |
2642 | } | 2862 | } |
@@ -2672,6 +2892,21 @@ sub process { | |||
2672 | WARN("use of in_atomic() is incorrect outside core kernel code\n" . $herecurr); | 2892 | WARN("use of in_atomic() is incorrect outside core kernel code\n" . $herecurr); |
2673 | } | 2893 | } |
2674 | } | 2894 | } |
2895 | |||
2896 | # check for lockdep_set_novalidate_class | ||
2897 | if ($line =~ /^.\s*lockdep_set_novalidate_class\s*\(/ || | ||
2898 | $line =~ /__lockdep_no_validate__\s*\)/ ) { | ||
2899 | if ($realfile !~ m@^kernel/lockdep@ && | ||
2900 | $realfile !~ m@^include/linux/lockdep@ && | ||
2901 | $realfile !~ m@^drivers/base/core@) { | ||
2902 | ERROR("lockdep_no_validate class is reserved for device->mutex.\n" . $herecurr); | ||
2903 | } | ||
2904 | } | ||
2905 | |||
2906 | if ($line =~ /debugfs_create_file.*S_IWUGO/ || | ||
2907 | $line =~ /DEVICE_ATTR.*S_IWUGO/ ) { | ||
2908 | WARN("Exporting world writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr); | ||
2909 | } | ||
2675 | } | 2910 | } |
2676 | 2911 | ||
2677 | # If we have no input at all, then there is nothing to report on | 2912 | # If we have no input at all, then there is nothing to report on |
@@ -2708,6 +2943,15 @@ sub process { | |||
2708 | print "\n" if ($quiet == 0); | 2943 | print "\n" if ($quiet == 0); |
2709 | } | 2944 | } |
2710 | 2945 | ||
2946 | if ($quiet == 0) { | ||
2947 | # If there were whitespace errors which cleanpatch can fix | ||
2948 | # then suggest that. | ||
2949 | if ($rpt_cleaners) { | ||
2950 | print "NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or\n"; | ||
2951 | print " scripts/cleanfile\n\n"; | ||
2952 | } | ||
2953 | } | ||
2954 | |||
2711 | if ($clean == 1 && $quiet == 0) { | 2955 | if ($clean == 1 && $quiet == 0) { |
2712 | print "$vname has no obvious style problems and is ready for submission.\n" | 2956 | print "$vname has no obvious style problems and is ready for submission.\n" |
2713 | } | 2957 | } |
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh index 66ad375612f..3ab316e5231 100755 --- a/scripts/checksyscalls.sh +++ b/scripts/checksyscalls.sh | |||
@@ -6,7 +6,7 @@ | |||
6 | # and listed below so they are ignored. | 6 | # and listed below so they are ignored. |
7 | # | 7 | # |
8 | # Usage: | 8 | # Usage: |
9 | # syscallchk gcc gcc-options | 9 | # checksyscalls.sh gcc gcc-options |
10 | # | 10 | # |
11 | 11 | ||
12 | ignore_list() { | 12 | ignore_list() { |
@@ -183,7 +183,6 @@ cat << EOF | |||
183 | #define __IGNORE_ustat /* statfs */ | 183 | #define __IGNORE_ustat /* statfs */ |
184 | #define __IGNORE_utime /* utimes */ | 184 | #define __IGNORE_utime /* utimes */ |
185 | #define __IGNORE_vfork /* clone */ | 185 | #define __IGNORE_vfork /* clone */ |
186 | #define __IGNORE_wait4 /* waitid */ | ||
187 | 186 | ||
188 | /* sync_file_range had a stupid ABI. Allow sync_file_range2 instead */ | 187 | /* sync_file_range had a stupid ABI. Allow sync_file_range2 instead */ |
189 | #ifdef __NR_sync_file_range2 | 188 | #ifdef __NR_sync_file_range2 |
@@ -205,5 +204,5 @@ sed -n -e '/^\#define/ s/[^_]*__NR_\([^[:space:]]*\).*/\ | |||
205 | \#endif/p' $1 | 204 | \#endif/p' $1 |
206 | } | 205 | } |
207 | 206 | ||
208 | (ignore_list && syscall_list ${srctree}/arch/x86/include/asm/unistd_32.h) | \ | 207 | (ignore_list && syscall_list $(dirname $0)/../arch/x86/include/asm/unistd_32.h) | \ |
209 | $* -E -x c - > /dev/null | 208 | $* -E -x c - > /dev/null |
diff --git a/scripts/coccicheck b/scripts/coccicheck new file mode 100755 index 00000000000..1bb1a1bd2da --- /dev/null +++ b/scripts/coccicheck | |||
@@ -0,0 +1,106 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | SPATCH="`which ${SPATCH:=spatch}`" | ||
4 | |||
5 | if [ "$C" = "1" -o "$C" = "2" ]; then | ||
6 | ONLINE=1 | ||
7 | |||
8 | # This requires Coccinelle >= 0.2.3 | ||
9 | # FLAGS="-ignore_unknown_options -very_quiet" | ||
10 | # OPTIONS=$* | ||
11 | |||
12 | # Workaround for Coccinelle < 0.2.3 | ||
13 | FLAGS="-I $srctree/include -very_quiet" | ||
14 | shift $(( $# - 1 )) | ||
15 | OPTIONS=$1 | ||
16 | else | ||
17 | ONLINE=0 | ||
18 | FLAGS="-very_quiet" | ||
19 | OPTIONS="-dir $srctree" | ||
20 | fi | ||
21 | |||
22 | if [ ! -x "$SPATCH" ]; then | ||
23 | echo 'spatch is part of the Coccinelle project and is available at http://coccinelle.lip6.fr/' | ||
24 | exit 1 | ||
25 | fi | ||
26 | |||
27 | if [ "$MODE" = "" ] ; then | ||
28 | if [ "$ONLINE" = "0" ] ; then | ||
29 | echo 'You have not explicitly specified the mode to use. Using default "chain" mode.' | ||
30 | echo 'All available modes will be tried (in that order): patch, report, context, org' | ||
31 | echo 'You can specify the mode with "make coccicheck MODE=<mode>"' | ||
32 | fi | ||
33 | MODE="chain" | ||
34 | elif [ "$MODE" = "report" -o "$MODE" = "org" ] ; then | ||
35 | FLAGS="$FLAGS -no_show_diff" | ||
36 | fi | ||
37 | |||
38 | if [ "$ONLINE" = "0" ] ; then | ||
39 | echo '' | ||
40 | echo 'Please check for false positives in the output before submitting a patch.' | ||
41 | echo 'When using "patch" mode, carefully review the patch before submitting it.' | ||
42 | echo '' | ||
43 | fi | ||
44 | |||
45 | coccinelle () { | ||
46 | COCCI="$1" | ||
47 | |||
48 | OPT=`grep "Option" $COCCI | cut -d':' -f2` | ||
49 | |||
50 | # The option '-parse_cocci' can be used to syntactically check the SmPL files. | ||
51 | # | ||
52 | # $SPATCH -D $MODE $FLAGS -parse_cocci $COCCI $OPT > /dev/null | ||
53 | |||
54 | if [ "$ONLINE" = "0" ] ; then | ||
55 | |||
56 | FILE=`echo $COCCI | sed "s|$srctree/||"` | ||
57 | |||
58 | echo "Processing `basename $COCCI`" | ||
59 | echo "with option(s) \"$OPT\"" | ||
60 | echo '' | ||
61 | echo 'Message example to submit a patch:' | ||
62 | |||
63 | sed -ne 's|^///||p' $COCCI | ||
64 | |||
65 | if [ "$MODE" = "patch" ] ; then | ||
66 | echo ' The semantic patch that makes this change is available' | ||
67 | elif [ "$MODE" = "report" ] ; then | ||
68 | echo ' The semantic patch that makes this report is available' | ||
69 | elif [ "$MODE" = "context" ] ; then | ||
70 | echo ' The semantic patch that spots this code is available' | ||
71 | elif [ "$MODE" = "org" ] ; then | ||
72 | echo ' The semantic patch that makes this Org report is available' | ||
73 | else | ||
74 | echo ' The semantic patch that makes this output is available' | ||
75 | fi | ||
76 | echo " in $FILE." | ||
77 | echo '' | ||
78 | echo ' More information about semantic patching is available at' | ||
79 | echo ' http://coccinelle.lip6.fr/' | ||
80 | echo '' | ||
81 | |||
82 | if [ "`sed -ne 's|^//#||p' $COCCI`" ] ; then | ||
83 | echo 'Semantic patch information:' | ||
84 | sed -ne 's|^//#||p' $COCCI | ||
85 | echo '' | ||
86 | fi | ||
87 | fi | ||
88 | |||
89 | if [ "$MODE" = "chain" ] ; then | ||
90 | $SPATCH -D patch $FLAGS -sp_file $COCCI $OPT $OPTIONS || \ | ||
91 | $SPATCH -D report $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || \ | ||
92 | $SPATCH -D context $FLAGS -sp_file $COCCI $OPT $OPTIONS || \ | ||
93 | $SPATCH -D org $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || exit 1 | ||
94 | else | ||
95 | $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1 | ||
96 | fi | ||
97 | |||
98 | } | ||
99 | |||
100 | if [ "$COCCI" = "" ] ; then | ||
101 | for f in `find $srctree/scripts/coccinelle/ -name '*.cocci' -type f | sort`; do | ||
102 | coccinelle $f | ||
103 | done | ||
104 | else | ||
105 | coccinelle $COCCI | ||
106 | fi | ||
diff --git a/scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci b/scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci new file mode 100644 index 00000000000..7d4771d449c --- /dev/null +++ b/scripts/coccinelle/api/alloc/drop_kmalloc_cast.cocci | |||
@@ -0,0 +1,67 @@ | |||
1 | /// | ||
2 | /// Casting (void *) value returned by kmalloc is useless | ||
3 | /// as mentioned in Documentation/CodingStyle, Chap 14. | ||
4 | /// | ||
5 | // Confidence: High | ||
6 | // Copyright: 2009,2010 Nicolas Palix, DIKU. GPLv2. | ||
7 | // URL: http://coccinelle.lip6.fr/ | ||
8 | // Options: -no_includes -include_headers | ||
9 | // | ||
10 | // Keywords: kmalloc, kzalloc, kcalloc | ||
11 | // Version min: < 2.6.12 kmalloc | ||
12 | // Version min: < 2.6.12 kcalloc | ||
13 | // Version min: 2.6.14 kzalloc | ||
14 | // | ||
15 | |||
16 | virtual context | ||
17 | virtual patch | ||
18 | virtual org | ||
19 | virtual report | ||
20 | |||
21 | //---------------------------------------------------------- | ||
22 | // For context mode | ||
23 | //---------------------------------------------------------- | ||
24 | |||
25 | @depends on context@ | ||
26 | type T; | ||
27 | @@ | ||
28 | |||
29 | * (T *) | ||
30 | \(kmalloc\|kzalloc\|kcalloc\)(...) | ||
31 | |||
32 | //---------------------------------------------------------- | ||
33 | // For patch mode | ||
34 | //---------------------------------------------------------- | ||
35 | |||
36 | @depends on patch@ | ||
37 | type T; | ||
38 | @@ | ||
39 | |||
40 | - (T *) | ||
41 | \(kmalloc\|kzalloc\|kcalloc\)(...) | ||
42 | |||
43 | //---------------------------------------------------------- | ||
44 | // For org and report mode | ||
45 | //---------------------------------------------------------- | ||
46 | |||
47 | @r depends on org || report@ | ||
48 | type T; | ||
49 | position p; | ||
50 | @@ | ||
51 | |||
52 | (T@p *)\(kmalloc\|kzalloc\|kcalloc\)(...) | ||
53 | |||
54 | @script:python depends on org@ | ||
55 | p << r.p; | ||
56 | t << r.T; | ||
57 | @@ | ||
58 | |||
59 | coccilib.org.print_safe_todo(p[0], t) | ||
60 | |||
61 | @script:python depends on report@ | ||
62 | p << r.p; | ||
63 | t << r.T; | ||
64 | @@ | ||
65 | |||
66 | msg="WARNING: casting value returned by k[cmz]alloc to (%s *) is useless." % (t) | ||
67 | coccilib.report.print_report(p[0], msg) | ||
diff --git a/scripts/coccinelle/api/alloc/kzalloc-simple.cocci b/scripts/coccinelle/api/alloc/kzalloc-simple.cocci new file mode 100644 index 00000000000..046b9b16f8f --- /dev/null +++ b/scripts/coccinelle/api/alloc/kzalloc-simple.cocci | |||
@@ -0,0 +1,86 @@ | |||
1 | /// | ||
2 | /// Use kzalloc rather than kmalloc followed by memset with 0 | ||
3 | /// | ||
4 | /// This considers some simple cases that are common and easy to validate | ||
5 | /// Note in particular that there are no ...s in the rule, so all of the | ||
6 | /// matched code has to be contiguous | ||
7 | /// | ||
8 | // Confidence: High | ||
9 | // Copyright: (C) 2009-2010 Julia Lawall, Nicolas Palix, DIKU. GPLv2. | ||
10 | // Copyright: (C) 2009-2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
11 | // URL: http://coccinelle.lip6.fr/rules/kzalloc.html | ||
12 | // Options: -no_includes -include_headers | ||
13 | // | ||
14 | // Keywords: kmalloc, kzalloc | ||
15 | // Version min: < 2.6.12 kmalloc | ||
16 | // Version min: 2.6.14 kzalloc | ||
17 | // | ||
18 | |||
19 | virtual context | ||
20 | virtual patch | ||
21 | virtual org | ||
22 | virtual report | ||
23 | |||
24 | //---------------------------------------------------------- | ||
25 | // For context mode | ||
26 | //---------------------------------------------------------- | ||
27 | |||
28 | @depends on context@ | ||
29 | type T, T2; | ||
30 | expression x; | ||
31 | expression E1,E2; | ||
32 | statement S; | ||
33 | @@ | ||
34 | |||
35 | * x = (T)kmalloc(E1,E2); | ||
36 | if ((x==NULL) || ...) S | ||
37 | * memset((T2)x,0,E1); | ||
38 | |||
39 | //---------------------------------------------------------- | ||
40 | // For patch mode | ||
41 | //---------------------------------------------------------- | ||
42 | |||
43 | @depends on patch@ | ||
44 | type T, T2; | ||
45 | expression x; | ||
46 | expression E1,E2; | ||
47 | statement S; | ||
48 | @@ | ||
49 | |||
50 | - x = (T)kmalloc(E1,E2); | ||
51 | + x = kzalloc(E1,E2); | ||
52 | if ((x==NULL) || ...) S | ||
53 | - memset((T2)x,0,E1); | ||
54 | |||
55 | //---------------------------------------------------------- | ||
56 | // For org mode | ||
57 | //---------------------------------------------------------- | ||
58 | |||
59 | @r depends on org || report@ | ||
60 | type T, T2; | ||
61 | expression x; | ||
62 | expression E1,E2; | ||
63 | statement S; | ||
64 | position p; | ||
65 | @@ | ||
66 | |||
67 | x = (T)kmalloc@p(E1,E2); | ||
68 | if ((x==NULL) || ...) S | ||
69 | memset((T2)x,0,E1); | ||
70 | |||
71 | @script:python depends on org@ | ||
72 | p << r.p; | ||
73 | x << r.x; | ||
74 | @@ | ||
75 | |||
76 | msg="%s" % (x) | ||
77 | msg_safe=msg.replace("[","@(").replace("]",")") | ||
78 | coccilib.org.print_todo(p[0], msg_safe) | ||
79 | |||
80 | @script:python depends on report@ | ||
81 | p << r.p; | ||
82 | x << r.x; | ||
83 | @@ | ||
84 | |||
85 | msg="WARNING: kzalloc should be used for %s, instead of kmalloc/memset" % (x) | ||
86 | coccilib.report.print_report(p[0], msg) | ||
diff --git a/scripts/coccinelle/api/err_cast.cocci b/scripts/coccinelle/api/err_cast.cocci new file mode 100644 index 00000000000..2ce115000af --- /dev/null +++ b/scripts/coccinelle/api/err_cast.cocci | |||
@@ -0,0 +1,56 @@ | |||
1 | /// | ||
2 | /// Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...)) | ||
3 | /// | ||
4 | // Confidence: High | ||
5 | // Copyright: (C) 2009, 2010 Nicolas Palix, DIKU. GPLv2. | ||
6 | // Copyright: (C) 2009, 2010 Julia Lawall, DIKU. GPLv2. | ||
7 | // Copyright: (C) 2009, 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
8 | // URL: http://coccinelle.lip6.fr/ | ||
9 | // Options: | ||
10 | // | ||
11 | // Keywords: ERR_PTR, PTR_ERR, ERR_CAST | ||
12 | // Version min: 2.6.25 | ||
13 | // | ||
14 | |||
15 | virtual context | ||
16 | virtual patch | ||
17 | virtual org | ||
18 | virtual report | ||
19 | |||
20 | |||
21 | @ depends on context && !patch && !org && !report@ | ||
22 | expression x; | ||
23 | @@ | ||
24 | |||
25 | * ERR_PTR(PTR_ERR(x)) | ||
26 | |||
27 | @ depends on !context && patch && !org && !report @ | ||
28 | expression x; | ||
29 | @@ | ||
30 | |||
31 | - ERR_PTR(PTR_ERR(x)) | ||
32 | + ERR_CAST(x) | ||
33 | |||
34 | @r depends on !context && !patch && (org || report)@ | ||
35 | expression x; | ||
36 | position p; | ||
37 | @@ | ||
38 | |||
39 | ERR_PTR@p(PTR_ERR(x)) | ||
40 | |||
41 | @script:python depends on org@ | ||
42 | p << r.p; | ||
43 | x << r.x; | ||
44 | @@ | ||
45 | |||
46 | msg="WARNING ERR_CAST can be used with %s" % (x) | ||
47 | msg_safe=msg.replace("[","@(").replace("]",")") | ||
48 | coccilib.org.print_todo(p[0], msg_safe) | ||
49 | |||
50 | @script:python depends on report@ | ||
51 | p << r.p; | ||
52 | x << r.x; | ||
53 | @@ | ||
54 | |||
55 | msg="WARNING: ERR_CAST can be used with %s" % (x) | ||
56 | coccilib.report.print_report(p[0], msg) | ||
diff --git a/scripts/coccinelle/api/kstrdup.cocci b/scripts/coccinelle/api/kstrdup.cocci new file mode 100644 index 00000000000..e0805ad08d3 --- /dev/null +++ b/scripts/coccinelle/api/kstrdup.cocci | |||
@@ -0,0 +1,39 @@ | |||
1 | /// Use kstrdup rather than duplicating its implementation | ||
2 | /// | ||
3 | // Confidence: High | ||
4 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
5 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
6 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
7 | // URL: http://coccinelle.lip6.fr/ | ||
8 | // Comments: | ||
9 | // Options: -no_includes -include_headers | ||
10 | |||
11 | virtual patch | ||
12 | |||
13 | @@ | ||
14 | expression from,to; | ||
15 | expression flag,E1,E2; | ||
16 | statement S; | ||
17 | @@ | ||
18 | |||
19 | - to = kmalloc(strlen(from) + 1,flag); | ||
20 | + to = kstrdup(from, flag); | ||
21 | ... when != \(from = E1 \| to = E1 \) | ||
22 | if (to==NULL || ...) S | ||
23 | ... when != \(from = E2 \| to = E2 \) | ||
24 | - strcpy(to, from); | ||
25 | |||
26 | @@ | ||
27 | expression x,from,to; | ||
28 | expression flag,E1,E2,E3; | ||
29 | statement S; | ||
30 | @@ | ||
31 | |||
32 | - x = strlen(from) + 1; | ||
33 | ... when != \( x = E1 \| from = E1 \) | ||
34 | - to = \(kmalloc\|kzalloc\)(x,flag); | ||
35 | + to = kstrdup(from, flag); | ||
36 | ... when != \(x = E2 \| from = E2 \| to = E2 \) | ||
37 | if (to==NULL || ...) S | ||
38 | ... when != \(x = E3 \| from = E3 \| to = E3 \) | ||
39 | - memcpy(to, from, x); | ||
diff --git a/scripts/coccinelle/api/memdup.cocci b/scripts/coccinelle/api/memdup.cocci new file mode 100644 index 00000000000..b5d722077dc --- /dev/null +++ b/scripts/coccinelle/api/memdup.cocci | |||
@@ -0,0 +1,40 @@ | |||
1 | /// Use kmemdup rather than duplicating its implementation | ||
2 | /// | ||
3 | // Confidence: High | ||
4 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
5 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
6 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
7 | // URL: http://coccinelle.lip6.fr/ | ||
8 | // Comments: | ||
9 | // Options: -no_includes -include_headers | ||
10 | |||
11 | virtual patch | ||
12 | |||
13 | @r1@ | ||
14 | expression from,to; | ||
15 | expression flag; | ||
16 | position p; | ||
17 | @@ | ||
18 | |||
19 | to = \(kmalloc@p\|kzalloc@p\)(strlen(from) + 1,flag); | ||
20 | |||
21 | @r2@ | ||
22 | expression x,from,to; | ||
23 | expression flag,E1; | ||
24 | position p; | ||
25 | @@ | ||
26 | |||
27 | x = strlen(from) + 1; | ||
28 | ... when != \( x = E1 \| from = E1 \) | ||
29 | to = \(kmalloc@p\|kzalloc@p\)(x,flag); | ||
30 | |||
31 | @@ | ||
32 | expression from,to,size,flag; | ||
33 | position p != {r1.p,r2.p}; | ||
34 | statement S; | ||
35 | @@ | ||
36 | |||
37 | - to = \(kmalloc@p\|kzalloc@p\)(size,flag); | ||
38 | + to = kmemdup(from,size,flag); | ||
39 | if (to==NULL || ...) S | ||
40 | - memcpy(to, from, size); | ||
diff --git a/scripts/coccinelle/api/memdup_user.cocci b/scripts/coccinelle/api/memdup_user.cocci new file mode 100644 index 00000000000..72ce012e878 --- /dev/null +++ b/scripts/coccinelle/api/memdup_user.cocci | |||
@@ -0,0 +1,35 @@ | |||
1 | /// Use kmemdup_user rather than duplicating its implementation | ||
2 | /// This is a little bit restricted to reduce false positives | ||
3 | /// | ||
4 | // Confidence: High | ||
5 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
6 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
7 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
8 | // URL: http://coccinelle.lip6.fr/ | ||
9 | // Comments: | ||
10 | // Options: -no_includes -include_headers | ||
11 | |||
12 | virtual patch | ||
13 | |||
14 | @@ | ||
15 | expression from,to,size,flag; | ||
16 | position p; | ||
17 | identifier l1,l2; | ||
18 | @@ | ||
19 | |||
20 | - to = \(kmalloc@p\|kzalloc@p\)(size,flag); | ||
21 | + to = memdup_user(from,size); | ||
22 | if ( | ||
23 | - to==NULL | ||
24 | + IS_ERR(to) | ||
25 | || ...) { | ||
26 | <+... when != goto l1; | ||
27 | - -ENOMEM | ||
28 | + PTR_ERR(to) | ||
29 | ...+> | ||
30 | } | ||
31 | - if (copy_from_user(to, from, size) != 0) { | ||
32 | - <+... when != goto l2; | ||
33 | - -EFAULT | ||
34 | - ...+> | ||
35 | - } | ||
diff --git a/scripts/coccinelle/api/resource_size.cocci b/scripts/coccinelle/api/resource_size.cocci new file mode 100644 index 00000000000..1935a58b39d --- /dev/null +++ b/scripts/coccinelle/api/resource_size.cocci | |||
@@ -0,0 +1,93 @@ | |||
1 | /// | ||
2 | /// Use resource_size function on resource object | ||
3 | /// instead of explicit computation. | ||
4 | /// | ||
5 | // Confidence: High | ||
6 | // Copyright: (C) 2009, 2010 Nicolas Palix, DIKU. GPLv2. | ||
7 | // Copyright: (C) 2009, 2010 Julia Lawall, DIKU. GPLv2. | ||
8 | // Copyright: (C) 2009, 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
9 | // URL: http://coccinelle.lip6.fr/ | ||
10 | // Options: | ||
11 | // | ||
12 | // Keywords: resource_size | ||
13 | // Version min: 2.6.27 resource_size | ||
14 | // | ||
15 | |||
16 | virtual context | ||
17 | virtual patch | ||
18 | virtual org | ||
19 | virtual report | ||
20 | |||
21 | //---------------------------------------------------------- | ||
22 | // For context mode | ||
23 | //---------------------------------------------------------- | ||
24 | |||
25 | @r_context depends on context && !patch && !org@ | ||
26 | struct resource *res; | ||
27 | @@ | ||
28 | |||
29 | * (res->end - res->start) + 1 | ||
30 | |||
31 | //---------------------------------------------------------- | ||
32 | // For patch mode | ||
33 | //---------------------------------------------------------- | ||
34 | |||
35 | @r_patch depends on !context && patch && !org@ | ||
36 | struct resource *res; | ||
37 | @@ | ||
38 | |||
39 | - (res->end - res->start) + 1 | ||
40 | + resource_size(res) | ||
41 | |||
42 | //---------------------------------------------------------- | ||
43 | // For org mode | ||
44 | //---------------------------------------------------------- | ||
45 | |||
46 | |||
47 | @r_org depends on !context && !patch && (org || report)@ | ||
48 | struct resource *res; | ||
49 | position p; | ||
50 | @@ | ||
51 | |||
52 | (res->end@p - res->start) + 1 | ||
53 | |||
54 | @rbad_org depends on !context && !patch && (org || report)@ | ||
55 | struct resource *res; | ||
56 | position p != r_org.p; | ||
57 | @@ | ||
58 | |||
59 | res->end@p - res->start | ||
60 | |||
61 | @script:python depends on org@ | ||
62 | p << r_org.p; | ||
63 | x << r_org.res; | ||
64 | @@ | ||
65 | |||
66 | msg="ERROR with %s" % (x) | ||
67 | msg_safe=msg.replace("[","@(").replace("]",")") | ||
68 | coccilib.org.print_todo(p[0], msg_safe) | ||
69 | |||
70 | @script:python depends on report@ | ||
71 | p << r_org.p; | ||
72 | x << r_org.res; | ||
73 | @@ | ||
74 | |||
75 | msg="ERROR: Missing resource_size with %s" % (x) | ||
76 | coccilib.report.print_report(p[0], msg) | ||
77 | |||
78 | @script:python depends on org@ | ||
79 | p << rbad_org.p; | ||
80 | x << rbad_org.res; | ||
81 | @@ | ||
82 | |||
83 | msg="WARNING with %s" % (x) | ||
84 | msg_safe=msg.replace("[","@(").replace("]",")") | ||
85 | coccilib.org.print_todo(p[0], msg_safe) | ||
86 | |||
87 | @script:python depends on report@ | ||
88 | p << rbad_org.p; | ||
89 | x << rbad_org.res; | ||
90 | @@ | ||
91 | |||
92 | msg="WARNING: Suspicious code. resource_size is maybe missing with %s" % (x) | ||
93 | coccilib.report.print_report(p[0], msg) | ||
diff --git a/scripts/coccinelle/free/kfree.cocci b/scripts/coccinelle/free/kfree.cocci new file mode 100644 index 00000000000..f9f79d9245e --- /dev/null +++ b/scripts/coccinelle/free/kfree.cocci | |||
@@ -0,0 +1,117 @@ | |||
1 | /// Find a use after free. | ||
2 | //# Values of variables may imply that some | ||
3 | //# execution paths are not possible, resulting in false positives. | ||
4 | //# Another source of false positives are macros such as | ||
5 | //# SCTP_DBG_OBJCNT_DEC that do not actually evaluate their argument | ||
6 | /// | ||
7 | // Confidence: Moderate | ||
8 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
9 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
10 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
11 | // URL: http://coccinelle.lip6.fr/ | ||
12 | // Comments: | ||
13 | // Options: -no_includes -include_headers | ||
14 | |||
15 | virtual org | ||
16 | virtual report | ||
17 | |||
18 | @free@ | ||
19 | expression E; | ||
20 | position p1; | ||
21 | @@ | ||
22 | |||
23 | kfree@p1(E) | ||
24 | |||
25 | @print expression@ | ||
26 | constant char *c; | ||
27 | expression free.E,E2; | ||
28 | type T; | ||
29 | position p; | ||
30 | identifier f; | ||
31 | @@ | ||
32 | |||
33 | ( | ||
34 | f(...,c,...,(T)E@p,...) | ||
35 | | | ||
36 | E@p == E2 | ||
37 | | | ||
38 | E@p != E2 | ||
39 | | | ||
40 | !E@p | ||
41 | | | ||
42 | E@p || ... | ||
43 | ) | ||
44 | |||
45 | @sz@ | ||
46 | expression free.E; | ||
47 | position p; | ||
48 | @@ | ||
49 | |||
50 | sizeof(<+...E@p...+>) | ||
51 | |||
52 | @loop exists@ | ||
53 | expression E; | ||
54 | identifier l; | ||
55 | position ok; | ||
56 | @@ | ||
57 | |||
58 | while (1) { ... | ||
59 | kfree@ok(E) | ||
60 | ... when != break; | ||
61 | when != goto l; | ||
62 | when forall | ||
63 | } | ||
64 | |||
65 | @r exists@ | ||
66 | expression free.E, subE<=free.E, E2; | ||
67 | expression E1; | ||
68 | iterator iter; | ||
69 | statement S; | ||
70 | position free.p1!=loop.ok,p2!={print.p,sz.p}; | ||
71 | @@ | ||
72 | |||
73 | kfree@p1(E,...) | ||
74 | ... | ||
75 | ( | ||
76 | iter(...,subE,...) S // no use | ||
77 | | | ||
78 | list_remove_head(E1,subE,...) | ||
79 | | | ||
80 | subE = E2 | ||
81 | | | ||
82 | subE++ | ||
83 | | | ||
84 | ++subE | ||
85 | | | ||
86 | --subE | ||
87 | | | ||
88 | subE-- | ||
89 | | | ||
90 | &subE | ||
91 | | | ||
92 | BUG(...) | ||
93 | | | ||
94 | BUG_ON(...) | ||
95 | | | ||
96 | return_VALUE(...) | ||
97 | | | ||
98 | return_ACPI_STATUS(...) | ||
99 | | | ||
100 | E@p2 // bad use | ||
101 | ) | ||
102 | |||
103 | @script:python depends on org@ | ||
104 | p1 << free.p1; | ||
105 | p2 << r.p2; | ||
106 | @@ | ||
107 | |||
108 | cocci.print_main("kfree",p1) | ||
109 | cocci.print_secs("ref",p2) | ||
110 | |||
111 | @script:python depends on report@ | ||
112 | p1 << free.p1; | ||
113 | p2 << r.p2; | ||
114 | @@ | ||
115 | |||
116 | msg = "reference preceded by free on line %s" % (p1[0].line) | ||
117 | coccilib.report.print_report(p2[0],msg) | ||
diff --git a/scripts/coccinelle/iterators/fen.cocci b/scripts/coccinelle/iterators/fen.cocci new file mode 100644 index 00000000000..77bc108c3f5 --- /dev/null +++ b/scripts/coccinelle/iterators/fen.cocci | |||
@@ -0,0 +1,64 @@ | |||
1 | /// These iterators only exit normally when the loop cursor is NULL, so there | ||
2 | /// is no point to call of_node_put on the final value. | ||
3 | /// | ||
4 | // Confidence: High | ||
5 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
6 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
7 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
8 | // URL: http://coccinelle.lip6.fr/ | ||
9 | // Comments: | ||
10 | // Options: -no_includes -include_headers | ||
11 | |||
12 | virtual patch | ||
13 | |||
14 | @@ | ||
15 | iterator name for_each_node_by_name; | ||
16 | expression np,E; | ||
17 | identifier l; | ||
18 | @@ | ||
19 | |||
20 | for_each_node_by_name(np,...) { | ||
21 | ... when != break; | ||
22 | when != goto l; | ||
23 | } | ||
24 | ... when != np = E | ||
25 | - of_node_put(np); | ||
26 | |||
27 | @@ | ||
28 | iterator name for_each_node_by_type; | ||
29 | expression np,E; | ||
30 | identifier l; | ||
31 | @@ | ||
32 | |||
33 | for_each_node_by_type(np,...) { | ||
34 | ... when != break; | ||
35 | when != goto l; | ||
36 | } | ||
37 | ... when != np = E | ||
38 | - of_node_put(np); | ||
39 | |||
40 | @@ | ||
41 | iterator name for_each_compatible_node; | ||
42 | expression np,E; | ||
43 | identifier l; | ||
44 | @@ | ||
45 | |||
46 | for_each_compatible_node(np,...) { | ||
47 | ... when != break; | ||
48 | when != goto l; | ||
49 | } | ||
50 | ... when != np = E | ||
51 | - of_node_put(np); | ||
52 | |||
53 | @@ | ||
54 | iterator name for_each_matching_node; | ||
55 | expression np,E; | ||
56 | identifier l; | ||
57 | @@ | ||
58 | |||
59 | for_each_matching_node(np,...) { | ||
60 | ... when != break; | ||
61 | when != goto l; | ||
62 | } | ||
63 | ... when != np = E | ||
64 | - of_node_put(np); | ||
diff --git a/scripts/coccinelle/iterators/itnull.cocci b/scripts/coccinelle/iterators/itnull.cocci new file mode 100644 index 00000000000..baa4297a4ed --- /dev/null +++ b/scripts/coccinelle/iterators/itnull.cocci | |||
@@ -0,0 +1,58 @@ | |||
1 | /// Many iterators have the property that the first argument is always bound | ||
2 | /// to a real list element, never NULL. False positives arise for some | ||
3 | /// iterators that do not have this property, or in cases when the loop | ||
4 | /// cursor is reassigned. The latter should only happen when the matched | ||
5 | /// code is on the way to a loop exit (break, goto, or return). | ||
6 | /// | ||
7 | // Confidence: Moderate | ||
8 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
9 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
10 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
11 | // URL: http://coccinelle.lip6.fr/ | ||
12 | // Comments: | ||
13 | // Options: -no_includes -include_headers | ||
14 | |||
15 | virtual patch | ||
16 | |||
17 | @@ | ||
18 | iterator I; | ||
19 | expression x,E,E1,E2; | ||
20 | statement S,S1,S2; | ||
21 | @@ | ||
22 | |||
23 | I(x,...) { <... | ||
24 | ( | ||
25 | - if (x == NULL && ...) S | ||
26 | | | ||
27 | - if (x != NULL || ...) | ||
28 | S | ||
29 | | | ||
30 | - (x == NULL) || | ||
31 | E | ||
32 | | | ||
33 | - (x != NULL) && | ||
34 | E | ||
35 | | | ||
36 | - (x == NULL && ...) ? E1 : | ||
37 | E2 | ||
38 | | | ||
39 | - (x != NULL || ...) ? | ||
40 | E1 | ||
41 | - : E2 | ||
42 | | | ||
43 | - if (x == NULL && ...) S1 else | ||
44 | S2 | ||
45 | | | ||
46 | - if (x != NULL || ...) | ||
47 | S1 | ||
48 | - else S2 | ||
49 | | | ||
50 | + BAD( | ||
51 | x == NULL | ||
52 | + ) | ||
53 | | | ||
54 | + BAD( | ||
55 | x != NULL | ||
56 | + ) | ||
57 | ) | ||
58 | ...> } \ No newline at end of file | ||
diff --git a/scripts/coccinelle/iterators/list_entry_update.cocci b/scripts/coccinelle/iterators/list_entry_update.cocci new file mode 100644 index 00000000000..b2967475679 --- /dev/null +++ b/scripts/coccinelle/iterators/list_entry_update.cocci | |||
@@ -0,0 +1,62 @@ | |||
1 | /// list_for_each_entry uses its first argument to get from one element of | ||
2 | /// the list to the next, so it is usually not a good idea to reassign it. | ||
3 | /// The first rule finds such a reassignment and the second rule checks | ||
4 | /// that there is a path from the reassignment back to the top of the loop. | ||
5 | /// | ||
6 | // Confidence: High | ||
7 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
8 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
9 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
10 | // URL: http://coccinelle.lip6.fr/ | ||
11 | // Comments: | ||
12 | // Options: -no_includes -include_headers | ||
13 | |||
14 | virtual context | ||
15 | virtual org | ||
16 | virtual report | ||
17 | |||
18 | @r@ | ||
19 | iterator name list_for_each_entry; | ||
20 | expression x,E; | ||
21 | position p1,p2; | ||
22 | @@ | ||
23 | |||
24 | list_for_each_entry@p1(x,...) { <... x =@p2 E ...> } | ||
25 | |||
26 | @depends on context && !org && !report@ | ||
27 | expression x,E; | ||
28 | position r.p1,r.p2; | ||
29 | statement S; | ||
30 | @@ | ||
31 | |||
32 | *x =@p2 E | ||
33 | ... | ||
34 | list_for_each_entry@p1(x,...) S | ||
35 | |||
36 | // ------------------------------------------------------------------------ | ||
37 | |||
38 | @back depends on (org || report) && !context exists@ | ||
39 | expression x,E; | ||
40 | position r.p1,r.p2; | ||
41 | statement S; | ||
42 | @@ | ||
43 | |||
44 | x =@p2 E | ||
45 | ... | ||
46 | list_for_each_entry@p1(x,...) S | ||
47 | |||
48 | @script:python depends on back && org@ | ||
49 | p1 << r.p1; | ||
50 | p2 << r.p2; | ||
51 | @@ | ||
52 | |||
53 | cocci.print_main("iterator",p1) | ||
54 | cocci.print_secs("update",p2) | ||
55 | |||
56 | @script:python depends on back && report@ | ||
57 | p1 << r.p1; | ||
58 | p2 << r.p2; | ||
59 | @@ | ||
60 | |||
61 | msg = "iterator with update on line %s" % (p2[0].line) | ||
62 | coccilib.report.print_report(p1[0],msg) | ||
diff --git a/scripts/coccinelle/locks/call_kern.cocci b/scripts/coccinelle/locks/call_kern.cocci new file mode 100644 index 00000000000..00af5344a68 --- /dev/null +++ b/scripts/coccinelle/locks/call_kern.cocci | |||
@@ -0,0 +1,74 @@ | |||
1 | /// Find functions that refer to GFP_KERNEL but are called with locks held. | ||
2 | /// The proposed change of converting the GFP_KERNEL is not necessarily the | ||
3 | /// correct one. It may be desired to unlock the lock, or to not call the | ||
4 | /// function under the lock in the first place. | ||
5 | /// | ||
6 | // Confidence: Moderate | ||
7 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
8 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
9 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
10 | // URL: http://coccinelle.lip6.fr/ | ||
11 | // Comments: | ||
12 | // Options: -no_includes -include_headers | ||
13 | |||
14 | virtual patch | ||
15 | |||
16 | @gfp exists@ | ||
17 | identifier fn; | ||
18 | position p; | ||
19 | @@ | ||
20 | |||
21 | fn(...) { | ||
22 | ... when != read_unlock_irq(...) | ||
23 | when != write_unlock_irq(...) | ||
24 | when != read_unlock_irqrestore(...) | ||
25 | when != write_unlock_irqrestore(...) | ||
26 | when != spin_unlock(...) | ||
27 | when != spin_unlock_irq(...) | ||
28 | when != spin_unlock_irqrestore(...) | ||
29 | when != local_irq_enable(...) | ||
30 | when any | ||
31 | GFP_KERNEL@p | ||
32 | ... when any | ||
33 | } | ||
34 | |||
35 | @locked@ | ||
36 | identifier gfp.fn; | ||
37 | @@ | ||
38 | |||
39 | ( | ||
40 | read_lock_irq | ||
41 | | | ||
42 | write_lock_irq | ||
43 | | | ||
44 | read_lock_irqsave | ||
45 | | | ||
46 | write_lock_irqsave | ||
47 | | | ||
48 | spin_lock | ||
49 | | | ||
50 | spin_trylock | ||
51 | | | ||
52 | spin_lock_irq | ||
53 | | | ||
54 | spin_lock_irqsave | ||
55 | | | ||
56 | local_irq_disable | ||
57 | ) | ||
58 | (...) | ||
59 | ... when != read_unlock_irq(...) | ||
60 | when != write_unlock_irq(...) | ||
61 | when != read_unlock_irqrestore(...) | ||
62 | when != write_unlock_irqrestore(...) | ||
63 | when != spin_unlock(...) | ||
64 | when != spin_unlock_irq(...) | ||
65 | when != spin_unlock_irqrestore(...) | ||
66 | when != local_irq_enable(...) | ||
67 | fn(...) | ||
68 | |||
69 | @depends on locked@ | ||
70 | position gfp.p; | ||
71 | @@ | ||
72 | |||
73 | - GFP_KERNEL@p | ||
74 | + GFP_ATOMIC | ||
diff --git a/scripts/coccinelle/locks/double_lock.cocci b/scripts/coccinelle/locks/double_lock.cocci new file mode 100644 index 00000000000..63b24e682fa --- /dev/null +++ b/scripts/coccinelle/locks/double_lock.cocci | |||
@@ -0,0 +1,92 @@ | |||
1 | /// Find double locks. False positives may occur when some paths cannot | ||
2 | /// occur at execution, due to the values of variables, and when there is | ||
3 | /// an intervening function call that releases the lock. | ||
4 | /// | ||
5 | // Confidence: Moderate | ||
6 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
7 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
8 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
9 | // URL: http://coccinelle.lip6.fr/ | ||
10 | // Comments: | ||
11 | // Options: -no_includes -include_headers | ||
12 | |||
13 | virtual org | ||
14 | virtual report | ||
15 | |||
16 | @locked@ | ||
17 | position p1; | ||
18 | expression E1; | ||
19 | position p; | ||
20 | @@ | ||
21 | |||
22 | ( | ||
23 | mutex_lock@p1 | ||
24 | | | ||
25 | mutex_trylock@p1 | ||
26 | | | ||
27 | spin_lock@p1 | ||
28 | | | ||
29 | spin_trylock@p1 | ||
30 | | | ||
31 | read_lock@p1 | ||
32 | | | ||
33 | read_trylock@p1 | ||
34 | | | ||
35 | write_lock@p1 | ||
36 | | | ||
37 | write_trylock@p1 | ||
38 | ) (E1@p,...); | ||
39 | |||
40 | @balanced@ | ||
41 | position p1 != locked.p1; | ||
42 | position locked.p; | ||
43 | identifier lock,unlock; | ||
44 | expression x <= locked.E1; | ||
45 | expression E,locked.E1; | ||
46 | expression E2; | ||
47 | @@ | ||
48 | |||
49 | if (E) { | ||
50 | <+... when != E1 | ||
51 | lock(E1@p,...) | ||
52 | ...+> | ||
53 | } | ||
54 | ... when != E1 | ||
55 | when != \(x = E2\|&x\) | ||
56 | when forall | ||
57 | if (E) { | ||
58 | <+... when != E1 | ||
59 | unlock@p1(E1,...) | ||
60 | ...+> | ||
61 | } | ||
62 | |||
63 | @r depends on !balanced exists@ | ||
64 | expression x <= locked.E1; | ||
65 | expression locked.E1; | ||
66 | expression E2; | ||
67 | identifier lock; | ||
68 | position locked.p,p1,p2; | ||
69 | @@ | ||
70 | |||
71 | lock@p1 (E1@p,...); | ||
72 | ... when != E1 | ||
73 | when != \(x = E2\|&x\) | ||
74 | lock@p2 (E1,...); | ||
75 | |||
76 | @script:python depends on org@ | ||
77 | p1 << r.p1; | ||
78 | p2 << r.p2; | ||
79 | lock << r.lock; | ||
80 | @@ | ||
81 | |||
82 | cocci.print_main(lock,p1) | ||
83 | cocci.print_secs("second lock",p2) | ||
84 | |||
85 | @script:python depends on report@ | ||
86 | p1 << r.p1; | ||
87 | p2 << r.p2; | ||
88 | lock << r.lock; | ||
89 | @@ | ||
90 | |||
91 | msg = "second lock on line %s" % (p2[0].line) | ||
92 | coccilib.report.print_report(p1[0],msg) | ||
diff --git a/scripts/coccinelle/locks/flags.cocci b/scripts/coccinelle/locks/flags.cocci new file mode 100644 index 00000000000..b4344d83809 --- /dev/null +++ b/scripts/coccinelle/locks/flags.cocci | |||
@@ -0,0 +1,80 @@ | |||
1 | /// Find nested lock+irqsave functions that use the same flags variables | ||
2 | /// | ||
3 | // Confidence: High | ||
4 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
5 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
6 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
7 | // URL: http://coccinelle.lip6.fr/ | ||
8 | // Comments: | ||
9 | // Options: -no_includes -include_headers | ||
10 | |||
11 | virtual context | ||
12 | virtual org | ||
13 | virtual report | ||
14 | |||
15 | @r@ | ||
16 | expression lock1,lock2,flags; | ||
17 | position p1,p2; | ||
18 | @@ | ||
19 | |||
20 | ( | ||
21 | spin_lock_irqsave@p1(lock1,flags) | ||
22 | | | ||
23 | read_lock_irqsave@p1(lock1,flags) | ||
24 | | | ||
25 | write_lock_irqsave@p1(lock1,flags) | ||
26 | ) | ||
27 | ... when != flags | ||
28 | ( | ||
29 | spin_lock_irqsave(lock1,flags) | ||
30 | | | ||
31 | read_lock_irqsave(lock1,flags) | ||
32 | | | ||
33 | write_lock_irqsave(lock1,flags) | ||
34 | | | ||
35 | spin_lock_irqsave@p2(lock2,flags) | ||
36 | | | ||
37 | read_lock_irqsave@p2(lock2,flags) | ||
38 | | | ||
39 | write_lock_irqsave@p2(lock2,flags) | ||
40 | ) | ||
41 | |||
42 | @d@ | ||
43 | expression f <= r.flags; | ||
44 | expression lock1,lock2,flags; | ||
45 | position r.p1, r.p2; | ||
46 | @@ | ||
47 | |||
48 | ( | ||
49 | *spin_lock_irqsave@p1(lock1,flags) | ||
50 | | | ||
51 | *read_lock_irqsave@p1(lock1,flags) | ||
52 | | | ||
53 | *write_lock_irqsave@p1(lock1,flags) | ||
54 | ) | ||
55 | ... when != f | ||
56 | ( | ||
57 | *spin_lock_irqsave@p2(lock2,flags) | ||
58 | | | ||
59 | *read_lock_irqsave@p2(lock2,flags) | ||
60 | | | ||
61 | *write_lock_irqsave@p2(lock2,flags) | ||
62 | ) | ||
63 | |||
64 | // ---------------------------------------------------------------------- | ||
65 | |||
66 | @script:python depends on d && org@ | ||
67 | p1 << r.p1; | ||
68 | p2 << r.p2; | ||
69 | @@ | ||
70 | |||
71 | cocci.print_main("original lock",p1) | ||
72 | cocci.print_secs("nested lock+irqsave that reuses flags",p2) | ||
73 | |||
74 | @script:python depends on d && report@ | ||
75 | p1 << r.p1; | ||
76 | p2 << r.p2; | ||
77 | @@ | ||
78 | |||
79 | msg="ERROR: nested lock+irqsave that reuses flags from %s." % (p1[0].line) | ||
80 | coccilib.report.print_report(p2[0], msg) | ||
diff --git a/scripts/coccinelle/locks/mini_lock.cocci b/scripts/coccinelle/locks/mini_lock.cocci new file mode 100644 index 00000000000..7641a292543 --- /dev/null +++ b/scripts/coccinelle/locks/mini_lock.cocci | |||
@@ -0,0 +1,95 @@ | |||
1 | /// Find missing unlocks. This semantic match considers the specific case | ||
2 | /// where the unlock is missing from an if branch, and there is a lock | ||
3 | /// before the if and an unlock after the if. False positives are due to | ||
4 | /// cases where the if branch represents a case where the function is | ||
5 | /// supposed to exit with the lock held, or where there is some preceding | ||
6 | /// function call that releases the lock. | ||
7 | /// | ||
8 | // Confidence: Moderate | ||
9 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
10 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
11 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
12 | // URL: http://coccinelle.lip6.fr/ | ||
13 | // Comments: | ||
14 | // Options: -no_includes -include_headers | ||
15 | |||
16 | virtual org | ||
17 | virtual report | ||
18 | |||
19 | @prelocked@ | ||
20 | position p1,p; | ||
21 | expression E1; | ||
22 | @@ | ||
23 | |||
24 | ( | ||
25 | mutex_lock@p1 | ||
26 | | | ||
27 | mutex_trylock@p1 | ||
28 | | | ||
29 | spin_lock@p1 | ||
30 | | | ||
31 | spin_trylock@p1 | ||
32 | | | ||
33 | read_lock@p1 | ||
34 | | | ||
35 | read_trylock@p1 | ||
36 | | | ||
37 | write_lock@p1 | ||
38 | | | ||
39 | write_trylock@p1 | ||
40 | | | ||
41 | read_lock_irq@p1 | ||
42 | | | ||
43 | write_lock_irq@p1 | ||
44 | | | ||
45 | read_lock_irqsave@p1 | ||
46 | | | ||
47 | write_lock_irqsave@p1 | ||
48 | | | ||
49 | spin_lock_irq@p1 | ||
50 | | | ||
51 | spin_lock_irqsave@p1 | ||
52 | ) (E1@p,...); | ||
53 | |||
54 | @looped@ | ||
55 | position r; | ||
56 | @@ | ||
57 | |||
58 | for(...;...;...) { <+... return@r ...; ...+> } | ||
59 | |||
60 | @err@ | ||
61 | expression E1; | ||
62 | position prelocked.p; | ||
63 | position up != prelocked.p1; | ||
64 | position r!=looped.r; | ||
65 | identifier lock,unlock; | ||
66 | @@ | ||
67 | |||
68 | lock(E1@p,...); | ||
69 | <+... when != E1 | ||
70 | if (...) { | ||
71 | ... when != E1 | ||
72 | return@r ...; | ||
73 | } | ||
74 | ...+> | ||
75 | unlock@up(E1,...); | ||
76 | |||
77 | @script:python depends on org@ | ||
78 | p << prelocked.p1; | ||
79 | lock << err.lock; | ||
80 | unlock << err.unlock; | ||
81 | p2 << err.r; | ||
82 | @@ | ||
83 | |||
84 | cocci.print_main(lock,p) | ||
85 | cocci.print_secs(unlock,p2) | ||
86 | |||
87 | @script:python depends on report@ | ||
88 | p << prelocked.p1; | ||
89 | lock << err.lock; | ||
90 | unlock << err.unlock; | ||
91 | p2 << err.r; | ||
92 | @@ | ||
93 | |||
94 | msg = "preceding lock on line %s" % (p[0].line) | ||
95 | coccilib.report.print_report(p2[0],msg) | ||
diff --git a/scripts/coccinelle/misc/doubleinit.cocci b/scripts/coccinelle/misc/doubleinit.cocci new file mode 100644 index 00000000000..156b20adb35 --- /dev/null +++ b/scripts/coccinelle/misc/doubleinit.cocci | |||
@@ -0,0 +1,53 @@ | |||
1 | /// Find duplicate field initializations. This has a high rate of false | ||
2 | /// positives due to #ifdefs, which Coccinelle is not aware of in a structure | ||
3 | /// initialization. | ||
4 | /// | ||
5 | // Confidence: Low | ||
6 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
7 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
8 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
9 | // URL: http://coccinelle.lip6.fr/ | ||
10 | // Comments: requires at least Coccinelle 0.2.4, lex or parse error otherwise | ||
11 | // Options: -no_includes -include_headers | ||
12 | |||
13 | virtual org | ||
14 | virtual report | ||
15 | |||
16 | @r@ | ||
17 | identifier I, s, fld; | ||
18 | position p0,p; | ||
19 | expression E; | ||
20 | @@ | ||
21 | |||
22 | struct I s =@p0 { ..., .fld@p = E, ...}; | ||
23 | |||
24 | @s@ | ||
25 | identifier I, s, r.fld; | ||
26 | position r.p0,p; | ||
27 | expression E; | ||
28 | @@ | ||
29 | |||
30 | struct I s =@p0 { ..., .fld@p = E, ...}; | ||
31 | |||
32 | @script:python depends on org@ | ||
33 | p0 << r.p0; | ||
34 | fld << r.fld; | ||
35 | ps << s.p; | ||
36 | pr << r.p; | ||
37 | @@ | ||
38 | |||
39 | if int(ps[0].line) < int(pr[0].line) or (int(ps[0].line) == int(pr[0].line) and int(ps[0].column) < int(pr[0].column)): | ||
40 | cocci.print_main(fld,p0) | ||
41 | cocci.print_secs("s",ps) | ||
42 | cocci.print_secs("r",pr) | ||
43 | |||
44 | @script:python depends on report@ | ||
45 | p0 << r.p0; | ||
46 | fld << r.fld; | ||
47 | ps << s.p; | ||
48 | pr << r.p; | ||
49 | @@ | ||
50 | |||
51 | if int(ps[0].line) < int(pr[0].line) or (int(ps[0].line) == int(pr[0].line) and int(ps[0].column) < int(pr[0].column)): | ||
52 | msg = "%s: first occurrence %s, second occurrence %s" % (fld,ps[0].line,pr[0].line) | ||
53 | coccilib.report.print_report(p0[0],msg) | ||
diff --git a/scripts/coccinelle/misc/ifcol.cocci b/scripts/coccinelle/misc/ifcol.cocci new file mode 100644 index 00000000000..b7ed91dbeb9 --- /dev/null +++ b/scripts/coccinelle/misc/ifcol.cocci | |||
@@ -0,0 +1,48 @@ | |||
1 | /// Find confusingly indented code in or after an if. An if branch should | ||
2 | /// be indented. The code following an if should not be indented. | ||
3 | /// Sometimes, code after an if that is indented is actually intended to be | ||
4 | /// part of the if branch. | ||
5 | /// | ||
6 | /// This has a high rate of false positives, because Coccinelle's column | ||
7 | /// calculation does not distinguish between spaces and tabs, so code that | ||
8 | /// is not visually aligned may be considered to be in the same column. | ||
9 | /// | ||
10 | // Confidence: Low | ||
11 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
12 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
13 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
14 | // URL: http://coccinelle.lip6.fr/ | ||
15 | // Comments: | ||
16 | // Options: -no_includes -include_headers | ||
17 | |||
18 | virtual org | ||
19 | virtual report | ||
20 | |||
21 | @r disable braces4@ | ||
22 | position p1,p2; | ||
23 | statement S1,S2; | ||
24 | @@ | ||
25 | |||
26 | ( | ||
27 | if (...) { ... } | ||
28 | | | ||
29 | if (...) S1@p1 S2@p2 | ||
30 | ) | ||
31 | |||
32 | @script:python depends on org@ | ||
33 | p1 << r.p1; | ||
34 | p2 << r.p2; | ||
35 | @@ | ||
36 | |||
37 | if (p1[0].column == p2[0].column): | ||
38 | cocci.print_main("branch",p1) | ||
39 | cocci.print_secs("after",p2) | ||
40 | |||
41 | @script:python depends on report@ | ||
42 | p1 << r.p1; | ||
43 | p2 << r.p2; | ||
44 | @@ | ||
45 | |||
46 | if (p1[0].column == p2[0].column): | ||
47 | msg = "code aligned with following code on line %s" % (p2[0].line) | ||
48 | coccilib.report.print_report(p1[0],msg) | ||
diff --git a/scripts/coccinelle/null/deref_null.cocci b/scripts/coccinelle/null/deref_null.cocci new file mode 100644 index 00000000000..cdac6cfcce9 --- /dev/null +++ b/scripts/coccinelle/null/deref_null.cocci | |||
@@ -0,0 +1,282 @@ | |||
1 | /// | ||
2 | /// A variable is dereference under a NULL test. | ||
3 | /// Even though it is know to be NULL. | ||
4 | /// | ||
5 | // Confidence: Moderate | ||
6 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
7 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
8 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
9 | // URL: http://coccinelle.lip6.fr/ | ||
10 | // Comments: -I ... -all_includes can give more complete results | ||
11 | // Options: | ||
12 | |||
13 | virtual context | ||
14 | virtual org | ||
15 | virtual report | ||
16 | |||
17 | @ifm@ | ||
18 | expression *E; | ||
19 | statement S1,S2; | ||
20 | position p1; | ||
21 | @@ | ||
22 | |||
23 | if@p1 ((E == NULL && ...) || ...) S1 else S2 | ||
24 | |||
25 | // The following two rules are separate, because both can match a single | ||
26 | // expression in different ways | ||
27 | @pr1 expression@ | ||
28 | expression *ifm.E; | ||
29 | identifier f; | ||
30 | position p1; | ||
31 | @@ | ||
32 | |||
33 | (E != NULL && ...) ? <+...E->f@p1...+> : ... | ||
34 | |||
35 | @pr2 expression@ | ||
36 | expression *ifm.E; | ||
37 | identifier f; | ||
38 | position p2; | ||
39 | @@ | ||
40 | |||
41 | ( | ||
42 | (E != NULL) && ... && <+...E->f@p2...+> | ||
43 | | | ||
44 | (E == NULL) || ... || <+...E->f@p2...+> | ||
45 | | | ||
46 | sizeof(<+...E->f@p2...+>) | ||
47 | ) | ||
48 | |||
49 | // For org and report modes | ||
50 | |||
51 | @r depends on !context && (org || report) exists@ | ||
52 | expression subE <= ifm.E; | ||
53 | expression *ifm.E; | ||
54 | expression E1,E2; | ||
55 | identifier f; | ||
56 | statement S1,S2,S3,S4; | ||
57 | iterator iter; | ||
58 | position p!={pr1.p1,pr2.p2}; | ||
59 | position ifm.p1; | ||
60 | @@ | ||
61 | |||
62 | if@p1 ((E == NULL && ...) || ...) | ||
63 | { | ||
64 | ... when != if (...) S1 else S2 | ||
65 | ( | ||
66 | iter(subE,...) S4 // no use | ||
67 | | | ||
68 | list_remove_head(E2,subE,...) | ||
69 | | | ||
70 | subE = E1 | ||
71 | | | ||
72 | for(subE = E1;...;...) S4 | ||
73 | | | ||
74 | subE++ | ||
75 | | | ||
76 | ++subE | ||
77 | | | ||
78 | --subE | ||
79 | | | ||
80 | subE-- | ||
81 | | | ||
82 | &subE | ||
83 | | | ||
84 | E->f@p // bad use | ||
85 | ) | ||
86 | ... when any | ||
87 | return ...; | ||
88 | } | ||
89 | else S3 | ||
90 | |||
91 | @script:python depends on !context && !org && report@ | ||
92 | p << r.p; | ||
93 | p1 << ifm.p1; | ||
94 | x << ifm.E; | ||
95 | @@ | ||
96 | |||
97 | msg="ERROR: %s is NULL but dereferenced." % (x) | ||
98 | coccilib.report.print_report(p[0], msg) | ||
99 | cocci.include_match(False) | ||
100 | |||
101 | @script:python depends on !context && org && !report@ | ||
102 | p << r.p; | ||
103 | p1 << ifm.p1; | ||
104 | x << ifm.E; | ||
105 | @@ | ||
106 | |||
107 | msg="ERROR: %s is NULL but dereferenced." % (x) | ||
108 | msg_safe=msg.replace("[","@(").replace("]",")") | ||
109 | cocci.print_main(msg_safe,p) | ||
110 | cocci.include_match(False) | ||
111 | |||
112 | @s depends on !context && (org || report) exists@ | ||
113 | expression subE <= ifm.E; | ||
114 | expression *ifm.E; | ||
115 | expression E1,E2; | ||
116 | identifier f; | ||
117 | statement S1,S2,S3,S4; | ||
118 | iterator iter; | ||
119 | position p!={pr1.p1,pr2.p2}; | ||
120 | position ifm.p1; | ||
121 | @@ | ||
122 | |||
123 | if@p1 ((E == NULL && ...) || ...) | ||
124 | { | ||
125 | ... when != if (...) S1 else S2 | ||
126 | ( | ||
127 | iter(subE,...) S4 // no use | ||
128 | | | ||
129 | list_remove_head(E2,subE,...) | ||
130 | | | ||
131 | subE = E1 | ||
132 | | | ||
133 | for(subE = E1;...;...) S4 | ||
134 | | | ||
135 | subE++ | ||
136 | | | ||
137 | ++subE | ||
138 | | | ||
139 | --subE | ||
140 | | | ||
141 | subE-- | ||
142 | | | ||
143 | &subE | ||
144 | | | ||
145 | E->f@p // bad use | ||
146 | ) | ||
147 | ... when any | ||
148 | } | ||
149 | else S3 | ||
150 | |||
151 | @script:python depends on !context && !org && report@ | ||
152 | p << s.p; | ||
153 | p1 << ifm.p1; | ||
154 | x << ifm.E; | ||
155 | @@ | ||
156 | |||
157 | msg="ERROR: %s is NULL but dereferenced." % (x) | ||
158 | coccilib.report.print_report(p[0], msg) | ||
159 | |||
160 | @script:python depends on !context && org && !report@ | ||
161 | p << s.p; | ||
162 | p1 << ifm.p1; | ||
163 | x << ifm.E; | ||
164 | @@ | ||
165 | |||
166 | msg="ERROR: %s is NULL but dereferenced." % (x) | ||
167 | msg_safe=msg.replace("[","@(").replace("]",")") | ||
168 | cocci.print_main(msg_safe,p) | ||
169 | |||
170 | // For context mode | ||
171 | |||
172 | @depends on context && !org && !report exists@ | ||
173 | expression subE <= ifm.E; | ||
174 | expression *ifm.E; | ||
175 | expression E1,E2; | ||
176 | identifier f; | ||
177 | statement S1,S2,S3,S4; | ||
178 | iterator iter; | ||
179 | position p!={pr1.p1,pr2.p2}; | ||
180 | position ifm.p1; | ||
181 | @@ | ||
182 | |||
183 | if@p1 ((E == NULL && ...) || ...) | ||
184 | { | ||
185 | ... when != if (...) S1 else S2 | ||
186 | ( | ||
187 | iter(subE,...) S4 // no use | ||
188 | | | ||
189 | list_remove_head(E2,subE,...) | ||
190 | | | ||
191 | subE = E1 | ||
192 | | | ||
193 | for(subE = E1;...;...) S4 | ||
194 | | | ||
195 | subE++ | ||
196 | | | ||
197 | ++subE | ||
198 | | | ||
199 | --subE | ||
200 | | | ||
201 | subE-- | ||
202 | | | ||
203 | &subE | ||
204 | | | ||
205 | * E->f@p // bad use | ||
206 | ) | ||
207 | ... when any | ||
208 | return ...; | ||
209 | } | ||
210 | else S3 | ||
211 | |||
212 | // The following three rules are duplicates of ifm, pr1 and pr2 respectively. | ||
213 | // It is need because the previous rule as already made a "change". | ||
214 | |||
215 | @ifm1@ | ||
216 | expression *E; | ||
217 | statement S1,S2; | ||
218 | position p1; | ||
219 | @@ | ||
220 | |||
221 | if@p1 ((E == NULL && ...) || ...) S1 else S2 | ||
222 | |||
223 | @pr11 expression@ | ||
224 | expression *ifm1.E; | ||
225 | identifier f; | ||
226 | position p1; | ||
227 | @@ | ||
228 | |||
229 | (E != NULL && ...) ? <+...E->f@p1...+> : ... | ||
230 | |||
231 | @pr12 expression@ | ||
232 | expression *ifm1.E; | ||
233 | identifier f; | ||
234 | position p2; | ||
235 | @@ | ||
236 | |||
237 | ( | ||
238 | (E != NULL) && ... && <+...E->f@p2...+> | ||
239 | | | ||
240 | (E == NULL) || ... || <+...E->f@p2...+> | ||
241 | | | ||
242 | sizeof(<+...E->f@p2...+>) | ||
243 | ) | ||
244 | |||
245 | @depends on context && !org && !report exists@ | ||
246 | expression subE <= ifm1.E; | ||
247 | expression *ifm1.E; | ||
248 | expression E1,E2; | ||
249 | identifier f; | ||
250 | statement S1,S2,S3,S4; | ||
251 | iterator iter; | ||
252 | position p!={pr11.p1,pr12.p2}; | ||
253 | position ifm1.p1; | ||
254 | @@ | ||
255 | |||
256 | if@p1 ((E == NULL && ...) || ...) | ||
257 | { | ||
258 | ... when != if (...) S1 else S2 | ||
259 | ( | ||
260 | iter(subE,...) S4 // no use | ||
261 | | | ||
262 | list_remove_head(E2,subE,...) | ||
263 | | | ||
264 | subE = E1 | ||
265 | | | ||
266 | for(subE = E1;...;...) S4 | ||
267 | | | ||
268 | subE++ | ||
269 | | | ||
270 | ++subE | ||
271 | | | ||
272 | --subE | ||
273 | | | ||
274 | subE-- | ||
275 | | | ||
276 | &subE | ||
277 | | | ||
278 | * E->f@p // bad use | ||
279 | ) | ||
280 | ... when any | ||
281 | } | ||
282 | else S3 | ||
diff --git a/scripts/coccinelle/null/eno.cocci b/scripts/coccinelle/null/eno.cocci new file mode 100644 index 00000000000..4c9c52b9c41 --- /dev/null +++ b/scripts/coccinelle/null/eno.cocci | |||
@@ -0,0 +1,20 @@ | |||
1 | /// The various basic memory allocation functions don't return ERR_PTR | ||
2 | /// | ||
3 | // Confidence: High | ||
4 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
5 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
6 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
7 | // URL: http://coccinelle.lip6.fr/ | ||
8 | // Comments: | ||
9 | // Options: -no_includes -include_headers | ||
10 | |||
11 | virtual patch | ||
12 | |||
13 | @@ | ||
14 | expression x,E; | ||
15 | @@ | ||
16 | |||
17 | x = \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...) | ||
18 | ... when != x = E | ||
19 | - IS_ERR(x) | ||
20 | + !x | ||
diff --git a/scripts/coccinelle/null/kmerr.cocci b/scripts/coccinelle/null/kmerr.cocci new file mode 100644 index 00000000000..949bf656c64 --- /dev/null +++ b/scripts/coccinelle/null/kmerr.cocci | |||
@@ -0,0 +1,72 @@ | |||
1 | /// This semantic patch looks for kmalloc etc that are not followed by a | ||
2 | /// NULL check. It only gives a report in the case where there is some | ||
3 | /// error handling code later in the function, which may be helpful | ||
4 | /// in determining what the error handling code for the call to kmalloc etc | ||
5 | /// should be. | ||
6 | /// | ||
7 | // Confidence: High | ||
8 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
9 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
10 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
11 | // URL: http://coccinelle.lip6.fr/ | ||
12 | // Comments: | ||
13 | // Options: -no_includes -include_headers | ||
14 | |||
15 | virtual context | ||
16 | virtual org | ||
17 | virtual report | ||
18 | |||
19 | @withtest@ | ||
20 | expression x; | ||
21 | position p; | ||
22 | identifier f,fld; | ||
23 | @@ | ||
24 | |||
25 | x@p = f(...); | ||
26 | ... when != x->fld | ||
27 | \(x == NULL \| x != NULL\) | ||
28 | |||
29 | @fixed depends on context && !org && !report@ | ||
30 | expression x,x1; | ||
31 | position p1 != withtest.p; | ||
32 | statement S; | ||
33 | position any withtest.p; | ||
34 | identifier f; | ||
35 | @@ | ||
36 | |||
37 | *x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); | ||
38 | ... | ||
39 | *x1@p = f(...); | ||
40 | if (!x1) S | ||
41 | |||
42 | // ------------------------------------------------------------------------ | ||
43 | |||
44 | @rfixed depends on (org || report) && !context exists@ | ||
45 | expression x,x1; | ||
46 | position p1 != withtest.p; | ||
47 | position p2; | ||
48 | statement S; | ||
49 | position any withtest.p; | ||
50 | identifier f; | ||
51 | @@ | ||
52 | |||
53 | x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); | ||
54 | ... | ||
55 | x1@p = f@p2(...); | ||
56 | if (!x1) S | ||
57 | |||
58 | @script:python depends on org@ | ||
59 | p1 << rfixed.p1; | ||
60 | p2 << rfixed.p2; | ||
61 | @@ | ||
62 | |||
63 | cocci.print_main("alloc call",p1) | ||
64 | cocci.print_secs("possible model",p2) | ||
65 | |||
66 | @script:python depends on report@ | ||
67 | p1 << rfixed.p1; | ||
68 | p2 << rfixed.p2; | ||
69 | @@ | ||
70 | |||
71 | msg = "alloc with no test, possible model on line %s" % (p2[0].line) | ||
72 | coccilib.report.print_report(p1[0],msg) | ||
diff --git a/scripts/coccinelle/tests/doublebitand.cocci b/scripts/coccinelle/tests/doublebitand.cocci new file mode 100644 index 00000000000..9ba73d05a77 --- /dev/null +++ b/scripts/coccinelle/tests/doublebitand.cocci | |||
@@ -0,0 +1,54 @@ | |||
1 | /// Find bit operations that include the same argument more than once | ||
2 | //# One source of false positives is when the argument performs a side | ||
3 | //# effect. Another source of false positives is when a neutral value | ||
4 | //# such as 0 for | is used to indicate no information, to maintain the | ||
5 | //# same structure as other similar expressions | ||
6 | /// | ||
7 | // Confidence: Moderate | ||
8 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
9 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
10 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
11 | // URL: http://coccinelle.lip6.fr/ | ||
12 | // Comments: | ||
13 | // Options: -no_includes -include_headers | ||
14 | |||
15 | virtual context | ||
16 | virtual org | ||
17 | virtual report | ||
18 | |||
19 | @r expression@ | ||
20 | expression E; | ||
21 | position p; | ||
22 | @@ | ||
23 | |||
24 | ( | ||
25 | * E@p | ||
26 | & ... & E | ||
27 | | | ||
28 | * E@p | ||
29 | | ... | E | ||
30 | | | ||
31 | * E@p | ||
32 | & ... & !E | ||
33 | | | ||
34 | * E@p | ||
35 | | ... | !E | ||
36 | | | ||
37 | * !E@p | ||
38 | & ... & E | ||
39 | | | ||
40 | * !E@p | ||
41 | | ... | E | ||
42 | ) | ||
43 | |||
44 | @script:python depends on org@ | ||
45 | p << r.p; | ||
46 | @@ | ||
47 | |||
48 | cocci.print_main("duplicated argument to & or |",p) | ||
49 | |||
50 | @script:python depends on report@ | ||
51 | p << r.p; | ||
52 | @@ | ||
53 | |||
54 | coccilib.report.print_report(p[0],"duplicated argument to & or |") | ||
diff --git a/scripts/coccinelle/tests/doubletest.cocci b/scripts/coccinelle/tests/doubletest.cocci new file mode 100644 index 00000000000..13a2c0e8a4b --- /dev/null +++ b/scripts/coccinelle/tests/doubletest.cocci | |||
@@ -0,0 +1,40 @@ | |||
1 | /// Find &&/|| operations that include the same argument more than once | ||
2 | //# A common source of false positives is when the argument performs a side | ||
3 | //# effect. | ||
4 | /// | ||
5 | // Confidence: Moderate | ||
6 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
7 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
8 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
9 | // URL: http://coccinelle.lip6.fr/ | ||
10 | // Comments: | ||
11 | // Options: -no_includes -include_headers | ||
12 | |||
13 | virtual context | ||
14 | virtual org | ||
15 | virtual report | ||
16 | |||
17 | @r expression@ | ||
18 | expression E; | ||
19 | position p; | ||
20 | @@ | ||
21 | |||
22 | ( | ||
23 | * E@p | ||
24 | || ... || E | ||
25 | | | ||
26 | * E@p | ||
27 | && ... && E | ||
28 | ) | ||
29 | |||
30 | @script:python depends on org@ | ||
31 | p << r.p; | ||
32 | @@ | ||
33 | |||
34 | cocci.print_main("duplicated argument to && or ||",p) | ||
35 | |||
36 | @script:python depends on report@ | ||
37 | p << r.p; | ||
38 | @@ | ||
39 | |||
40 | coccilib.report.print_report(p[0],"duplicated argument to && or ||") | ||
diff --git a/scripts/config b/scripts/config index 608d7fdb13e..a7c7c4b8e95 100755 --- a/scripts/config +++ b/scripts/config | |||
@@ -10,8 +10,10 @@ commands: | |||
10 | --enable|-e option Enable option | 10 | --enable|-e option Enable option |
11 | --disable|-d option Disable option | 11 | --disable|-d option Disable option |
12 | --module|-m option Turn option into a module | 12 | --module|-m option Turn option into a module |
13 | --set-str option value | 13 | --set-str option string |
14 | Set option to "value" | 14 | Set option to "string" |
15 | --set-val option value | ||
16 | Set option to value | ||
15 | --state|-s option Print state of option (n,y,m,undef) | 17 | --state|-s option Print state of option (n,y,m,undef) |
16 | 18 | ||
17 | --enable-after|-E beforeopt option | 19 | --enable-after|-E beforeopt option |
@@ -86,7 +88,7 @@ while [ "$1" != "" ] ; do | |||
86 | B=$ARG | 88 | B=$ARG |
87 | shift 2 | 89 | shift 2 |
88 | ;; | 90 | ;; |
89 | --*) | 91 | -*) |
90 | checkarg "$1" | 92 | checkarg "$1" |
91 | shift | 93 | shift |
92 | ;; | 94 | ;; |
@@ -109,6 +111,11 @@ while [ "$1" != "" ] ; do | |||
109 | shift | 111 | shift |
110 | ;; | 112 | ;; |
111 | 113 | ||
114 | --set-val) | ||
115 | set_var "CONFIG_$ARG" "CONFIG_$ARG=$1" | ||
116 | shift | ||
117 | ;; | ||
118 | |||
112 | --state|-s) | 119 | --state|-s) |
113 | if grep -q "# CONFIG_$ARG is not set" $FN ; then | 120 | if grep -q "# CONFIG_$ARG is not set" $FN ; then |
114 | echo n | 121 | echo n |
diff --git a/scripts/decodecode b/scripts/decodecode index 8b30cc36744..18ba881c341 100755 --- a/scripts/decodecode +++ b/scripts/decodecode | |||
@@ -40,7 +40,7 @@ echo $code | |||
40 | code=`echo $code | sed -e 's/.*Code: //'` | 40 | code=`echo $code | sed -e 's/.*Code: //'` |
41 | 41 | ||
42 | width=`expr index "$code" ' '` | 42 | width=`expr index "$code" ' '` |
43 | width=$[($width-1)/2] | 43 | width=$((($width-1)/2)) |
44 | case $width in | 44 | case $width in |
45 | 1) type=byte ;; | 45 | 1) type=byte ;; |
46 | 2) type=2byte ;; | 46 | 2) type=2byte ;; |
@@ -48,10 +48,10 @@ case $width in | |||
48 | esac | 48 | esac |
49 | 49 | ||
50 | disas() { | 50 | disas() { |
51 | ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s &> /dev/null | 51 | ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s > /dev/null 2>&1 |
52 | 52 | ||
53 | if [ "$ARCH" == "arm" ]; then | 53 | if [ "$ARCH" = "arm" ]; then |
54 | if [ $width == 2 ]; then | 54 | if [ $width -eq 2 ]; then |
55 | OBJDUMPFLAGS="-M force-thumb" | 55 | OBJDUMPFLAGS="-M force-thumb" |
56 | fi | 56 | fi |
57 | 57 | ||
@@ -59,7 +59,7 @@ disas() { | |||
59 | fi | 59 | fi |
60 | 60 | ||
61 | ${CROSS_COMPILE}objdump $OBJDUMPFLAGS -S $1.o | \ | 61 | ${CROSS_COMPILE}objdump $OBJDUMPFLAGS -S $1.o | \ |
62 | grep -v "/tmp\|Disassembly\|\.text\|^$" &> $1.dis | 62 | grep -v "/tmp\|Disassembly\|\.text\|^$" > $1.dis 2>&1 |
63 | } | 63 | } |
64 | 64 | ||
65 | marker=`expr index "$code" "\<"` | 65 | marker=`expr index "$code" "\<"` |
diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index 01cdb36fc58..04a31c17639 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile | |||
@@ -4,7 +4,7 @@ hostprogs-y := dtc | |||
4 | always := $(hostprogs-y) | 4 | always := $(hostprogs-y) |
5 | 5 | ||
6 | dtc-objs := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \ | 6 | dtc-objs := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \ |
7 | srcpos.o checks.o | 7 | srcpos.o checks.o util.o |
8 | dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o | 8 | dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o |
9 | 9 | ||
10 | # Source files need to get at the userspace version of libfdt_env.h to compile | 10 | # Source files need to get at the userspace version of libfdt_env.h to compile |
@@ -19,6 +19,7 @@ HOSTCFLAGS_fstree.o := $(HOSTCFLAGS_DTC) | |||
19 | HOSTCFLAGS_livetree.o := $(HOSTCFLAGS_DTC) | 19 | HOSTCFLAGS_livetree.o := $(HOSTCFLAGS_DTC) |
20 | HOSTCFLAGS_srcpos.o := $(HOSTCFLAGS_DTC) | 20 | HOSTCFLAGS_srcpos.o := $(HOSTCFLAGS_DTC) |
21 | HOSTCFLAGS_treesource.o := $(HOSTCFLAGS_DTC) | 21 | HOSTCFLAGS_treesource.o := $(HOSTCFLAGS_DTC) |
22 | HOSTCFLAGS_util.o := $(HOSTCFLAGS_DTC) | ||
22 | 23 | ||
23 | HOSTCFLAGS_dtc-lexer.lex.o := $(HOSTCFLAGS_DTC) | 24 | HOSTCFLAGS_dtc-lexer.lex.o := $(HOSTCFLAGS_DTC) |
24 | HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) | 25 | HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) |
diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c index 95485796f25..a662a004479 100644 --- a/scripts/dtc/checks.c +++ b/scripts/dtc/checks.c | |||
@@ -278,32 +278,112 @@ static void check_property_name_chars(struct check *c, struct node *dt, | |||
278 | } | 278 | } |
279 | PROP_CHECK(property_name_chars, PROPNODECHARS, ERROR); | 279 | PROP_CHECK(property_name_chars, PROPNODECHARS, ERROR); |
280 | 280 | ||
281 | #define DESCLABEL_FMT "%s%s%s%s%s" | ||
282 | #define DESCLABEL_ARGS(node,prop,mark) \ | ||
283 | ((mark) ? "value of " : ""), \ | ||
284 | ((prop) ? "'" : ""), \ | ||
285 | ((prop) ? (prop)->name : ""), \ | ||
286 | ((prop) ? "' in " : ""), (node)->fullpath | ||
287 | |||
288 | static void check_duplicate_label(struct check *c, struct node *dt, | ||
289 | const char *label, struct node *node, | ||
290 | struct property *prop, struct marker *mark) | ||
291 | { | ||
292 | struct node *othernode = NULL; | ||
293 | struct property *otherprop = NULL; | ||
294 | struct marker *othermark = NULL; | ||
295 | |||
296 | othernode = get_node_by_label(dt, label); | ||
297 | |||
298 | if (!othernode) | ||
299 | otherprop = get_property_by_label(dt, label, &othernode); | ||
300 | if (!othernode) | ||
301 | othermark = get_marker_label(dt, label, &othernode, | ||
302 | &otherprop); | ||
303 | |||
304 | if (!othernode) | ||
305 | return; | ||
306 | |||
307 | if ((othernode != node) || (otherprop != prop) || (othermark != mark)) | ||
308 | FAIL(c, "Duplicate label '%s' on " DESCLABEL_FMT | ||
309 | " and " DESCLABEL_FMT, | ||
310 | label, DESCLABEL_ARGS(node, prop, mark), | ||
311 | DESCLABEL_ARGS(othernode, otherprop, othermark)); | ||
312 | } | ||
313 | |||
314 | static void check_duplicate_label_node(struct check *c, struct node *dt, | ||
315 | struct node *node) | ||
316 | { | ||
317 | struct label *l; | ||
318 | |||
319 | for_each_label(node->labels, l) | ||
320 | check_duplicate_label(c, dt, l->label, node, NULL, NULL); | ||
321 | } | ||
322 | static void check_duplicate_label_prop(struct check *c, struct node *dt, | ||
323 | struct node *node, struct property *prop) | ||
324 | { | ||
325 | struct marker *m = prop->val.markers; | ||
326 | struct label *l; | ||
327 | |||
328 | for_each_label(prop->labels, l) | ||
329 | check_duplicate_label(c, dt, l->label, node, prop, NULL); | ||
330 | |||
331 | for_each_marker_of_type(m, LABEL) | ||
332 | check_duplicate_label(c, dt, m->ref, node, prop, m); | ||
333 | } | ||
334 | CHECK(duplicate_label, NULL, check_duplicate_label_node, | ||
335 | check_duplicate_label_prop, NULL, ERROR); | ||
336 | |||
281 | static void check_explicit_phandles(struct check *c, struct node *root, | 337 | static void check_explicit_phandles(struct check *c, struct node *root, |
282 | struct node *node) | 338 | struct node *node, struct property *prop) |
283 | { | 339 | { |
284 | struct property *prop; | 340 | struct marker *m; |
285 | struct node *other; | 341 | struct node *other; |
286 | cell_t phandle; | 342 | cell_t phandle; |
287 | 343 | ||
288 | prop = get_property(node, "linux,phandle"); | 344 | if (!streq(prop->name, "phandle") |
289 | if (! prop) | 345 | && !streq(prop->name, "linux,phandle")) |
290 | return; /* No phandle, that's fine */ | 346 | return; |
291 | 347 | ||
292 | if (prop->val.len != sizeof(cell_t)) { | 348 | if (prop->val.len != sizeof(cell_t)) { |
293 | FAIL(c, "%s has bad length (%d) linux,phandle property", | 349 | FAIL(c, "%s has bad length (%d) %s property", |
294 | node->fullpath, prop->val.len); | 350 | node->fullpath, prop->val.len, prop->name); |
351 | return; | ||
352 | } | ||
353 | |||
354 | m = prop->val.markers; | ||
355 | for_each_marker_of_type(m, REF_PHANDLE) { | ||
356 | assert(m->offset == 0); | ||
357 | if (node != get_node_by_ref(root, m->ref)) | ||
358 | /* "Set this node's phandle equal to some | ||
359 | * other node's phandle". That's nonsensical | ||
360 | * by construction. */ { | ||
361 | FAIL(c, "%s in %s is a reference to another node", | ||
362 | prop->name, node->fullpath); | ||
363 | return; | ||
364 | } | ||
365 | /* But setting this node's phandle equal to its own | ||
366 | * phandle is allowed - that means allocate a unique | ||
367 | * phandle for this node, even if it's not otherwise | ||
368 | * referenced. The value will be filled in later, so | ||
369 | * no further checking for now. */ | ||
295 | return; | 370 | return; |
296 | } | 371 | } |
297 | 372 | ||
298 | phandle = propval_cell(prop); | 373 | phandle = propval_cell(prop); |
374 | |||
299 | if ((phandle == 0) || (phandle == -1)) { | 375 | if ((phandle == 0) || (phandle == -1)) { |
300 | FAIL(c, "%s has invalid linux,phandle value 0x%x", | 376 | FAIL(c, "%s has bad value (0x%x) in %s property", |
301 | node->fullpath, phandle); | 377 | node->fullpath, phandle, prop->name); |
302 | return; | 378 | return; |
303 | } | 379 | } |
304 | 380 | ||
381 | if (node->phandle && (node->phandle != phandle)) | ||
382 | FAIL(c, "%s has %s property which replaces existing phandle information", | ||
383 | node->fullpath, prop->name); | ||
384 | |||
305 | other = get_node_by_phandle(root, phandle); | 385 | other = get_node_by_phandle(root, phandle); |
306 | if (other) { | 386 | if (other && (other != node)) { |
307 | FAIL(c, "%s has duplicated phandle 0x%x (seen before at %s)", | 387 | FAIL(c, "%s has duplicated phandle 0x%x (seen before at %s)", |
308 | node->fullpath, phandle, other->fullpath); | 388 | node->fullpath, phandle, other->fullpath); |
309 | return; | 389 | return; |
@@ -311,7 +391,7 @@ static void check_explicit_phandles(struct check *c, struct node *root, | |||
311 | 391 | ||
312 | node->phandle = phandle; | 392 | node->phandle = phandle; |
313 | } | 393 | } |
314 | NODE_CHECK(explicit_phandles, NULL, ERROR); | 394 | PROP_CHECK(explicit_phandles, NULL, ERROR); |
315 | 395 | ||
316 | static void check_name_properties(struct check *c, struct node *root, | 396 | static void check_name_properties(struct check *c, struct node *root, |
317 | struct node *node) | 397 | struct node *node) |
@@ -549,6 +629,9 @@ static struct check *check_table[] = { | |||
549 | &duplicate_node_names, &duplicate_property_names, | 629 | &duplicate_node_names, &duplicate_property_names, |
550 | &node_name_chars, &node_name_format, &property_name_chars, | 630 | &node_name_chars, &node_name_format, &property_name_chars, |
551 | &name_is_string, &name_properties, | 631 | &name_is_string, &name_properties, |
632 | |||
633 | &duplicate_label, | ||
634 | |||
552 | &explicit_phandles, | 635 | &explicit_phandles, |
553 | &phandle_references, &path_references, | 636 | &phandle_references, &path_references, |
554 | 637 | ||
diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l index a627bbee91d..e866ea5166a 100644 --- a/scripts/dtc/dtc-lexer.l +++ b/scripts/dtc/dtc-lexer.l | |||
@@ -18,7 +18,7 @@ | |||
18 | * USA | 18 | * USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | %option noyywrap noinput nounput yylineno | 21 | %option noyywrap nounput noinput never-interactive |
22 | 22 | ||
23 | %x INCLUDE | 23 | %x INCLUDE |
24 | %x BYTESTRING | 24 | %x BYTESTRING |
@@ -38,6 +38,13 @@ LINECOMMENT "//".*\n | |||
38 | #include "srcpos.h" | 38 | #include "srcpos.h" |
39 | #include "dtc-parser.tab.h" | 39 | #include "dtc-parser.tab.h" |
40 | 40 | ||
41 | YYLTYPE yylloc; | ||
42 | |||
43 | /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ | ||
44 | #define YY_USER_ACTION \ | ||
45 | { \ | ||
46 | srcpos_update(&yylloc, yytext, yyleng); \ | ||
47 | } | ||
41 | 48 | ||
42 | /*#define LEXDEBUG 1*/ | 49 | /*#define LEXDEBUG 1*/ |
43 | 50 | ||
@@ -47,15 +54,10 @@ LINECOMMENT "//".*\n | |||
47 | #define DPRINT(fmt, ...) do { } while (0) | 54 | #define DPRINT(fmt, ...) do { } while (0) |
48 | #endif | 55 | #endif |
49 | 56 | ||
50 | static int dts_version; /* = 0 */ | 57 | static int dts_version = 1; |
51 | 58 | ||
52 | #define BEGIN_DEFAULT() if (dts_version == 0) { \ | 59 | #define BEGIN_DEFAULT() DPRINT("<V1>\n"); \ |
53 | DPRINT("<INITIAL>\n"); \ | ||
54 | BEGIN(INITIAL); \ | ||
55 | } else { \ | ||
56 | DPRINT("<V1>\n"); \ | ||
57 | BEGIN(V1); \ | 60 | BEGIN(V1); \ |
58 | } | ||
59 | 61 | ||
60 | static void push_input_file(const char *filename); | 62 | static void push_input_file(const char *filename); |
61 | static int pop_input_file(void); | 63 | static int pop_input_file(void); |
@@ -75,18 +77,13 @@ static int pop_input_file(void); | |||
75 | } | 77 | } |
76 | 78 | ||
77 | <*>{STRING} { | 79 | <*>{STRING} { |
78 | yylloc.file = srcpos_file; | ||
79 | yylloc.first_line = yylineno; | ||
80 | DPRINT("String: %s\n", yytext); | 80 | DPRINT("String: %s\n", yytext); |
81 | yylval.data = data_copy_escape_string(yytext+1, | 81 | yylval.data = data_copy_escape_string(yytext+1, |
82 | yyleng-2); | 82 | yyleng-2); |
83 | yylloc.first_line = yylineno; | ||
84 | return DT_STRING; | 83 | return DT_STRING; |
85 | } | 84 | } |
86 | 85 | ||
87 | <*>"/dts-v1/" { | 86 | <*>"/dts-v1/" { |
88 | yylloc.file = srcpos_file; | ||
89 | yylloc.first_line = yylineno; | ||
90 | DPRINT("Keyword: /dts-v1/\n"); | 87 | DPRINT("Keyword: /dts-v1/\n"); |
91 | dts_version = 1; | 88 | dts_version = 1; |
92 | BEGIN_DEFAULT(); | 89 | BEGIN_DEFAULT(); |
@@ -94,106 +91,57 @@ static int pop_input_file(void); | |||
94 | } | 91 | } |
95 | 92 | ||
96 | <*>"/memreserve/" { | 93 | <*>"/memreserve/" { |
97 | yylloc.file = srcpos_file; | ||
98 | yylloc.first_line = yylineno; | ||
99 | DPRINT("Keyword: /memreserve/\n"); | 94 | DPRINT("Keyword: /memreserve/\n"); |
100 | BEGIN_DEFAULT(); | 95 | BEGIN_DEFAULT(); |
101 | return DT_MEMRESERVE; | 96 | return DT_MEMRESERVE; |
102 | } | 97 | } |
103 | 98 | ||
104 | <*>{LABEL}: { | 99 | <*>{LABEL}: { |
105 | yylloc.file = srcpos_file; | ||
106 | yylloc.first_line = yylineno; | ||
107 | DPRINT("Label: %s\n", yytext); | 100 | DPRINT("Label: %s\n", yytext); |
108 | yylval.labelref = strdup(yytext); | 101 | yylval.labelref = xstrdup(yytext); |
109 | yylval.labelref[yyleng-1] = '\0'; | 102 | yylval.labelref[yyleng-1] = '\0'; |
110 | return DT_LABEL; | 103 | return DT_LABEL; |
111 | } | 104 | } |
112 | 105 | ||
113 | <INITIAL>[bodh]# { | ||
114 | yylloc.file = srcpos_file; | ||
115 | yylloc.first_line = yylineno; | ||
116 | if (*yytext == 'b') | ||
117 | yylval.cbase = 2; | ||
118 | else if (*yytext == 'o') | ||
119 | yylval.cbase = 8; | ||
120 | else if (*yytext == 'd') | ||
121 | yylval.cbase = 10; | ||
122 | else | ||
123 | yylval.cbase = 16; | ||
124 | DPRINT("Base: %d\n", yylval.cbase); | ||
125 | return DT_BASE; | ||
126 | } | ||
127 | |||
128 | <INITIAL>[0-9a-fA-F]+ { | ||
129 | yylloc.file = srcpos_file; | ||
130 | yylloc.first_line = yylineno; | ||
131 | yylval.literal = strdup(yytext); | ||
132 | DPRINT("Literal: '%s'\n", yylval.literal); | ||
133 | return DT_LEGACYLITERAL; | ||
134 | } | ||
135 | |||
136 | <V1>[0-9]+|0[xX][0-9a-fA-F]+ { | 106 | <V1>[0-9]+|0[xX][0-9a-fA-F]+ { |
137 | yylloc.file = srcpos_file; | 107 | yylval.literal = xstrdup(yytext); |
138 | yylloc.first_line = yylineno; | ||
139 | yylval.literal = strdup(yytext); | ||
140 | DPRINT("Literal: '%s'\n", yylval.literal); | 108 | DPRINT("Literal: '%s'\n", yylval.literal); |
141 | return DT_LITERAL; | 109 | return DT_LITERAL; |
142 | } | 110 | } |
143 | 111 | ||
144 | \&{LABEL} { /* label reference */ | 112 | <*>\&{LABEL} { /* label reference */ |
145 | yylloc.file = srcpos_file; | ||
146 | yylloc.first_line = yylineno; | ||
147 | DPRINT("Ref: %s\n", yytext+1); | 113 | DPRINT("Ref: %s\n", yytext+1); |
148 | yylval.labelref = strdup(yytext+1); | 114 | yylval.labelref = xstrdup(yytext+1); |
149 | return DT_REF; | 115 | return DT_REF; |
150 | } | 116 | } |
151 | 117 | ||
152 | "&{/"{PATHCHAR}+\} { /* new-style path reference */ | 118 | <*>"&{/"{PATHCHAR}+\} { /* new-style path reference */ |
153 | yylloc.file = srcpos_file; | ||
154 | yylloc.first_line = yylineno; | ||
155 | yytext[yyleng-1] = '\0'; | 119 | yytext[yyleng-1] = '\0'; |
156 | DPRINT("Ref: %s\n", yytext+2); | 120 | DPRINT("Ref: %s\n", yytext+2); |
157 | yylval.labelref = strdup(yytext+2); | 121 | yylval.labelref = xstrdup(yytext+2); |
158 | return DT_REF; | ||
159 | } | ||
160 | |||
161 | <INITIAL>"&/"{PATHCHAR}+ { /* old-style path reference */ | ||
162 | yylloc.file = srcpos_file; | ||
163 | yylloc.first_line = yylineno; | ||
164 | DPRINT("Ref: %s\n", yytext+1); | ||
165 | yylval.labelref = strdup(yytext+1); | ||
166 | return DT_REF; | 122 | return DT_REF; |
167 | } | 123 | } |
168 | 124 | ||
169 | <BYTESTRING>[0-9a-fA-F]{2} { | 125 | <BYTESTRING>[0-9a-fA-F]{2} { |
170 | yylloc.file = srcpos_file; | ||
171 | yylloc.first_line = yylineno; | ||
172 | yylval.byte = strtol(yytext, NULL, 16); | 126 | yylval.byte = strtol(yytext, NULL, 16); |
173 | DPRINT("Byte: %02x\n", (int)yylval.byte); | 127 | DPRINT("Byte: %02x\n", (int)yylval.byte); |
174 | return DT_BYTE; | 128 | return DT_BYTE; |
175 | } | 129 | } |
176 | 130 | ||
177 | <BYTESTRING>"]" { | 131 | <BYTESTRING>"]" { |
178 | yylloc.file = srcpos_file; | ||
179 | yylloc.first_line = yylineno; | ||
180 | DPRINT("/BYTESTRING\n"); | 132 | DPRINT("/BYTESTRING\n"); |
181 | BEGIN_DEFAULT(); | 133 | BEGIN_DEFAULT(); |
182 | return ']'; | 134 | return ']'; |
183 | } | 135 | } |
184 | 136 | ||
185 | <PROPNODENAME>{PROPNODECHAR}+ { | 137 | <PROPNODENAME>{PROPNODECHAR}+ { |
186 | yylloc.file = srcpos_file; | ||
187 | yylloc.first_line = yylineno; | ||
188 | DPRINT("PropNodeName: %s\n", yytext); | 138 | DPRINT("PropNodeName: %s\n", yytext); |
189 | yylval.propnodename = strdup(yytext); | 139 | yylval.propnodename = xstrdup(yytext); |
190 | BEGIN_DEFAULT(); | 140 | BEGIN_DEFAULT(); |
191 | return DT_PROPNODENAME; | 141 | return DT_PROPNODENAME; |
192 | } | 142 | } |
193 | 143 | ||
194 | "/incbin/" { | 144 | "/incbin/" { |
195 | yylloc.file = srcpos_file; | ||
196 | yylloc.first_line = yylineno; | ||
197 | DPRINT("Binary Include\n"); | 145 | DPRINT("Binary Include\n"); |
198 | return DT_INCBIN; | 146 | return DT_INCBIN; |
199 | } | 147 | } |
@@ -203,8 +151,6 @@ static int pop_input_file(void); | |||
203 | <*>{LINECOMMENT}+ /* eat C++-style comments */ | 151 | <*>{LINECOMMENT}+ /* eat C++-style comments */ |
204 | 152 | ||
205 | <*>. { | 153 | <*>. { |
206 | yylloc.file = srcpos_file; | ||
207 | yylloc.first_line = yylineno; | ||
208 | DPRINT("Char: %c (\\x%02x)\n", yytext[0], | 154 | DPRINT("Char: %c (\\x%02x)\n", yytext[0], |
209 | (unsigned)yytext[0]); | 155 | (unsigned)yytext[0]); |
210 | if (yytext[0] == '[') { | 156 | if (yytext[0] == '[') { |
@@ -221,100 +167,25 @@ static int pop_input_file(void); | |||
221 | 167 | ||
222 | %% | 168 | %% |
223 | 169 | ||
224 | |||
225 | /* | ||
226 | * Stack of nested include file contexts. | ||
227 | */ | ||
228 | |||
229 | struct incl_file { | ||
230 | struct dtc_file *file; | ||
231 | YY_BUFFER_STATE yy_prev_buf; | ||
232 | int yy_prev_lineno; | ||
233 | struct incl_file *prev; | ||
234 | }; | ||
235 | |||
236 | static struct incl_file *incl_file_stack; | ||
237 | |||
238 | |||
239 | /* | ||
240 | * Detect infinite include recursion. | ||
241 | */ | ||
242 | #define MAX_INCLUDE_DEPTH (100) | ||
243 | |||
244 | static int incl_depth = 0; | ||
245 | |||
246 | |||
247 | static void push_input_file(const char *filename) | 170 | static void push_input_file(const char *filename) |
248 | { | 171 | { |
249 | struct incl_file *incl_file; | ||
250 | struct dtc_file *newfile; | ||
251 | struct search_path search, *searchptr = NULL; | ||
252 | |||
253 | assert(filename); | 172 | assert(filename); |
254 | 173 | ||
255 | if (incl_depth++ >= MAX_INCLUDE_DEPTH) | 174 | srcfile_push(filename); |
256 | die("Includes nested too deeply"); | ||
257 | |||
258 | if (srcpos_file) { | ||
259 | search.dir = srcpos_file->dir; | ||
260 | search.next = NULL; | ||
261 | search.prev = NULL; | ||
262 | searchptr = &search; | ||
263 | } | ||
264 | |||
265 | newfile = dtc_open_file(filename, searchptr); | ||
266 | 175 | ||
267 | incl_file = xmalloc(sizeof(struct incl_file)); | 176 | yyin = current_srcfile->f; |
268 | 177 | ||
269 | /* | 178 | yypush_buffer_state(yy_create_buffer(yyin, YY_BUF_SIZE)); |
270 | * Save current context. | ||
271 | */ | ||
272 | incl_file->yy_prev_buf = YY_CURRENT_BUFFER; | ||
273 | incl_file->yy_prev_lineno = yylineno; | ||
274 | incl_file->file = srcpos_file; | ||
275 | incl_file->prev = incl_file_stack; | ||
276 | |||
277 | incl_file_stack = incl_file; | ||
278 | |||
279 | /* | ||
280 | * Establish new context. | ||
281 | */ | ||
282 | srcpos_file = newfile; | ||
283 | yylineno = 1; | ||
284 | yyin = newfile->file; | ||
285 | yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE)); | ||
286 | } | 179 | } |
287 | 180 | ||
288 | 181 | ||
289 | static int pop_input_file(void) | 182 | static int pop_input_file(void) |
290 | { | 183 | { |
291 | struct incl_file *incl_file; | 184 | if (srcfile_pop() == 0) |
292 | |||
293 | if (incl_file_stack == 0) | ||
294 | return 0; | 185 | return 0; |
295 | 186 | ||
296 | dtc_close_file(srcpos_file); | 187 | yypop_buffer_state(); |
297 | 188 | yyin = current_srcfile->f; | |
298 | /* | ||
299 | * Pop. | ||
300 | */ | ||
301 | --incl_depth; | ||
302 | incl_file = incl_file_stack; | ||
303 | incl_file_stack = incl_file->prev; | ||
304 | |||
305 | /* | ||
306 | * Recover old context. | ||
307 | */ | ||
308 | yy_delete_buffer(YY_CURRENT_BUFFER); | ||
309 | yy_switch_to_buffer(incl_file->yy_prev_buf); | ||
310 | yylineno = incl_file->yy_prev_lineno; | ||
311 | srcpos_file = incl_file->file; | ||
312 | yyin = incl_file->file ? incl_file->file->file : NULL; | ||
313 | |||
314 | /* | ||
315 | * Free old state. | ||
316 | */ | ||
317 | free(incl_file); | ||
318 | 189 | ||
319 | return 1; | 190 | return 1; |
320 | } | 191 | } |
diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped index e27cc636e32..50c4420b4b2 100644 --- a/scripts/dtc/dtc-lexer.lex.c_shipped +++ b/scripts/dtc/dtc-lexer.lex.c_shipped | |||
@@ -170,20 +170,7 @@ extern FILE *yyin, *yyout; | |||
170 | #define EOB_ACT_END_OF_FILE 1 | 170 | #define EOB_ACT_END_OF_FILE 1 |
171 | #define EOB_ACT_LAST_MATCH 2 | 171 | #define EOB_ACT_LAST_MATCH 2 |
172 | 172 | ||
173 | /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires | 173 | #define YY_LESS_LINENO(n) |
174 | * access to the local variable yy_act. Since yyless() is a macro, it would break | ||
175 | * existing scanners that call yyless() from OUTSIDE yylex. | ||
176 | * One obvious solution it to make yy_act a global. I tried that, and saw | ||
177 | * a 5% performance hit in a non-yylineno scanner, because yy_act is | ||
178 | * normally declared as a register variable-- so it is not worth it. | ||
179 | */ | ||
180 | #define YY_LESS_LINENO(n) \ | ||
181 | do { \ | ||
182 | int yyl;\ | ||
183 | for ( yyl = n; yyl < yyleng; ++yyl )\ | ||
184 | if ( yytext[yyl] == '\n' )\ | ||
185 | --yylineno;\ | ||
186 | }while(0) | ||
187 | 174 | ||
188 | /* Return all but the first "n" matched characters back to the input stream. */ | 175 | /* Return all but the first "n" matched characters back to the input stream. */ |
189 | #define yyless(n) \ | 176 | #define yyless(n) \ |
@@ -385,8 +372,8 @@ static void yy_fatal_error (yyconst char msg[] ); | |||
385 | *yy_cp = '\0'; \ | 372 | *yy_cp = '\0'; \ |
386 | (yy_c_buf_p) = yy_cp; | 373 | (yy_c_buf_p) = yy_cp; |
387 | 374 | ||
388 | #define YY_NUM_RULES 20 | 375 | #define YY_NUM_RULES 17 |
389 | #define YY_END_OF_BUFFER 21 | 376 | #define YY_END_OF_BUFFER 18 |
390 | /* This struct is not used in this scanner, | 377 | /* This struct is not used in this scanner, |
391 | but its presence is necessary. */ | 378 | but its presence is necessary. */ |
392 | struct yy_trans_info | 379 | struct yy_trans_info |
@@ -394,20 +381,19 @@ struct yy_trans_info | |||
394 | flex_int32_t yy_verify; | 381 | flex_int32_t yy_verify; |
395 | flex_int32_t yy_nxt; | 382 | flex_int32_t yy_nxt; |
396 | }; | 383 | }; |
397 | static yyconst flex_int16_t yy_accept[104] = | 384 | static yyconst flex_int16_t yy_accept[94] = |
398 | { 0, | 385 | { 0, |
399 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | 386 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
400 | 21, 19, 16, 16, 19, 19, 19, 7, 7, 19, | 387 | 18, 16, 13, 13, 16, 16, 16, 16, 16, 16, |
401 | 7, 19, 19, 19, 19, 13, 14, 14, 19, 8, | 388 | 16, 10, 11, 11, 6, 6, 13, 0, 2, 0, |
402 | 8, 16, 0, 2, 0, 0, 9, 0, 0, 0, | 389 | 7, 0, 0, 0, 0, 0, 0, 0, 5, 0, |
403 | 0, 0, 0, 7, 7, 5, 0, 6, 0, 12, | 390 | 9, 9, 11, 11, 6, 0, 7, 0, 0, 0, |
404 | 12, 14, 14, 8, 0, 11, 9, 0, 0, 0, | 391 | 0, 15, 0, 0, 0, 0, 6, 0, 14, 0, |
405 | 0, 18, 0, 0, 0, 0, 8, 0, 17, 0, | 392 | 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, |
406 | 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, | 393 | 0, 0, 0, 0, 0, 0, 0, 0, 3, 12, |
407 | 0, 0, 0, 0, 0, 0, 0, 0, 3, 15, | ||
408 | 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, | 394 | 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, |
409 | |||
410 | 0, 4, 0 | 395 | 0, 4, 0 |
396 | |||
411 | } ; | 397 | } ; |
412 | 398 | ||
413 | static yyconst flex_int32_t yy_ec[256] = | 399 | static yyconst flex_int32_t yy_ec[256] = |
@@ -416,16 +402,16 @@ static yyconst flex_int32_t yy_ec[256] = | |||
416 | 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, | 402 | 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, |
417 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | 403 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
418 | 1, 2, 1, 4, 5, 1, 1, 6, 1, 1, | 404 | 1, 2, 1, 4, 5, 1, 1, 6, 1, 1, |
419 | 1, 7, 8, 8, 9, 8, 10, 11, 12, 13, | 405 | 1, 7, 5, 5, 8, 5, 9, 10, 11, 12, |
420 | 13, 13, 13, 13, 13, 13, 13, 14, 1, 1, | 406 | 12, 12, 12, 12, 12, 12, 12, 13, 1, 1, |
421 | 1, 1, 8, 8, 15, 15, 15, 15, 15, 15, | 407 | 1, 1, 5, 5, 14, 14, 14, 14, 14, 14, |
422 | 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, | 408 | 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, |
423 | 16, 16, 16, 16, 16, 16, 16, 17, 16, 16, | 409 | 15, 15, 15, 15, 15, 15, 15, 16, 15, 15, |
424 | 1, 18, 19, 1, 16, 1, 15, 20, 21, 22, | 410 | 1, 17, 18, 1, 15, 1, 14, 19, 20, 21, |
425 | 411 | ||
426 | 23, 15, 16, 24, 25, 16, 16, 26, 27, 28, | 412 | 22, 14, 15, 15, 23, 15, 15, 24, 25, 26, |
427 | 24, 16, 16, 29, 30, 31, 32, 33, 16, 17, | 413 | 15, 15, 15, 27, 28, 29, 30, 31, 15, 16, |
428 | 16, 16, 34, 1, 35, 1, 1, 1, 1, 1, | 414 | 15, 15, 32, 1, 33, 1, 1, 1, 1, 1, |
429 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | 415 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
430 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | 416 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
431 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | 417 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
@@ -442,136 +428,114 @@ static yyconst flex_int32_t yy_ec[256] = | |||
442 | 1, 1, 1, 1, 1 | 428 | 1, 1, 1, 1, 1 |
443 | } ; | 429 | } ; |
444 | 430 | ||
445 | static yyconst flex_int32_t yy_meta[36] = | 431 | static yyconst flex_int32_t yy_meta[34] = |
446 | { 0, | 432 | { 0, |
447 | 1, 1, 1, 1, 2, 1, 2, 2, 2, 3, | 433 | 1, 1, 1, 1, 2, 1, 2, 2, 3, 4, |
448 | 4, 4, 4, 5, 6, 7, 7, 1, 1, 6, | 434 | 4, 4, 5, 6, 7, 7, 1, 1, 6, 6, |
449 | 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, | 435 | 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, |
450 | 7, 7, 7, 8, 1 | 436 | 7, 8, 1 |
451 | } ; | 437 | } ; |
452 | 438 | ||
453 | static yyconst flex_int16_t yy_base[117] = | 439 | static yyconst flex_int16_t yy_base[106] = |
454 | { 0, | 440 | { 0, |
455 | 0, 0, 30, 0, 44, 0, 67, 0, 97, 105, | 441 | 0, 0, 237, 236, 25, 0, 47, 0, 30, 71, |
456 | 302, 303, 35, 44, 40, 94, 112, 0, 129, 152, | 442 | 244, 247, 82, 84, 84, 211, 95, 229, 218, 0, |
457 | 296, 295, 159, 0, 176, 303, 0, 116, 95, 165, | 443 | 111, 247, 0, 84, 83, 95, 106, 86, 247, 237, |
458 | 49, 46, 102, 303, 296, 0, 0, 288, 290, 293, | 444 | 0, 230, 231, 234, 207, 209, 212, 220, 247, 206, |
459 | 264, 266, 270, 0, 0, 303, 0, 303, 264, 303, | 445 | 247, 218, 0, 106, 116, 0, 0, 0, 223, 89, |
460 | 0, 0, 195, 101, 0, 0, 0, 0, 284, 125, | 446 | 226, 219, 199, 206, 200, 204, 0, 190, 213, 212, |
461 | 277, 265, 225, 230, 216, 218, 0, 202, 224, 221, | 447 | 202, 91, 178, 161, 247, 172, 144, 150, 140, 130, |
462 | 217, 107, 196, 188, 303, 206, 179, 186, 178, 185, | 448 | 140, 124, 128, 120, 138, 137, 123, 122, 247, 247, |
463 | 183, 162, 161, 150, 169, 160, 145, 125, 303, 303, | 449 | 134, 114, 132, 86, 135, 125, 90, 136, 247, 97, |
464 | 137, 109, 190, 103, 203, 167, 108, 197, 303, 123, | 450 | 29, 247, 247, 153, 156, 161, 165, 170, 176, 180, |
465 | 451 | ||
466 | 29, 303, 303, 215, 221, 226, 229, 234, 240, 246, | 452 | 187, 195, 200, 205, 212 |
467 | 250, 257, 265, 270, 275, 282 | ||
468 | } ; | 453 | } ; |
469 | 454 | ||
470 | static yyconst flex_int16_t yy_def[117] = | 455 | static yyconst flex_int16_t yy_def[106] = |
471 | { 0, | 456 | { 0, |
472 | 103, 1, 1, 3, 3, 5, 103, 7, 3, 3, | 457 | 93, 1, 1, 1, 1, 5, 93, 7, 1, 1, |
473 | 103, 103, 103, 103, 104, 105, 103, 106, 103, 19, | 458 | 93, 93, 93, 93, 94, 95, 93, 96, 17, 97, |
474 | 19, 20, 103, 107, 20, 103, 108, 109, 105, 103, | 459 | 96, 93, 98, 99, 93, 93, 93, 94, 93, 94, |
475 | 103, 103, 104, 103, 104, 110, 111, 103, 112, 113, | 460 | 100, 93, 101, 102, 93, 93, 93, 96, 93, 93, |
476 | 103, 103, 103, 106, 19, 103, 20, 103, 103, 103, | 461 | 93, 96, 98, 99, 93, 103, 100, 104, 101, 101, |
477 | 20, 108, 109, 103, 114, 110, 111, 115, 112, 112, | 462 | 102, 93, 93, 93, 93, 93, 103, 104, 93, 93, |
478 | 113, 103, 103, 103, 103, 103, 114, 115, 103, 103, | 463 | 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, |
479 | 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, | 464 | 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, |
480 | 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, | 465 | 93, 93, 93, 93, 93, 105, 93, 105, 93, 105, |
481 | 103, 103, 103, 103, 103, 116, 103, 116, 103, 116, | 466 | 93, 93, 0, 93, 93, 93, 93, 93, 93, 93, |
482 | 467 | ||
483 | 103, 103, 0, 103, 103, 103, 103, 103, 103, 103, | 468 | 93, 93, 93, 93, 93 |
484 | 103, 103, 103, 103, 103, 103 | ||
485 | } ; | 469 | } ; |
486 | 470 | ||
487 | static yyconst flex_int16_t yy_nxt[339] = | 471 | static yyconst flex_int16_t yy_nxt[281] = |
488 | { 0, | 472 | { 0, |
489 | 12, 13, 14, 15, 12, 16, 12, 12, 12, 17, | 473 | 12, 13, 14, 15, 12, 16, 12, 12, 17, 12, |
490 | 18, 18, 18, 12, 19, 20, 20, 12, 12, 21, | 474 | 12, 12, 12, 18, 18, 18, 12, 12, 18, 18, |
491 | 19, 21, 19, 22, 20, 20, 20, 20, 20, 20, | 475 | 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, |
492 | 20, 20, 20, 12, 12, 12, 32, 32, 102, 23, | 476 | 18, 12, 12, 19, 20, 20, 20, 92, 21, 25, |
493 | 12, 12, 12, 34, 20, 32, 32, 32, 32, 20, | 477 | 26, 26, 22, 21, 21, 21, 21, 12, 13, 14, |
494 | 20, 20, 20, 20, 24, 24, 24, 35, 25, 54, | 478 | 15, 23, 16, 23, 23, 19, 23, 23, 23, 12, |
495 | 54, 54, 26, 25, 25, 25, 25, 12, 13, 14, | 479 | 24, 24, 24, 12, 12, 24, 24, 24, 24, 24, |
496 | 15, 27, 12, 27, 27, 27, 23, 27, 27, 27, | 480 | 24, 24, 24, 24, 24, 24, 24, 24, 12, 12, |
497 | 12, 28, 28, 28, 12, 12, 28, 28, 28, 28, | 481 | 25, 26, 26, 27, 27, 27, 27, 29, 43, 29, |
498 | 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, | 482 | 43, 43, 45, 45, 45, 50, 39, 59, 46, 93, |
499 | 483 | ||
500 | 12, 12, 29, 36, 103, 34, 17, 30, 31, 31, | 484 | 30, 33, 30, 34, 45, 45, 45, 27, 27, 68, |
501 | 29, 54, 54, 54, 17, 30, 31, 31, 39, 35, | 485 | 43, 91, 43, 43, 69, 35, 87, 36, 39, 37, |
502 | 52, 40, 52, 52, 52, 103, 78, 38, 38, 46, | 486 | 42, 42, 42, 39, 42, 45, 45, 45, 89, 42, |
503 | 101, 60, 79, 41, 69, 97, 42, 94, 43, 45, | 487 | 42, 42, 42, 85, 85, 86, 85, 85, 86, 89, |
504 | 45, 45, 46, 45, 47, 47, 93, 92, 45, 45, | 488 | 84, 90, 83, 82, 81, 80, 79, 78, 77, 76, |
505 | 45, 45, 47, 47, 47, 47, 47, 47, 47, 47, | 489 | 75, 74, 90, 28, 28, 28, 28, 28, 28, 28, |
506 | 47, 47, 47, 47, 47, 39, 47, 91, 40, 90, | 490 | 28, 31, 31, 31, 38, 38, 38, 38, 41, 73, |
507 | 99, 47, 47, 47, 47, 54, 54, 54, 89, 88, | 491 | 41, 43, 72, 43, 71, 43, 43, 44, 33, 44, |
508 | 41, 55, 87, 49, 100, 43, 51, 51, 51, 86, | 492 | 44, 44, 44, 47, 69, 47, 47, 49, 49, 49, |
509 | 51, 95, 95, 96, 85, 51, 51, 51, 51, 52, | 493 | 49, 49, 49, 49, 49, 51, 51, 51, 51, 51, |
510 | 494 | ||
511 | 99, 52, 52, 52, 95, 95, 96, 84, 46, 83, | 495 | 51, 51, 51, 57, 70, 57, 58, 58, 58, 67, |
512 | 82, 81, 39, 79, 100, 33, 33, 33, 33, 33, | 496 | 58, 58, 88, 88, 88, 88, 88, 88, 88, 88, |
513 | 33, 33, 33, 37, 80, 77, 37, 37, 37, 44, | 497 | 34, 66, 65, 64, 63, 62, 61, 60, 52, 50, |
514 | 40, 44, 50, 76, 50, 52, 75, 52, 74, 52, | 498 | 39, 56, 39, 55, 54, 53, 52, 50, 48, 93, |
515 | 52, 53, 73, 53, 53, 53, 53, 56, 56, 56, | 499 | 40, 39, 32, 93, 19, 19, 11, 93, 93, 93, |
516 | 72, 56, 56, 57, 71, 57, 57, 59, 59, 59, | 500 | 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, |
517 | 59, 59, 59, 59, 59, 61, 61, 61, 61, 61, | 501 | 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, |
518 | 61, 61, 61, 67, 70, 67, 68, 68, 68, 62, | 502 | 93, 93, 93, 93, 93, 93, 93, 93, 93, 93 |
519 | 68, 68, 98, 98, 98, 98, 98, 98, 98, 98, | ||
520 | 60, 66, 65, 64, 63, 62, 60, 58, 103, 48, | ||
521 | |||
522 | 48, 103, 11, 103, 103, 103, 103, 103, 103, 103, | ||
523 | 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, | ||
524 | 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, | ||
525 | 103, 103, 103, 103, 103, 103, 103, 103 | ||
526 | } ; | 503 | } ; |
527 | 504 | ||
528 | static yyconst flex_int16_t yy_chk[339] = | 505 | static yyconst flex_int16_t yy_chk[281] = |
529 | { 0, | 506 | { 0, |
530 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | 507 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
531 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | 508 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
532 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | 509 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
533 | 1, 1, 1, 1, 1, 3, 13, 13, 101, 3, | 510 | 1, 1, 1, 5, 5, 5, 5, 91, 5, 9, |
534 | 3, 3, 3, 15, 3, 14, 14, 32, 32, 3, | 511 | 9, 9, 5, 5, 5, 5, 5, 7, 7, 7, |
535 | 3, 3, 3, 3, 5, 5, 5, 15, 5, 31, | ||
536 | 31, 31, 5, 5, 5, 5, 5, 7, 7, 7, | ||
537 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, | 512 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, |
538 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, | 513 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, |
539 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, | 514 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, |
540 | 515 | 10, 10, 10, 13, 13, 14, 14, 15, 24, 28, | |
541 | 7, 7, 9, 16, 29, 33, 9, 9, 9, 9, | 516 | 24, 24, 25, 25, 25, 50, 24, 50, 25, 90, |
542 | 10, 54, 54, 54, 10, 10, 10, 10, 17, 33, | 517 | |
543 | 28, 17, 28, 28, 28, 100, 72, 16, 29, 28, | 518 | 15, 17, 28, 17, 26, 26, 26, 27, 27, 62, |
544 | 97, 60, 72, 17, 60, 94, 17, 92, 17, 19, | 519 | 44, 87, 44, 44, 62, 17, 84, 17, 44, 17, |
545 | 19, 19, 19, 19, 19, 19, 91, 88, 19, 19, | 520 | 21, 21, 21, 21, 21, 45, 45, 45, 86, 21, |
546 | 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, | 521 | 21, 21, 21, 83, 83, 83, 85, 85, 85, 88, |
547 | 19, 19, 20, 20, 20, 23, 20, 87, 23, 86, | 522 | 82, 86, 81, 78, 77, 76, 75, 74, 73, 72, |
548 | 96, 20, 20, 20, 20, 30, 30, 30, 85, 84, | 523 | 71, 70, 88, 94, 94, 94, 94, 94, 94, 94, |
549 | 23, 30, 83, 23, 96, 23, 25, 25, 25, 82, | 524 | 94, 95, 95, 95, 96, 96, 96, 96, 97, 69, |
550 | 25, 93, 93, 93, 81, 25, 25, 25, 25, 53, | 525 | 97, 98, 68, 98, 67, 98, 98, 99, 66, 99, |
551 | 526 | 99, 99, 99, 100, 64, 100, 100, 101, 101, 101, | |
552 | 98, 53, 53, 53, 95, 95, 95, 80, 53, 79, | 527 | 101, 101, 101, 101, 101, 102, 102, 102, 102, 102, |
553 | 78, 77, 76, 74, 98, 104, 104, 104, 104, 104, | 528 | |
554 | 104, 104, 104, 105, 73, 71, 105, 105, 105, 106, | 529 | 102, 102, 102, 103, 63, 103, 104, 104, 104, 61, |
555 | 70, 106, 107, 69, 107, 108, 68, 108, 66, 108, | 530 | 104, 104, 105, 105, 105, 105, 105, 105, 105, 105, |
556 | 108, 109, 65, 109, 109, 109, 109, 110, 110, 110, | 531 | 60, 59, 58, 56, 55, 54, 53, 52, 51, 49, |
557 | 64, 110, 110, 111, 63, 111, 111, 112, 112, 112, | 532 | 42, 40, 38, 37, 36, 35, 34, 33, 32, 30, |
558 | 112, 112, 112, 112, 112, 113, 113, 113, 113, 113, | 533 | 19, 18, 16, 11, 4, 3, 93, 93, 93, 93, |
559 | 113, 113, 113, 114, 62, 114, 115, 115, 115, 61, | 534 | 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, |
560 | 115, 115, 116, 116, 116, 116, 116, 116, 116, 116, | 535 | 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, |
561 | 59, 49, 43, 42, 41, 40, 39, 38, 35, 22, | 536 | 93, 93, 93, 93, 93, 93, 93, 93, 93, 93 |
562 | |||
563 | 21, 11, 103, 103, 103, 103, 103, 103, 103, 103, | ||
564 | 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, | ||
565 | 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, | ||
566 | 103, 103, 103, 103, 103, 103, 103, 103 | ||
567 | } ; | 537 | } ; |
568 | 538 | ||
569 | /* Table of booleans, true if rule could match eol. */ | ||
570 | static yyconst flex_int32_t yy_rule_can_match_eol[21] = | ||
571 | { 0, | ||
572 | 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, | ||
573 | 0, }; | ||
574 | |||
575 | static yy_state_type yy_last_accepting_state; | 539 | static yy_state_type yy_last_accepting_state; |
576 | static char *yy_last_accepting_cpos; | 540 | static char *yy_last_accepting_cpos; |
577 | 541 | ||
@@ -616,6 +580,13 @@ char *yytext; | |||
616 | #include "srcpos.h" | 580 | #include "srcpos.h" |
617 | #include "dtc-parser.tab.h" | 581 | #include "dtc-parser.tab.h" |
618 | 582 | ||
583 | YYLTYPE yylloc; | ||
584 | |||
585 | /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ | ||
586 | #define YY_USER_ACTION \ | ||
587 | { \ | ||
588 | srcpos_update(&yylloc, yytext, yyleng); \ | ||
589 | } | ||
619 | 590 | ||
620 | /*#define LEXDEBUG 1*/ | 591 | /*#define LEXDEBUG 1*/ |
621 | 592 | ||
@@ -625,19 +596,14 @@ char *yytext; | |||
625 | #define DPRINT(fmt, ...) do { } while (0) | 596 | #define DPRINT(fmt, ...) do { } while (0) |
626 | #endif | 597 | #endif |
627 | 598 | ||
628 | static int dts_version; /* = 0 */ | 599 | static int dts_version = 1; |
629 | 600 | ||
630 | #define BEGIN_DEFAULT() if (dts_version == 0) { \ | 601 | #define BEGIN_DEFAULT() DPRINT("<V1>\n"); \ |
631 | DPRINT("<INITIAL>\n"); \ | ||
632 | BEGIN(INITIAL); \ | ||
633 | } else { \ | ||
634 | DPRINT("<V1>\n"); \ | ||
635 | BEGIN(V1); \ | 602 | BEGIN(V1); \ |
636 | } | ||
637 | 603 | ||
638 | static void push_input_file(const char *filename); | 604 | static void push_input_file(const char *filename); |
639 | static int pop_input_file(void); | 605 | static int pop_input_file(void); |
640 | #line 641 "dtc-lexer.lex.c" | 606 | #line 607 "dtc-lexer.lex.c" |
641 | 607 | ||
642 | #define INITIAL 0 | 608 | #define INITIAL 0 |
643 | #define INCLUDE 1 | 609 | #define INCLUDE 1 |
@@ -826,9 +792,9 @@ YY_DECL | |||
826 | register char *yy_cp, *yy_bp; | 792 | register char *yy_cp, *yy_bp; |
827 | register int yy_act; | 793 | register int yy_act; |
828 | 794 | ||
829 | #line 64 "dtc-lexer.l" | 795 | #line 66 "dtc-lexer.l" |
830 | 796 | ||
831 | #line 832 "dtc-lexer.lex.c" | 797 | #line 798 "dtc-lexer.lex.c" |
832 | 798 | ||
833 | if ( !(yy_init) ) | 799 | if ( !(yy_init) ) |
834 | { | 800 | { |
@@ -881,35 +847,21 @@ yy_match: | |||
881 | while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) | 847 | while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) |
882 | { | 848 | { |
883 | yy_current_state = (int) yy_def[yy_current_state]; | 849 | yy_current_state = (int) yy_def[yy_current_state]; |
884 | if ( yy_current_state >= 104 ) | 850 | if ( yy_current_state >= 94 ) |
885 | yy_c = yy_meta[(unsigned int) yy_c]; | 851 | yy_c = yy_meta[(unsigned int) yy_c]; |
886 | } | 852 | } |
887 | yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; | 853 | yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; |
888 | ++yy_cp; | 854 | ++yy_cp; |
889 | } | 855 | } |
890 | while ( yy_base[yy_current_state] != 303 ); | 856 | while ( yy_current_state != 93 ); |
857 | yy_cp = (yy_last_accepting_cpos); | ||
858 | yy_current_state = (yy_last_accepting_state); | ||
891 | 859 | ||
892 | yy_find_action: | 860 | yy_find_action: |
893 | yy_act = yy_accept[yy_current_state]; | 861 | yy_act = yy_accept[yy_current_state]; |
894 | if ( yy_act == 0 ) | ||
895 | { /* have to back up */ | ||
896 | yy_cp = (yy_last_accepting_cpos); | ||
897 | yy_current_state = (yy_last_accepting_state); | ||
898 | yy_act = yy_accept[yy_current_state]; | ||
899 | } | ||
900 | 862 | ||
901 | YY_DO_BEFORE_ACTION; | 863 | YY_DO_BEFORE_ACTION; |
902 | 864 | ||
903 | if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) | ||
904 | { | ||
905 | int yyl; | ||
906 | for ( yyl = 0; yyl < yyleng; ++yyl ) | ||
907 | if ( yytext[yyl] == '\n' ) | ||
908 | |||
909 | yylineno++; | ||
910 | ; | ||
911 | } | ||
912 | |||
913 | do_action: /* This label is used only to access EOF actions. */ | 865 | do_action: /* This label is used only to access EOF actions. */ |
914 | 866 | ||
915 | switch ( yy_act ) | 867 | switch ( yy_act ) |
@@ -924,7 +876,7 @@ do_action: /* This label is used only to access EOF actions. */ | |||
924 | case 1: | 876 | case 1: |
925 | /* rule 1 can match eol */ | 877 | /* rule 1 can match eol */ |
926 | YY_RULE_SETUP | 878 | YY_RULE_SETUP |
927 | #line 65 "dtc-lexer.l" | 879 | #line 67 "dtc-lexer.l" |
928 | { | 880 | { |
929 | char *name = strchr(yytext, '\"') + 1; | 881 | char *name = strchr(yytext, '\"') + 1; |
930 | yytext[yyleng-1] = '\0'; | 882 | yytext[yyleng-1] = '\0'; |
@@ -936,7 +888,7 @@ case YY_STATE_EOF(INCLUDE): | |||
936 | case YY_STATE_EOF(BYTESTRING): | 888 | case YY_STATE_EOF(BYTESTRING): |
937 | case YY_STATE_EOF(PROPNODENAME): | 889 | case YY_STATE_EOF(PROPNODENAME): |
938 | case YY_STATE_EOF(V1): | 890 | case YY_STATE_EOF(V1): |
939 | #line 71 "dtc-lexer.l" | 891 | #line 73 "dtc-lexer.l" |
940 | { | 892 | { |
941 | if (!pop_input_file()) { | 893 | if (!pop_input_file()) { |
942 | yyterminate(); | 894 | yyterminate(); |
@@ -946,23 +898,18 @@ case YY_STATE_EOF(V1): | |||
946 | case 2: | 898 | case 2: |
947 | /* rule 2 can match eol */ | 899 | /* rule 2 can match eol */ |
948 | YY_RULE_SETUP | 900 | YY_RULE_SETUP |
949 | #line 77 "dtc-lexer.l" | 901 | #line 79 "dtc-lexer.l" |
950 | { | 902 | { |
951 | yylloc.file = srcpos_file; | ||
952 | yylloc.first_line = yylineno; | ||
953 | DPRINT("String: %s\n", yytext); | 903 | DPRINT("String: %s\n", yytext); |
954 | yylval.data = data_copy_escape_string(yytext+1, | 904 | yylval.data = data_copy_escape_string(yytext+1, |
955 | yyleng-2); | 905 | yyleng-2); |
956 | yylloc.first_line = yylineno; | ||
957 | return DT_STRING; | 906 | return DT_STRING; |
958 | } | 907 | } |
959 | YY_BREAK | 908 | YY_BREAK |
960 | case 3: | 909 | case 3: |
961 | YY_RULE_SETUP | 910 | YY_RULE_SETUP |
962 | #line 87 "dtc-lexer.l" | 911 | #line 86 "dtc-lexer.l" |
963 | { | 912 | { |
964 | yylloc.file = srcpos_file; | ||
965 | yylloc.first_line = yylineno; | ||
966 | DPRINT("Keyword: /dts-v1/\n"); | 913 | DPRINT("Keyword: /dts-v1/\n"); |
967 | dts_version = 1; | 914 | dts_version = 1; |
968 | BEGIN_DEFAULT(); | 915 | BEGIN_DEFAULT(); |
@@ -971,10 +918,8 @@ YY_RULE_SETUP | |||
971 | YY_BREAK | 918 | YY_BREAK |
972 | case 4: | 919 | case 4: |
973 | YY_RULE_SETUP | 920 | YY_RULE_SETUP |
974 | #line 96 "dtc-lexer.l" | 921 | #line 93 "dtc-lexer.l" |
975 | { | 922 | { |
976 | yylloc.file = srcpos_file; | ||
977 | yylloc.first_line = yylineno; | ||
978 | DPRINT("Keyword: /memreserve/\n"); | 923 | DPRINT("Keyword: /memreserve/\n"); |
979 | BEGIN_DEFAULT(); | 924 | BEGIN_DEFAULT(); |
980 | return DT_MEMRESERVE; | 925 | return DT_MEMRESERVE; |
@@ -982,158 +927,100 @@ YY_RULE_SETUP | |||
982 | YY_BREAK | 927 | YY_BREAK |
983 | case 5: | 928 | case 5: |
984 | YY_RULE_SETUP | 929 | YY_RULE_SETUP |
985 | #line 104 "dtc-lexer.l" | 930 | #line 99 "dtc-lexer.l" |
986 | { | 931 | { |
987 | yylloc.file = srcpos_file; | ||
988 | yylloc.first_line = yylineno; | ||
989 | DPRINT("Label: %s\n", yytext); | 932 | DPRINT("Label: %s\n", yytext); |
990 | yylval.labelref = strdup(yytext); | 933 | yylval.labelref = xstrdup(yytext); |
991 | yylval.labelref[yyleng-1] = '\0'; | 934 | yylval.labelref[yyleng-1] = '\0'; |
992 | return DT_LABEL; | 935 | return DT_LABEL; |
993 | } | 936 | } |
994 | YY_BREAK | 937 | YY_BREAK |
995 | case 6: | 938 | case 6: |
996 | YY_RULE_SETUP | 939 | YY_RULE_SETUP |
997 | #line 113 "dtc-lexer.l" | 940 | #line 106 "dtc-lexer.l" |
998 | { | ||
999 | yylloc.file = srcpos_file; | ||
1000 | yylloc.first_line = yylineno; | ||
1001 | if (*yytext == 'b') | ||
1002 | yylval.cbase = 2; | ||
1003 | else if (*yytext == 'o') | ||
1004 | yylval.cbase = 8; | ||
1005 | else if (*yytext == 'd') | ||
1006 | yylval.cbase = 10; | ||
1007 | else | ||
1008 | yylval.cbase = 16; | ||
1009 | DPRINT("Base: %d\n", yylval.cbase); | ||
1010 | return DT_BASE; | ||
1011 | } | ||
1012 | YY_BREAK | ||
1013 | case 7: | ||
1014 | YY_RULE_SETUP | ||
1015 | #line 128 "dtc-lexer.l" | ||
1016 | { | 941 | { |
1017 | yylloc.file = srcpos_file; | 942 | yylval.literal = xstrdup(yytext); |
1018 | yylloc.first_line = yylineno; | ||
1019 | yylval.literal = strdup(yytext); | ||
1020 | DPRINT("Literal: '%s'\n", yylval.literal); | ||
1021 | return DT_LEGACYLITERAL; | ||
1022 | } | ||
1023 | YY_BREAK | ||
1024 | case 8: | ||
1025 | YY_RULE_SETUP | ||
1026 | #line 136 "dtc-lexer.l" | ||
1027 | { | ||
1028 | yylloc.file = srcpos_file; | ||
1029 | yylloc.first_line = yylineno; | ||
1030 | yylval.literal = strdup(yytext); | ||
1031 | DPRINT("Literal: '%s'\n", yylval.literal); | 943 | DPRINT("Literal: '%s'\n", yylval.literal); |
1032 | return DT_LITERAL; | 944 | return DT_LITERAL; |
1033 | } | 945 | } |
1034 | YY_BREAK | 946 | YY_BREAK |
1035 | case 9: | 947 | case 7: |
1036 | YY_RULE_SETUP | 948 | YY_RULE_SETUP |
1037 | #line 144 "dtc-lexer.l" | 949 | #line 112 "dtc-lexer.l" |
1038 | { /* label reference */ | 950 | { /* label reference */ |
1039 | yylloc.file = srcpos_file; | ||
1040 | yylloc.first_line = yylineno; | ||
1041 | DPRINT("Ref: %s\n", yytext+1); | 951 | DPRINT("Ref: %s\n", yytext+1); |
1042 | yylval.labelref = strdup(yytext+1); | 952 | yylval.labelref = xstrdup(yytext+1); |
1043 | return DT_REF; | 953 | return DT_REF; |
1044 | } | 954 | } |
1045 | YY_BREAK | 955 | YY_BREAK |
1046 | case 10: | 956 | case 8: |
1047 | YY_RULE_SETUP | 957 | YY_RULE_SETUP |
1048 | #line 152 "dtc-lexer.l" | 958 | #line 118 "dtc-lexer.l" |
1049 | { /* new-style path reference */ | 959 | { /* new-style path reference */ |
1050 | yylloc.file = srcpos_file; | ||
1051 | yylloc.first_line = yylineno; | ||
1052 | yytext[yyleng-1] = '\0'; | 960 | yytext[yyleng-1] = '\0'; |
1053 | DPRINT("Ref: %s\n", yytext+2); | 961 | DPRINT("Ref: %s\n", yytext+2); |
1054 | yylval.labelref = strdup(yytext+2); | 962 | yylval.labelref = xstrdup(yytext+2); |
1055 | return DT_REF; | 963 | return DT_REF; |
1056 | } | 964 | } |
1057 | YY_BREAK | 965 | YY_BREAK |
1058 | case 11: | 966 | case 9: |
1059 | YY_RULE_SETUP | ||
1060 | #line 161 "dtc-lexer.l" | ||
1061 | { /* old-style path reference */ | ||
1062 | yylloc.file = srcpos_file; | ||
1063 | yylloc.first_line = yylineno; | ||
1064 | DPRINT("Ref: %s\n", yytext+1); | ||
1065 | yylval.labelref = strdup(yytext+1); | ||
1066 | return DT_REF; | ||
1067 | } | ||
1068 | YY_BREAK | ||
1069 | case 12: | ||
1070 | YY_RULE_SETUP | 967 | YY_RULE_SETUP |
1071 | #line 169 "dtc-lexer.l" | 968 | #line 125 "dtc-lexer.l" |
1072 | { | 969 | { |
1073 | yylloc.file = srcpos_file; | ||
1074 | yylloc.first_line = yylineno; | ||
1075 | yylval.byte = strtol(yytext, NULL, 16); | 970 | yylval.byte = strtol(yytext, NULL, 16); |
1076 | DPRINT("Byte: %02x\n", (int)yylval.byte); | 971 | DPRINT("Byte: %02x\n", (int)yylval.byte); |
1077 | return DT_BYTE; | 972 | return DT_BYTE; |
1078 | } | 973 | } |
1079 | YY_BREAK | 974 | YY_BREAK |
1080 | case 13: | 975 | case 10: |
1081 | YY_RULE_SETUP | 976 | YY_RULE_SETUP |
1082 | #line 177 "dtc-lexer.l" | 977 | #line 131 "dtc-lexer.l" |
1083 | { | 978 | { |
1084 | yylloc.file = srcpos_file; | ||
1085 | yylloc.first_line = yylineno; | ||
1086 | DPRINT("/BYTESTRING\n"); | 979 | DPRINT("/BYTESTRING\n"); |
1087 | BEGIN_DEFAULT(); | 980 | BEGIN_DEFAULT(); |
1088 | return ']'; | 981 | return ']'; |
1089 | } | 982 | } |
1090 | YY_BREAK | 983 | YY_BREAK |
1091 | case 14: | 984 | case 11: |
1092 | YY_RULE_SETUP | 985 | YY_RULE_SETUP |
1093 | #line 185 "dtc-lexer.l" | 986 | #line 137 "dtc-lexer.l" |
1094 | { | 987 | { |
1095 | yylloc.file = srcpos_file; | ||
1096 | yylloc.first_line = yylineno; | ||
1097 | DPRINT("PropNodeName: %s\n", yytext); | 988 | DPRINT("PropNodeName: %s\n", yytext); |
1098 | yylval.propnodename = strdup(yytext); | 989 | yylval.propnodename = xstrdup(yytext); |
1099 | BEGIN_DEFAULT(); | 990 | BEGIN_DEFAULT(); |
1100 | return DT_PROPNODENAME; | 991 | return DT_PROPNODENAME; |
1101 | } | 992 | } |
1102 | YY_BREAK | 993 | YY_BREAK |
1103 | case 15: | 994 | case 12: |
1104 | YY_RULE_SETUP | 995 | YY_RULE_SETUP |
1105 | #line 194 "dtc-lexer.l" | 996 | #line 144 "dtc-lexer.l" |
1106 | { | 997 | { |
1107 | yylloc.file = srcpos_file; | ||
1108 | yylloc.first_line = yylineno; | ||
1109 | DPRINT("Binary Include\n"); | 998 | DPRINT("Binary Include\n"); |
1110 | return DT_INCBIN; | 999 | return DT_INCBIN; |
1111 | } | 1000 | } |
1112 | YY_BREAK | 1001 | YY_BREAK |
1113 | case 16: | 1002 | case 13: |
1114 | /* rule 16 can match eol */ | 1003 | /* rule 13 can match eol */ |
1115 | YY_RULE_SETUP | 1004 | YY_RULE_SETUP |
1116 | #line 201 "dtc-lexer.l" | 1005 | #line 149 "dtc-lexer.l" |
1117 | /* eat whitespace */ | 1006 | /* eat whitespace */ |
1118 | YY_BREAK | 1007 | YY_BREAK |
1119 | case 17: | 1008 | case 14: |
1120 | /* rule 17 can match eol */ | 1009 | /* rule 14 can match eol */ |
1121 | YY_RULE_SETUP | 1010 | YY_RULE_SETUP |
1122 | #line 202 "dtc-lexer.l" | 1011 | #line 150 "dtc-lexer.l" |
1123 | /* eat C-style comments */ | 1012 | /* eat C-style comments */ |
1124 | YY_BREAK | 1013 | YY_BREAK |
1125 | case 18: | 1014 | case 15: |
1126 | /* rule 18 can match eol */ | 1015 | /* rule 15 can match eol */ |
1127 | YY_RULE_SETUP | 1016 | YY_RULE_SETUP |
1128 | #line 203 "dtc-lexer.l" | 1017 | #line 151 "dtc-lexer.l" |
1129 | /* eat C++-style comments */ | 1018 | /* eat C++-style comments */ |
1130 | YY_BREAK | 1019 | YY_BREAK |
1131 | case 19: | 1020 | case 16: |
1132 | YY_RULE_SETUP | 1021 | YY_RULE_SETUP |
1133 | #line 205 "dtc-lexer.l" | 1022 | #line 153 "dtc-lexer.l" |
1134 | { | 1023 | { |
1135 | yylloc.file = srcpos_file; | ||
1136 | yylloc.first_line = yylineno; | ||
1137 | DPRINT("Char: %c (\\x%02x)\n", yytext[0], | 1024 | DPRINT("Char: %c (\\x%02x)\n", yytext[0], |
1138 | (unsigned)yytext[0]); | 1025 | (unsigned)yytext[0]); |
1139 | if (yytext[0] == '[') { | 1026 | if (yytext[0] == '[') { |
@@ -1148,12 +1035,12 @@ YY_RULE_SETUP | |||
1148 | return yytext[0]; | 1035 | return yytext[0]; |
1149 | } | 1036 | } |
1150 | YY_BREAK | 1037 | YY_BREAK |
1151 | case 20: | 1038 | case 17: |
1152 | YY_RULE_SETUP | 1039 | YY_RULE_SETUP |
1153 | #line 222 "dtc-lexer.l" | 1040 | #line 168 "dtc-lexer.l" |
1154 | ECHO; | 1041 | ECHO; |
1155 | YY_BREAK | 1042 | YY_BREAK |
1156 | #line 1157 "dtc-lexer.lex.c" | 1043 | #line 1044 "dtc-lexer.lex.c" |
1157 | 1044 | ||
1158 | case YY_END_OF_BUFFER: | 1045 | case YY_END_OF_BUFFER: |
1159 | { | 1046 | { |
@@ -1218,7 +1105,8 @@ ECHO; | |||
1218 | 1105 | ||
1219 | else | 1106 | else |
1220 | { | 1107 | { |
1221 | yy_cp = (yy_c_buf_p); | 1108 | yy_cp = (yy_last_accepting_cpos); |
1109 | yy_current_state = (yy_last_accepting_state); | ||
1222 | goto yy_find_action; | 1110 | goto yy_find_action; |
1223 | } | 1111 | } |
1224 | } | 1112 | } |
@@ -1443,7 +1331,7 @@ static int yy_get_next_buffer (void) | |||
1443 | while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) | 1331 | while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) |
1444 | { | 1332 | { |
1445 | yy_current_state = (int) yy_def[yy_current_state]; | 1333 | yy_current_state = (int) yy_def[yy_current_state]; |
1446 | if ( yy_current_state >= 104 ) | 1334 | if ( yy_current_state >= 94 ) |
1447 | yy_c = yy_meta[(unsigned int) yy_c]; | 1335 | yy_c = yy_meta[(unsigned int) yy_c]; |
1448 | } | 1336 | } |
1449 | yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; | 1337 | yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; |
@@ -1471,11 +1359,11 @@ static int yy_get_next_buffer (void) | |||
1471 | while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) | 1359 | while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) |
1472 | { | 1360 | { |
1473 | yy_current_state = (int) yy_def[yy_current_state]; | 1361 | yy_current_state = (int) yy_def[yy_current_state]; |
1474 | if ( yy_current_state >= 104 ) | 1362 | if ( yy_current_state >= 94 ) |
1475 | yy_c = yy_meta[(unsigned int) yy_c]; | 1363 | yy_c = yy_meta[(unsigned int) yy_c]; |
1476 | } | 1364 | } |
1477 | yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; | 1365 | yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; |
1478 | yy_is_jam = (yy_current_state == 103); | 1366 | yy_is_jam = (yy_current_state == 93); |
1479 | 1367 | ||
1480 | return yy_is_jam ? 0 : yy_current_state; | 1368 | return yy_is_jam ? 0 : yy_current_state; |
1481 | } | 1369 | } |
@@ -1550,11 +1438,6 @@ static int yy_get_next_buffer (void) | |||
1550 | *(yy_c_buf_p) = '\0'; /* preserve yytext */ | 1438 | *(yy_c_buf_p) = '\0'; /* preserve yytext */ |
1551 | (yy_hold_char) = *++(yy_c_buf_p); | 1439 | (yy_hold_char) = *++(yy_c_buf_p); |
1552 | 1440 | ||
1553 | if ( c == '\n' ) | ||
1554 | |||
1555 | yylineno++; | ||
1556 | ; | ||
1557 | |||
1558 | return c; | 1441 | return c; |
1559 | } | 1442 | } |
1560 | #endif /* ifndef YY_NO_INPUT */ | 1443 | #endif /* ifndef YY_NO_INPUT */ |
@@ -1669,10 +1552,6 @@ static void yy_load_buffer_state (void) | |||
1669 | yyfree((void *) b ); | 1552 | yyfree((void *) b ); |
1670 | } | 1553 | } |
1671 | 1554 | ||
1672 | #ifndef __cplusplus | ||
1673 | extern int isatty (int ); | ||
1674 | #endif /* __cplusplus */ | ||
1675 | |||
1676 | /* Initializes or reinitializes a buffer. | 1555 | /* Initializes or reinitializes a buffer. |
1677 | * This function is sometimes called more than once on the same buffer, | 1556 | * This function is sometimes called more than once on the same buffer, |
1678 | * such as during a yyrestart() or at EOF. | 1557 | * such as during a yyrestart() or at EOF. |
@@ -1696,7 +1575,7 @@ extern int isatty (int ); | |||
1696 | b->yy_bs_column = 0; | 1575 | b->yy_bs_column = 0; |
1697 | } | 1576 | } |
1698 | 1577 | ||
1699 | b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; | 1578 | b->yy_is_interactive = 0; |
1700 | 1579 | ||
1701 | errno = oerrno; | 1580 | errno = oerrno; |
1702 | } | 1581 | } |
@@ -2025,9 +1904,6 @@ static int yy_init_globals (void) | |||
2025 | * This function is called from yylex_destroy(), so don't allocate here. | 1904 | * This function is called from yylex_destroy(), so don't allocate here. |
2026 | */ | 1905 | */ |
2027 | 1906 | ||
2028 | /* We do not touch yylineno unless the option is enabled. */ | ||
2029 | yylineno = 1; | ||
2030 | |||
2031 | (yy_buffer_stack) = 0; | 1907 | (yy_buffer_stack) = 0; |
2032 | (yy_buffer_stack_top) = 0; | 1908 | (yy_buffer_stack_top) = 0; |
2033 | (yy_buffer_stack_max) = 0; | 1909 | (yy_buffer_stack_max) = 0; |
@@ -2120,104 +1996,29 @@ void yyfree (void * ptr ) | |||
2120 | 1996 | ||
2121 | #define YYTABLES_NAME "yytables" | 1997 | #define YYTABLES_NAME "yytables" |
2122 | 1998 | ||
2123 | #line 222 "dtc-lexer.l" | 1999 | #line 168 "dtc-lexer.l" |
2124 | |||
2125 | |||
2126 | |||
2127 | |||
2128 | /* | ||
2129 | * Stack of nested include file contexts. | ||
2130 | */ | ||
2131 | |||
2132 | struct incl_file { | ||
2133 | struct dtc_file *file; | ||
2134 | YY_BUFFER_STATE yy_prev_buf; | ||
2135 | int yy_prev_lineno; | ||
2136 | struct incl_file *prev; | ||
2137 | }; | ||
2138 | |||
2139 | static struct incl_file *incl_file_stack; | ||
2140 | 2000 | ||
2141 | 2001 | ||
2142 | /* | ||
2143 | * Detect infinite include recursion. | ||
2144 | */ | ||
2145 | #define MAX_INCLUDE_DEPTH (100) | ||
2146 | |||
2147 | static int incl_depth = 0; | ||
2148 | |||
2149 | 2002 | ||
2150 | static void push_input_file(const char *filename) | 2003 | static void push_input_file(const char *filename) |
2151 | { | 2004 | { |
2152 | struct incl_file *incl_file; | ||
2153 | struct dtc_file *newfile; | ||
2154 | struct search_path search, *searchptr = NULL; | ||
2155 | |||
2156 | assert(filename); | 2005 | assert(filename); |
2157 | 2006 | ||
2158 | if (incl_depth++ >= MAX_INCLUDE_DEPTH) | 2007 | srcfile_push(filename); |
2159 | die("Includes nested too deeply"); | ||
2160 | |||
2161 | if (srcpos_file) { | ||
2162 | search.dir = srcpos_file->dir; | ||
2163 | search.next = NULL; | ||
2164 | search.prev = NULL; | ||
2165 | searchptr = &search; | ||
2166 | } | ||
2167 | |||
2168 | newfile = dtc_open_file(filename, searchptr); | ||
2169 | 2008 | ||
2170 | incl_file = xmalloc(sizeof(struct incl_file)); | 2009 | yyin = current_srcfile->f; |
2171 | 2010 | ||
2172 | /* | 2011 | yypush_buffer_state(yy_create_buffer(yyin,YY_BUF_SIZE)); |
2173 | * Save current context. | ||
2174 | */ | ||
2175 | incl_file->yy_prev_buf = YY_CURRENT_BUFFER; | ||
2176 | incl_file->yy_prev_lineno = yylineno; | ||
2177 | incl_file->file = srcpos_file; | ||
2178 | incl_file->prev = incl_file_stack; | ||
2179 | |||
2180 | incl_file_stack = incl_file; | ||
2181 | |||
2182 | /* | ||
2183 | * Establish new context. | ||
2184 | */ | ||
2185 | srcpos_file = newfile; | ||
2186 | yylineno = 1; | ||
2187 | yyin = newfile->file; | ||
2188 | yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE)); | ||
2189 | } | 2012 | } |
2190 | 2013 | ||
2191 | 2014 | ||
2192 | static int pop_input_file(void) | 2015 | static int pop_input_file(void) |
2193 | { | 2016 | { |
2194 | struct incl_file *incl_file; | 2017 | if (srcfile_pop() == 0) |
2195 | |||
2196 | if (incl_file_stack == 0) | ||
2197 | return 0; | 2018 | return 0; |
2198 | 2019 | ||
2199 | dtc_close_file(srcpos_file); | 2020 | yypop_buffer_state(); |
2200 | 2021 | yyin = current_srcfile->f; | |
2201 | /* | ||
2202 | * Pop. | ||
2203 | */ | ||
2204 | --incl_depth; | ||
2205 | incl_file = incl_file_stack; | ||
2206 | incl_file_stack = incl_file->prev; | ||
2207 | |||
2208 | /* | ||
2209 | * Recover old context. | ||
2210 | */ | ||
2211 | yy_delete_buffer(YY_CURRENT_BUFFER); | ||
2212 | yy_switch_to_buffer(incl_file->yy_prev_buf); | ||
2213 | yylineno = incl_file->yy_prev_lineno; | ||
2214 | srcpos_file = incl_file->file; | ||
2215 | yyin = incl_file->file ? incl_file->file->file : NULL; | ||
2216 | |||
2217 | /* | ||
2218 | * Free old state. | ||
2219 | */ | ||
2220 | free(incl_file); | ||
2221 | 2022 | ||
2222 | return 1; | 2023 | return 1; |
2223 | } | 2024 | } |
diff --git a/scripts/dtc/dtc-parser.tab.c_shipped b/scripts/dtc/dtc-parser.tab.c_shipped index 27129377e5d..9be2eea18a3 100644 --- a/scripts/dtc/dtc-parser.tab.c_shipped +++ b/scripts/dtc/dtc-parser.tab.c_shipped | |||
@@ -1,24 +1,23 @@ | |||
1 | /* A Bison parser, made by GNU Bison 2.3. */ | ||
2 | 1 | ||
3 | /* Skeleton implementation for Bison's Yacc-like parsers in C | 2 | /* A Bison parser, made by GNU Bison 2.4.1. */ |
4 | 3 | ||
5 | Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | 4 | /* Skeleton implementation for Bison's Yacc-like parsers in C |
5 | |||
6 | Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | ||
6 | Free Software Foundation, Inc. | 7 | Free Software Foundation, Inc. |
7 | 8 | ||
8 | This program is free software; you can redistribute it and/or modify | 9 | This program is free software: you can redistribute it and/or modify |
9 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
10 | the Free Software Foundation; either version 2, or (at your option) | 11 | the Free Software Foundation, either version 3 of the License, or |
11 | any later version. | 12 | (at your option) any later version. |
12 | 13 | ||
13 | This program is distributed in the hope that it will be useful, | 14 | This program is distributed in the hope that it will be useful, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. | 17 | GNU General Public License for more details. |
17 | 18 | ||
18 | You should have received a copy of the GNU General Public License | 19 | You should have received a copy of the GNU General Public License |
19 | along with this program; if not, write to the Free Software | 20 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
20 | Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
21 | Boston, MA 02110-1301, USA. */ | ||
22 | 21 | ||
23 | /* As a special exception, you may create a larger work that contains | 22 | /* As a special exception, you may create a larger work that contains |
24 | part or all of the Bison parser skeleton and distribute that work | 23 | part or all of the Bison parser skeleton and distribute that work |
@@ -29,7 +28,7 @@ | |||
29 | special exception, which will cause the skeleton and the resulting | 28 | special exception, which will cause the skeleton and the resulting |
30 | Bison output files to be licensed under the GNU General Public | 29 | Bison output files to be licensed under the GNU General Public |
31 | License without this special exception. | 30 | License without this special exception. |
32 | 31 | ||
33 | This special exception was added by the Free Software Foundation in | 32 | This special exception was added by the Free Software Foundation in |
34 | version 2.2 of Bison. */ | 33 | version 2.2 of Bison. */ |
35 | 34 | ||
@@ -47,7 +46,7 @@ | |||
47 | #define YYBISON 1 | 46 | #define YYBISON 1 |
48 | 47 | ||
49 | /* Bison version. */ | 48 | /* Bison version. */ |
50 | #define YYBISON_VERSION "2.3" | 49 | #define YYBISON_VERSION "2.4.1" |
51 | 50 | ||
52 | /* Skeleton name. */ | 51 | /* Skeleton name. */ |
53 | #define YYSKELETON_NAME "yacc.c" | 52 | #define YYSKELETON_NAME "yacc.c" |
@@ -55,55 +54,32 @@ | |||
55 | /* Pure parsers. */ | 54 | /* Pure parsers. */ |
56 | #define YYPURE 0 | 55 | #define YYPURE 0 |
57 | 56 | ||
58 | /* Using locations. */ | 57 | /* Push parsers. */ |
59 | #define YYLSP_NEEDED 1 | 58 | #define YYPUSH 0 |
60 | |||
61 | 59 | ||
60 | /* Pull parsers. */ | ||
61 | #define YYPULL 1 | ||
62 | 62 | ||
63 | /* Tokens. */ | 63 | /* Using locations. */ |
64 | #ifndef YYTOKENTYPE | 64 | #define YYLSP_NEEDED 0 |
65 | # define YYTOKENTYPE | ||
66 | /* Put the tokens into the symbol table, so that GDB and other debuggers | ||
67 | know about them. */ | ||
68 | enum yytokentype { | ||
69 | DT_V1 = 258, | ||
70 | DT_MEMRESERVE = 259, | ||
71 | DT_PROPNODENAME = 260, | ||
72 | DT_LITERAL = 261, | ||
73 | DT_LEGACYLITERAL = 262, | ||
74 | DT_BASE = 263, | ||
75 | DT_BYTE = 264, | ||
76 | DT_STRING = 265, | ||
77 | DT_LABEL = 266, | ||
78 | DT_REF = 267, | ||
79 | DT_INCBIN = 268 | ||
80 | }; | ||
81 | #endif | ||
82 | /* Tokens. */ | ||
83 | #define DT_V1 258 | ||
84 | #define DT_MEMRESERVE 259 | ||
85 | #define DT_PROPNODENAME 260 | ||
86 | #define DT_LITERAL 261 | ||
87 | #define DT_LEGACYLITERAL 262 | ||
88 | #define DT_BASE 263 | ||
89 | #define DT_BYTE 264 | ||
90 | #define DT_STRING 265 | ||
91 | #define DT_LABEL 266 | ||
92 | #define DT_REF 267 | ||
93 | #define DT_INCBIN 268 | ||
94 | |||
95 | 65 | ||
96 | 66 | ||
97 | 67 | ||
98 | /* Copy the first part of user declarations. */ | 68 | /* Copy the first part of user declarations. */ |
99 | #line 23 "dtc-parser.y" | 69 | |
70 | /* Line 189 of yacc.c */ | ||
71 | #line 21 "dtc-parser.y" | ||
100 | 72 | ||
101 | #include <stdio.h> | 73 | #include <stdio.h> |
102 | 74 | ||
103 | #include "dtc.h" | 75 | #include "dtc.h" |
104 | #include "srcpos.h" | 76 | #include "srcpos.h" |
105 | 77 | ||
78 | YYLTYPE yylloc; | ||
79 | |||
106 | extern int yylex(void); | 80 | extern int yylex(void); |
81 | extern void print_error(char const *fmt, ...); | ||
82 | extern void yyerror(char const *s); | ||
107 | 83 | ||
108 | extern struct boot_info *the_boot_info; | 84 | extern struct boot_info *the_boot_info; |
109 | extern int treesource_error; | 85 | extern int treesource_error; |
@@ -111,6 +87,9 @@ extern int treesource_error; | |||
111 | static unsigned long long eval_literal(const char *s, int base, int bits); | 87 | static unsigned long long eval_literal(const char *s, int base, int bits); |
112 | 88 | ||
113 | 89 | ||
90 | /* Line 189 of yacc.c */ | ||
91 | #line 92 "dtc-parser.tab.c" | ||
92 | |||
114 | /* Enabling traces. */ | 93 | /* Enabling traces. */ |
115 | #ifndef YYDEBUG | 94 | #ifndef YYDEBUG |
116 | # define YYDEBUG 0 | 95 | # define YYDEBUG 0 |
@@ -129,10 +108,35 @@ static unsigned long long eval_literal(const char *s, int base, int bits); | |||
129 | # define YYTOKEN_TABLE 0 | 108 | # define YYTOKEN_TABLE 0 |
130 | #endif | 109 | #endif |
131 | 110 | ||
111 | |||
112 | /* Tokens. */ | ||
113 | #ifndef YYTOKENTYPE | ||
114 | # define YYTOKENTYPE | ||
115 | /* Put the tokens into the symbol table, so that GDB and other debuggers | ||
116 | know about them. */ | ||
117 | enum yytokentype { | ||
118 | DT_V1 = 258, | ||
119 | DT_MEMRESERVE = 259, | ||
120 | DT_PROPNODENAME = 260, | ||
121 | DT_LITERAL = 261, | ||
122 | DT_BASE = 262, | ||
123 | DT_BYTE = 263, | ||
124 | DT_STRING = 264, | ||
125 | DT_LABEL = 265, | ||
126 | DT_REF = 266, | ||
127 | DT_INCBIN = 267 | ||
128 | }; | ||
129 | #endif | ||
130 | |||
131 | |||
132 | |||
132 | #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED | 133 | #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED |
133 | typedef union YYSTYPE | 134 | typedef union YYSTYPE |
134 | #line 37 "dtc-parser.y" | ||
135 | { | 135 | { |
136 | |||
137 | /* Line 214 of yacc.c */ | ||
138 | #line 39 "dtc-parser.y" | ||
139 | |||
136 | char *propnodename; | 140 | char *propnodename; |
137 | char *literal; | 141 | char *literal; |
138 | char *labelref; | 142 | char *labelref; |
@@ -147,34 +151,23 @@ typedef union YYSTYPE | |||
147 | struct node *node; | 151 | struct node *node; |
148 | struct node *nodelist; | 152 | struct node *nodelist; |
149 | struct reserve_info *re; | 153 | struct reserve_info *re; |
150 | } | 154 | |
151 | /* Line 187 of yacc.c. */ | 155 | |
152 | #line 153 "dtc-parser.tab.c" | 156 | |
153 | YYSTYPE; | 157 | /* Line 214 of yacc.c */ |
158 | #line 159 "dtc-parser.tab.c" | ||
159 | } YYSTYPE; | ||
160 | # define YYSTYPE_IS_TRIVIAL 1 | ||
154 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ | 161 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ |
155 | # define YYSTYPE_IS_DECLARED 1 | 162 | # define YYSTYPE_IS_DECLARED 1 |
156 | # define YYSTYPE_IS_TRIVIAL 1 | ||
157 | #endif | ||
158 | |||
159 | #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED | ||
160 | typedef struct YYLTYPE | ||
161 | { | ||
162 | int first_line; | ||
163 | int first_column; | ||
164 | int last_line; | ||
165 | int last_column; | ||
166 | } YYLTYPE; | ||
167 | # define yyltype YYLTYPE /* obsolescent; will be withdrawn */ | ||
168 | # define YYLTYPE_IS_DECLARED 1 | ||
169 | # define YYLTYPE_IS_TRIVIAL 1 | ||
170 | #endif | 163 | #endif |
171 | 164 | ||
172 | 165 | ||
173 | /* Copy the second part of user declarations. */ | 166 | /* Copy the second part of user declarations. */ |
174 | 167 | ||
175 | 168 | ||
176 | /* Line 216 of yacc.c. */ | 169 | /* Line 264 of yacc.c */ |
177 | #line 178 "dtc-parser.tab.c" | 170 | #line 171 "dtc-parser.tab.c" |
178 | 171 | ||
179 | #ifdef short | 172 | #ifdef short |
180 | # undef short | 173 | # undef short |
@@ -249,14 +242,14 @@ typedef short int yytype_int16; | |||
249 | #if (defined __STDC__ || defined __C99__FUNC__ \ | 242 | #if (defined __STDC__ || defined __C99__FUNC__ \ |
250 | || defined __cplusplus || defined _MSC_VER) | 243 | || defined __cplusplus || defined _MSC_VER) |
251 | static int | 244 | static int |
252 | YYID (int i) | 245 | YYID (int yyi) |
253 | #else | 246 | #else |
254 | static int | 247 | static int |
255 | YYID (i) | 248 | YYID (yyi) |
256 | int i; | 249 | int yyi; |
257 | #endif | 250 | #endif |
258 | { | 251 | { |
259 | return i; | 252 | return yyi; |
260 | } | 253 | } |
261 | #endif | 254 | #endif |
262 | 255 | ||
@@ -332,15 +325,13 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ | |||
332 | 325 | ||
333 | #if (! defined yyoverflow \ | 326 | #if (! defined yyoverflow \ |
334 | && (! defined __cplusplus \ | 327 | && (! defined __cplusplus \ |
335 | || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ | 328 | || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) |
336 | && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) | ||
337 | 329 | ||
338 | /* A type that is properly aligned for any stack member. */ | 330 | /* A type that is properly aligned for any stack member. */ |
339 | union yyalloc | 331 | union yyalloc |
340 | { | 332 | { |
341 | yytype_int16 yyss; | 333 | yytype_int16 yyss_alloc; |
342 | YYSTYPE yyvs; | 334 | YYSTYPE yyvs_alloc; |
343 | YYLTYPE yyls; | ||
344 | }; | 335 | }; |
345 | 336 | ||
346 | /* The size of the maximum gap between one aligned stack and the next. */ | 337 | /* The size of the maximum gap between one aligned stack and the next. */ |
@@ -349,8 +340,8 @@ union yyalloc | |||
349 | /* The size of an array large to enough to hold all stacks, each with | 340 | /* The size of an array large to enough to hold all stacks, each with |
350 | N elements. */ | 341 | N elements. */ |
351 | # define YYSTACK_BYTES(N) \ | 342 | # define YYSTACK_BYTES(N) \ |
352 | ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ | 343 | ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ |
353 | + 2 * YYSTACK_GAP_MAXIMUM) | 344 | + YYSTACK_GAP_MAXIMUM) |
354 | 345 | ||
355 | /* Copy COUNT objects from FROM to TO. The source and destination do | 346 | /* Copy COUNT objects from FROM to TO. The source and destination do |
356 | not overlap. */ | 347 | not overlap. */ |
@@ -375,12 +366,12 @@ union yyalloc | |||
375 | elements in the stack, and YYPTR gives the new location of the | 366 | elements in the stack, and YYPTR gives the new location of the |
376 | stack. Advance YYPTR to a properly aligned location for the next | 367 | stack. Advance YYPTR to a properly aligned location for the next |
377 | stack. */ | 368 | stack. */ |
378 | # define YYSTACK_RELOCATE(Stack) \ | 369 | # define YYSTACK_RELOCATE(Stack_alloc, Stack) \ |
379 | do \ | 370 | do \ |
380 | { \ | 371 | { \ |
381 | YYSIZE_T yynewbytes; \ | 372 | YYSIZE_T yynewbytes; \ |
382 | YYCOPY (&yyptr->Stack, Stack, yysize); \ | 373 | YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ |
383 | Stack = &yyptr->Stack; \ | 374 | Stack = &yyptr->Stack_alloc; \ |
384 | yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ | 375 | yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ |
385 | yyptr += yynewbytes / sizeof (*yyptr); \ | 376 | yyptr += yynewbytes / sizeof (*yyptr); \ |
386 | } \ | 377 | } \ |
@@ -389,22 +380,22 @@ union yyalloc | |||
389 | #endif | 380 | #endif |
390 | 381 | ||
391 | /* YYFINAL -- State number of the termination state. */ | 382 | /* YYFINAL -- State number of the termination state. */ |
392 | #define YYFINAL 9 | 383 | #define YYFINAL 4 |
393 | /* YYLAST -- Last index in YYTABLE. */ | 384 | /* YYLAST -- Last index in YYTABLE. */ |
394 | #define YYLAST 73 | 385 | #define YYLAST 56 |
395 | 386 | ||
396 | /* YYNTOKENS -- Number of terminals. */ | 387 | /* YYNTOKENS -- Number of terminals. */ |
397 | #define YYNTOKENS 27 | 388 | #define YYNTOKENS 25 |
398 | /* YYNNTS -- Number of nonterminals. */ | 389 | /* YYNNTS -- Number of nonterminals. */ |
399 | #define YYNNTS 20 | 390 | #define YYNNTS 16 |
400 | /* YYNRULES -- Number of rules. */ | 391 | /* YYNRULES -- Number of rules. */ |
401 | #define YYNRULES 45 | 392 | #define YYNRULES 39 |
402 | /* YYNRULES -- Number of states. */ | 393 | /* YYNRULES -- Number of states. */ |
403 | #define YYNSTATES 76 | 394 | #define YYNSTATES 67 |
404 | 395 | ||
405 | /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ | 396 | /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ |
406 | #define YYUNDEFTOK 2 | 397 | #define YYUNDEFTOK 2 |
407 | #define YYMAXUTOK 268 | 398 | #define YYMAXUTOK 267 |
408 | 399 | ||
409 | #define YYTRANSLATE(YYX) \ | 400 | #define YYTRANSLATE(YYX) \ |
410 | ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) | 401 | ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) |
@@ -416,15 +407,15 @@ static const yytype_uint8 yytranslate[] = | |||
416 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 407 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
417 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 408 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
418 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 409 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
419 | 24, 26, 2, 2, 25, 15, 2, 16, 2, 2, | 410 | 22, 24, 2, 2, 23, 2, 2, 14, 2, 2, |
420 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 14, | 411 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 13, |
421 | 20, 19, 21, 2, 2, 2, 2, 2, 2, 2, | 412 | 18, 17, 19, 2, 2, 2, 2, 2, 2, 2, |
422 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 413 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
423 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 414 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
424 | 2, 22, 2, 23, 2, 2, 2, 2, 2, 2, | 415 | 2, 20, 2, 21, 2, 2, 2, 2, 2, 2, |
425 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 416 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
426 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 417 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
427 | 2, 2, 2, 17, 2, 18, 2, 2, 2, 2, | 418 | 2, 2, 2, 15, 2, 16, 2, 2, 2, 2, |
428 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 419 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
429 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 420 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
430 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 421 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
@@ -438,7 +429,7 @@ static const yytype_uint8 yytranslate[] = | |||
438 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 429 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
439 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 430 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
440 | 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, | 431 | 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, |
441 | 5, 6, 7, 8, 9, 10, 11, 12, 13 | 432 | 5, 6, 7, 8, 9, 10, 11, 12 |
442 | }; | 433 | }; |
443 | 434 | ||
444 | #if YYDEBUG | 435 | #if YYDEBUG |
@@ -446,41 +437,37 @@ static const yytype_uint8 yytranslate[] = | |||
446 | YYRHS. */ | 437 | YYRHS. */ |
447 | static const yytype_uint8 yyprhs[] = | 438 | static const yytype_uint8 yyprhs[] = |
448 | { | 439 | { |
449 | 0, 0, 3, 8, 11, 12, 15, 21, 22, 25, | 440 | 0, 0, 3, 8, 9, 12, 17, 20, 22, 25, |
450 | 27, 34, 36, 38, 41, 47, 48, 51, 57, 61, | 441 | 29, 33, 39, 40, 43, 48, 51, 54, 57, 62, |
451 | 64, 69, 74, 77, 87, 93, 96, 97, 100, 103, | 442 | 67, 70, 80, 86, 89, 90, 93, 96, 97, 100, |
452 | 104, 107, 110, 113, 114, 116, 118, 121, 122, 125, | 443 | 103, 106, 108, 109, 112, 115, 116, 119, 122, 125 |
453 | 128, 129, 132, 135, 139, 140 | ||
454 | }; | 444 | }; |
455 | 445 | ||
456 | /* YYRHS -- A `-1'-separated list of the rules' RHS. */ | 446 | /* YYRHS -- A `-1'-separated list of the rules' RHS. */ |
457 | static const yytype_int8 yyrhs[] = | 447 | static const yytype_int8 yyrhs[] = |
458 | { | 448 | { |
459 | 28, 0, -1, 3, 14, 29, 34, -1, 31, 34, | 449 | 26, 0, -1, 3, 13, 27, 30, -1, -1, 28, |
460 | -1, -1, 30, 29, -1, 46, 4, 33, 33, 14, | 450 | 27, -1, 4, 29, 29, 13, -1, 10, 28, -1, |
461 | -1, -1, 32, 31, -1, 30, -1, 46, 4, 33, | 451 | 6, -1, 14, 31, -1, 30, 14, 31, -1, 30, |
462 | 15, 33, 14, -1, 6, -1, 7, -1, 16, 35, | 452 | 11, 31, -1, 15, 32, 39, 16, 13, -1, -1, |
463 | -1, 17, 36, 44, 18, 14, -1, -1, 36, 37, | 453 | 32, 33, -1, 5, 17, 34, 13, -1, 5, 13, |
464 | -1, 46, 5, 19, 38, 14, -1, 46, 5, 14, | 454 | -1, 10, 33, -1, 35, 9, -1, 35, 18, 36, |
465 | -1, 39, 10, -1, 39, 20, 40, 21, -1, 39, | 455 | 19, -1, 35, 20, 38, 21, -1, 35, 11, -1, |
466 | 22, 43, 23, -1, 39, 12, -1, 39, 13, 24, | 456 | 35, 12, 22, 9, 23, 29, 23, 29, 24, -1, |
467 | 10, 25, 33, 25, 33, 26, -1, 39, 13, 24, | 457 | 35, 12, 22, 9, 24, -1, 34, 10, -1, -1, |
468 | 10, 26, -1, 38, 11, -1, -1, 38, 25, -1, | 458 | 34, 23, -1, 35, 10, -1, -1, 36, 37, -1, |
469 | 39, 11, -1, -1, 40, 42, -1, 40, 12, -1, | 459 | 36, 11, -1, 36, 10, -1, 6, -1, -1, 38, |
470 | 40, 11, -1, -1, 8, -1, 6, -1, 41, 7, | 460 | 8, -1, 38, 10, -1, -1, 40, 39, -1, 40, |
471 | -1, -1, 43, 9, -1, 43, 11, -1, -1, 45, | 461 | 33, -1, 5, 31, -1, 10, 40, -1 |
472 | 44, -1, 45, 37, -1, 46, 5, 35, -1, -1, | ||
473 | 11, -1 | ||
474 | }; | 462 | }; |
475 | 463 | ||
476 | /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ | 464 | /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ |
477 | static const yytype_uint16 yyrline[] = | 465 | static const yytype_uint16 yyrline[] = |
478 | { | 466 | { |
479 | 0, 89, 89, 93, 101, 104, 111, 119, 122, 129, | 467 | 0, 86, 86, 95, 98, 105, 109, 117, 124, 128, |
480 | 133, 140, 144, 151, 158, 166, 169, 176, 180, 187, | 468 | 132, 145, 153, 156, 163, 167, 171, 179, 183, 187, |
481 | 191, 195, 199, 203, 220, 231, 239, 242, 246, 254, | 469 | 191, 195, 212, 222, 230, 233, 237, 245, 248, 252, |
482 | 257, 261, 266, 274, 277, 281, 285, 293, 296, 300, | 470 | 257, 264, 272, 275, 279, 287, 290, 294, 302, 306 |
483 | 308, 311, 315, 323, 331, 334 | ||
484 | }; | 471 | }; |
485 | #endif | 472 | #endif |
486 | 473 | ||
@@ -490,13 +477,12 @@ static const yytype_uint16 yyrline[] = | |||
490 | static const char *const yytname[] = | 477 | static const char *const yytname[] = |
491 | { | 478 | { |
492 | "$end", "error", "$undefined", "DT_V1", "DT_MEMRESERVE", | 479 | "$end", "error", "$undefined", "DT_V1", "DT_MEMRESERVE", |
493 | "DT_PROPNODENAME", "DT_LITERAL", "DT_LEGACYLITERAL", "DT_BASE", | 480 | "DT_PROPNODENAME", "DT_LITERAL", "DT_BASE", "DT_BYTE", "DT_STRING", |
494 | "DT_BYTE", "DT_STRING", "DT_LABEL", "DT_REF", "DT_INCBIN", "';'", "'-'", | 481 | "DT_LABEL", "DT_REF", "DT_INCBIN", "';'", "'/'", "'{'", "'}'", "'='", |
495 | "'/'", "'{'", "'}'", "'='", "'<'", "'>'", "'['", "']'", "'('", "','", | 482 | "'<'", "'>'", "'['", "']'", "'('", "','", "')'", "$accept", "sourcefile", |
496 | "')'", "$accept", "sourcefile", "memreserves", "memreserve", | 483 | "memreserves", "memreserve", "addr", "devicetree", "nodedef", "proplist", |
497 | "v0_memreserves", "v0_memreserve", "addr", "devicetree", "nodedef", | 484 | "propdef", "propdata", "propdataprefix", "celllist", "cellval", |
498 | "proplist", "propdef", "propdata", "propdataprefix", "celllist", | 485 | "bytestring", "subnodes", "subnode", 0 |
499 | "cellbase", "cellval", "bytestring", "subnodes", "subnode", "label", 0 | ||
500 | }; | 486 | }; |
501 | #endif | 487 | #endif |
502 | 488 | ||
@@ -506,29 +492,27 @@ static const char *const yytname[] = | |||
506 | static const yytype_uint16 yytoknum[] = | 492 | static const yytype_uint16 yytoknum[] = |
507 | { | 493 | { |
508 | 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, | 494 | 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, |
509 | 265, 266, 267, 268, 59, 45, 47, 123, 125, 61, | 495 | 265, 266, 267, 59, 47, 123, 125, 61, 60, 62, |
510 | 60, 62, 91, 93, 40, 44, 41 | 496 | 91, 93, 40, 44, 41 |
511 | }; | 497 | }; |
512 | # endif | 498 | # endif |
513 | 499 | ||
514 | /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ | 500 | /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ |
515 | static const yytype_uint8 yyr1[] = | 501 | static const yytype_uint8 yyr1[] = |
516 | { | 502 | { |
517 | 0, 27, 28, 28, 29, 29, 30, 31, 31, 32, | 503 | 0, 25, 26, 27, 27, 28, 28, 29, 30, 30, |
518 | 32, 33, 33, 34, 35, 36, 36, 37, 37, 38, | 504 | 30, 31, 32, 32, 33, 33, 33, 34, 34, 34, |
519 | 38, 38, 38, 38, 38, 38, 39, 39, 39, 40, | 505 | 34, 34, 34, 34, 35, 35, 35, 36, 36, 36, |
520 | 40, 40, 40, 41, 41, 42, 42, 43, 43, 43, | 506 | 36, 37, 38, 38, 38, 39, 39, 39, 40, 40 |
521 | 44, 44, 44, 45, 46, 46 | ||
522 | }; | 507 | }; |
523 | 508 | ||
524 | /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ | 509 | /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ |
525 | static const yytype_uint8 yyr2[] = | 510 | static const yytype_uint8 yyr2[] = |
526 | { | 511 | { |
527 | 0, 2, 4, 2, 0, 2, 5, 0, 2, 1, | 512 | 0, 2, 4, 0, 2, 4, 2, 1, 2, 3, |
528 | 6, 1, 1, 2, 5, 0, 2, 5, 3, 2, | 513 | 3, 5, 0, 2, 4, 2, 2, 2, 4, 4, |
529 | 4, 4, 2, 9, 5, 2, 0, 2, 2, 0, | 514 | 2, 9, 5, 2, 0, 2, 2, 0, 2, 2, |
530 | 2, 2, 2, 0, 1, 1, 2, 0, 2, 2, | 515 | 2, 1, 0, 2, 2, 0, 2, 2, 2, 2 |
531 | 0, 2, 2, 3, 0, 1 | ||
532 | }; | 516 | }; |
533 | 517 | ||
534 | /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state | 518 | /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state |
@@ -536,86 +520,79 @@ static const yytype_uint8 yyr2[] = | |||
536 | means the default is an error. */ | 520 | means the default is an error. */ |
537 | static const yytype_uint8 yydefact[] = | 521 | static const yytype_uint8 yydefact[] = |
538 | { | 522 | { |
539 | 7, 0, 45, 0, 9, 0, 7, 0, 4, 1, | 523 | 0, 0, 0, 3, 1, 0, 0, 0, 3, 7, |
540 | 0, 3, 8, 0, 0, 4, 0, 15, 13, 11, | 524 | 0, 6, 0, 2, 4, 0, 12, 8, 0, 0, |
541 | 12, 0, 2, 5, 0, 40, 0, 0, 0, 16, | 525 | 5, 35, 10, 9, 0, 0, 13, 0, 35, 15, |
542 | 0, 40, 0, 0, 6, 0, 42, 41, 0, 10, | 526 | 24, 38, 16, 39, 0, 37, 36, 0, 0, 11, |
543 | 14, 18, 26, 43, 0, 0, 25, 17, 27, 19, | 527 | 23, 14, 25, 17, 26, 20, 0, 27, 32, 0, |
544 | 28, 22, 0, 29, 37, 0, 33, 0, 0, 35, | 528 | 0, 0, 0, 31, 30, 29, 18, 28, 33, 34, |
545 | 34, 32, 31, 20, 0, 30, 38, 39, 21, 0, | 529 | 19, 0, 22, 0, 0, 0, 21 |
546 | 24, 36, 0, 0, 0, 23 | ||
547 | }; | 530 | }; |
548 | 531 | ||
549 | /* YYDEFGOTO[NTERM-NUM]. */ | 532 | /* YYDEFGOTO[NTERM-NUM]. */ |
550 | static const yytype_int8 yydefgoto[] = | 533 | static const yytype_int8 yydefgoto[] = |
551 | { | 534 | { |
552 | -1, 3, 14, 4, 5, 6, 27, 11, 18, 25, | 535 | -1, 2, 7, 8, 10, 13, 17, 21, 26, 37, |
553 | 29, 44, 45, 56, 64, 65, 57, 30, 31, 7 | 536 | 38, 50, 57, 51, 27, 28 |
554 | }; | 537 | }; |
555 | 538 | ||
556 | /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing | 539 | /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing |
557 | STATE-NUM. */ | 540 | STATE-NUM. */ |
558 | #define YYPACT_NINF -14 | 541 | #define YYPACT_NINF -12 |
559 | static const yytype_int8 yypact[] = | 542 | static const yytype_int8 yypact[] = |
560 | { | 543 | { |
561 | 30, -11, -14, 7, -14, -1, 27, 13, 27, -14, | 544 | 10, -11, 18, -1, -12, 22, -1, 15, -1, -12, |
562 | 8, -14, -14, 40, -1, 27, 35, -14, -14, -14, | 545 | 22, -12, 20, 1, -12, 17, -12, -12, 20, 20, |
563 | -14, 21, -14, -14, 40, 24, 40, 28, 40, -14, | 546 | -12, 6, -12, -12, 21, 6, -12, 23, 6, -12, |
564 | 32, 24, 46, 38, -14, 39, -14, -14, 26, -14, | 547 | -12, -12, -12, -12, 28, -12, -12, -6, 13, -12, |
565 | -14, -14, -14, -14, -9, 10, -14, -14, -14, -14, | 548 | -12, -12, -12, -12, -12, -12, 24, -12, -12, 33, |
566 | -14, -14, 31, -14, -14, 44, -2, 3, 23, -14, | 549 | -5, 0, -4, -12, -12, -12, -12, -12, -12, -12, |
567 | -14, -14, -14, -14, 50, -14, -14, -14, -14, 40, | 550 | -12, 22, -12, 25, 22, 19, -12 |
568 | -14, -14, 33, 40, 36, -14 | ||
569 | }; | 551 | }; |
570 | 552 | ||
571 | /* YYPGOTO[NTERM-NUM]. */ | 553 | /* YYPGOTO[NTERM-NUM]. */ |
572 | static const yytype_int8 yypgoto[] = | 554 | static const yytype_int8 yypgoto[] = |
573 | { | 555 | { |
574 | -14, -14, 48, 29, 53, -14, -13, 47, 34, -14, | 556 | -12, -12, 36, 39, -10, -12, 8, -12, 12, -12, |
575 | 37, -14, -14, -14, -14, -14, -14, 42, -14, -7 | 557 | -12, -12, -12, -12, 27, 31 |
576 | }; | 558 | }; |
577 | 559 | ||
578 | /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If | 560 | /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If |
579 | positive, shift that token. If negative, reduce the rule which | 561 | positive, shift that token. If negative, reduce the rule which |
580 | number is the opposite. If zero, do what YYDEFACT says. | 562 | number is the opposite. If zero, do what YYDEFACT says. |
581 | If YYTABLE_NINF, syntax error. */ | 563 | If YYTABLE_NINF, syntax error. */ |
582 | #define YYTABLE_NINF -45 | 564 | #define YYTABLE_NINF -1 |
583 | static const yytype_int8 yytable[] = | 565 | static const yytype_uint8 yytable[] = |
584 | { | 566 | { |
585 | 21, 16, 46, 8, 59, 47, 60, 9, 16, 61, | 567 | 15, 53, 3, 5, 40, 54, 55, 41, 58, 6, |
586 | 62, 28, 66, 33, 67, 10, 48, 13, 32, 63, | 568 | 59, 24, 18, 1, 56, 19, 25, 42, 4, 61, |
587 | 49, 50, 51, 52, 32, 17, 68, 19, 20, -44, | 569 | 62, 60, 43, 44, 45, 46, 22, 23, 9, 12, |
588 | 53, -44, 54, 1, -44, 2, 26, 15, 2, 24, | 570 | 20, 47, 31, 48, 29, 16, 16, 32, 30, 34, |
589 | 41, 2, 34, 17, 15, 42, 19, 20, 69, 70, | 571 | 35, 39, 52, 66, 14, 11, 49, 0, 64, 0, |
590 | 35, 38, 39, 40, 58, 55, 72, 71, 73, 12, | 572 | 0, 63, 0, 0, 65, 36, 33 |
591 | 74, 22, 75, 23, 0, 0, 0, 0, 36, 0, | ||
592 | 0, 0, 43, 37 | ||
593 | }; | 573 | }; |
594 | 574 | ||
595 | static const yytype_int8 yycheck[] = | 575 | static const yytype_int8 yycheck[] = |
596 | { | 576 | { |
597 | 13, 8, 11, 14, 6, 14, 8, 0, 15, 11, | 577 | 10, 6, 13, 4, 10, 10, 11, 13, 8, 10, |
598 | 12, 24, 9, 26, 11, 16, 25, 4, 25, 21, | 578 | 10, 5, 11, 3, 19, 14, 10, 23, 0, 23, |
599 | 10, 11, 12, 13, 31, 17, 23, 6, 7, 5, | 579 | 24, 21, 9, 10, 11, 12, 18, 19, 6, 14, |
600 | 20, 4, 22, 3, 4, 11, 15, 8, 11, 4, | 580 | 13, 18, 24, 20, 13, 15, 15, 25, 17, 16, |
601 | 14, 11, 14, 17, 15, 19, 6, 7, 25, 26, | 581 | 28, 13, 9, 24, 8, 6, 22, -1, 23, -1, |
602 | 18, 5, 14, 14, 10, 24, 69, 7, 25, 6, | 582 | -1, 61, -1, -1, 64, 28, 25 |
603 | 73, 14, 26, 15, -1, -1, -1, -1, 31, -1, | ||
604 | -1, -1, 38, 31 | ||
605 | }; | 583 | }; |
606 | 584 | ||
607 | /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing | 585 | /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing |
608 | symbol of state STATE-NUM. */ | 586 | symbol of state STATE-NUM. */ |
609 | static const yytype_uint8 yystos[] = | 587 | static const yytype_uint8 yystos[] = |
610 | { | 588 | { |
611 | 0, 3, 11, 28, 30, 31, 32, 46, 14, 0, | 589 | 0, 3, 26, 13, 0, 4, 10, 27, 28, 6, |
612 | 16, 34, 31, 4, 29, 30, 46, 17, 35, 6, | 590 | 29, 28, 14, 30, 27, 29, 15, 31, 11, 14, |
613 | 7, 33, 34, 29, 4, 36, 15, 33, 33, 37, | 591 | 13, 32, 31, 31, 5, 10, 33, 39, 40, 13, |
614 | 44, 45, 46, 33, 14, 18, 37, 44, 5, 14, | 592 | 17, 31, 33, 40, 16, 33, 39, 34, 35, 13, |
615 | 14, 14, 19, 35, 38, 39, 11, 14, 25, 10, | 593 | 10, 13, 23, 9, 10, 11, 12, 18, 20, 22, |
616 | 11, 12, 13, 20, 22, 24, 40, 43, 10, 6, | 594 | 36, 38, 9, 6, 10, 11, 19, 37, 8, 10, |
617 | 8, 11, 12, 21, 41, 42, 9, 11, 23, 25, | 595 | 21, 23, 24, 29, 23, 29, 24 |
618 | 26, 7, 33, 25, 33, 26 | ||
619 | }; | 596 | }; |
620 | 597 | ||
621 | #define yyerrok (yyerrstatus = 0) | 598 | #define yyerrok (yyerrstatus = 0) |
@@ -728,7 +705,7 @@ do { \ | |||
728 | { \ | 705 | { \ |
729 | YYFPRINTF (stderr, "%s ", Title); \ | 706 | YYFPRINTF (stderr, "%s ", Title); \ |
730 | yy_symbol_print (stderr, \ | 707 | yy_symbol_print (stderr, \ |
731 | Type, Value, Location); \ | 708 | Type, Value); \ |
732 | YYFPRINTF (stderr, "\n"); \ | 709 | YYFPRINTF (stderr, "\n"); \ |
733 | } \ | 710 | } \ |
734 | } while (YYID (0)) | 711 | } while (YYID (0)) |
@@ -742,19 +719,17 @@ do { \ | |||
742 | #if (defined __STDC__ || defined __C99__FUNC__ \ | 719 | #if (defined __STDC__ || defined __C99__FUNC__ \ |
743 | || defined __cplusplus || defined _MSC_VER) | 720 | || defined __cplusplus || defined _MSC_VER) |
744 | static void | 721 | static void |
745 | yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) | 722 | yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) |
746 | #else | 723 | #else |
747 | static void | 724 | static void |
748 | yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) | 725 | yy_symbol_value_print (yyoutput, yytype, yyvaluep) |
749 | FILE *yyoutput; | 726 | FILE *yyoutput; |
750 | int yytype; | 727 | int yytype; |
751 | YYSTYPE const * const yyvaluep; | 728 | YYSTYPE const * const yyvaluep; |
752 | YYLTYPE const * const yylocationp; | ||
753 | #endif | 729 | #endif |
754 | { | 730 | { |
755 | if (!yyvaluep) | 731 | if (!yyvaluep) |
756 | return; | 732 | return; |
757 | YYUSE (yylocationp); | ||
758 | # ifdef YYPRINT | 733 | # ifdef YYPRINT |
759 | if (yytype < YYNTOKENS) | 734 | if (yytype < YYNTOKENS) |
760 | YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); | 735 | YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); |
@@ -776,14 +751,13 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) | |||
776 | #if (defined __STDC__ || defined __C99__FUNC__ \ | 751 | #if (defined __STDC__ || defined __C99__FUNC__ \ |
777 | || defined __cplusplus || defined _MSC_VER) | 752 | || defined __cplusplus || defined _MSC_VER) |
778 | static void | 753 | static void |
779 | yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) | 754 | yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) |
780 | #else | 755 | #else |
781 | static void | 756 | static void |
782 | yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) | 757 | yy_symbol_print (yyoutput, yytype, yyvaluep) |
783 | FILE *yyoutput; | 758 | FILE *yyoutput; |
784 | int yytype; | 759 | int yytype; |
785 | YYSTYPE const * const yyvaluep; | 760 | YYSTYPE const * const yyvaluep; |
786 | YYLTYPE const * const yylocationp; | ||
787 | #endif | 761 | #endif |
788 | { | 762 | { |
789 | if (yytype < YYNTOKENS) | 763 | if (yytype < YYNTOKENS) |
@@ -791,9 +765,7 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) | |||
791 | else | 765 | else |
792 | YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); | 766 | YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); |
793 | 767 | ||
794 | YY_LOCATION_PRINT (yyoutput, *yylocationp); | 768 | yy_symbol_value_print (yyoutput, yytype, yyvaluep); |
795 | YYFPRINTF (yyoutput, ": "); | ||
796 | yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp); | ||
797 | YYFPRINTF (yyoutput, ")"); | 769 | YYFPRINTF (yyoutput, ")"); |
798 | } | 770 | } |
799 | 771 | ||
@@ -805,17 +777,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) | |||
805 | #if (defined __STDC__ || defined __C99__FUNC__ \ | 777 | #if (defined __STDC__ || defined __C99__FUNC__ \ |
806 | || defined __cplusplus || defined _MSC_VER) | 778 | || defined __cplusplus || defined _MSC_VER) |
807 | static void | 779 | static void |
808 | yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) | 780 | yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) |
809 | #else | 781 | #else |
810 | static void | 782 | static void |
811 | yy_stack_print (bottom, top) | 783 | yy_stack_print (yybottom, yytop) |
812 | yytype_int16 *bottom; | 784 | yytype_int16 *yybottom; |
813 | yytype_int16 *top; | 785 | yytype_int16 *yytop; |
814 | #endif | 786 | #endif |
815 | { | 787 | { |
816 | YYFPRINTF (stderr, "Stack now"); | 788 | YYFPRINTF (stderr, "Stack now"); |
817 | for (; bottom <= top; ++bottom) | 789 | for (; yybottom <= yytop; yybottom++) |
818 | YYFPRINTF (stderr, " %d", *bottom); | 790 | { |
791 | int yybot = *yybottom; | ||
792 | YYFPRINTF (stderr, " %d", yybot); | ||
793 | } | ||
819 | YYFPRINTF (stderr, "\n"); | 794 | YYFPRINTF (stderr, "\n"); |
820 | } | 795 | } |
821 | 796 | ||
@@ -833,12 +808,11 @@ do { \ | |||
833 | #if (defined __STDC__ || defined __C99__FUNC__ \ | 808 | #if (defined __STDC__ || defined __C99__FUNC__ \ |
834 | || defined __cplusplus || defined _MSC_VER) | 809 | || defined __cplusplus || defined _MSC_VER) |
835 | static void | 810 | static void |
836 | yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule) | 811 | yy_reduce_print (YYSTYPE *yyvsp, int yyrule) |
837 | #else | 812 | #else |
838 | static void | 813 | static void |
839 | yy_reduce_print (yyvsp, yylsp, yyrule) | 814 | yy_reduce_print (yyvsp, yyrule) |
840 | YYSTYPE *yyvsp; | 815 | YYSTYPE *yyvsp; |
841 | YYLTYPE *yylsp; | ||
842 | int yyrule; | 816 | int yyrule; |
843 | #endif | 817 | #endif |
844 | { | 818 | { |
@@ -850,18 +824,18 @@ yy_reduce_print (yyvsp, yylsp, yyrule) | |||
850 | /* The symbols being reduced. */ | 824 | /* The symbols being reduced. */ |
851 | for (yyi = 0; yyi < yynrhs; yyi++) | 825 | for (yyi = 0; yyi < yynrhs; yyi++) |
852 | { | 826 | { |
853 | fprintf (stderr, " $%d = ", yyi + 1); | 827 | YYFPRINTF (stderr, " $%d = ", yyi + 1); |
854 | yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], | 828 | yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], |
855 | &(yyvsp[(yyi + 1) - (yynrhs)]) | 829 | &(yyvsp[(yyi + 1) - (yynrhs)]) |
856 | , &(yylsp[(yyi + 1) - (yynrhs)]) ); | 830 | ); |
857 | fprintf (stderr, "\n"); | 831 | YYFPRINTF (stderr, "\n"); |
858 | } | 832 | } |
859 | } | 833 | } |
860 | 834 | ||
861 | # define YY_REDUCE_PRINT(Rule) \ | 835 | # define YY_REDUCE_PRINT(Rule) \ |
862 | do { \ | 836 | do { \ |
863 | if (yydebug) \ | 837 | if (yydebug) \ |
864 | yy_reduce_print (yyvsp, yylsp, Rule); \ | 838 | yy_reduce_print (yyvsp, Rule); \ |
865 | } while (YYID (0)) | 839 | } while (YYID (0)) |
866 | 840 | ||
867 | /* Nonzero means print parse trace. It is left uninitialized so that | 841 | /* Nonzero means print parse trace. It is left uninitialized so that |
@@ -1112,18 +1086,16 @@ yysyntax_error (char *yyresult, int yystate, int yychar) | |||
1112 | #if (defined __STDC__ || defined __C99__FUNC__ \ | 1086 | #if (defined __STDC__ || defined __C99__FUNC__ \ |
1113 | || defined __cplusplus || defined _MSC_VER) | 1087 | || defined __cplusplus || defined _MSC_VER) |
1114 | static void | 1088 | static void |
1115 | yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) | 1089 | yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) |
1116 | #else | 1090 | #else |
1117 | static void | 1091 | static void |
1118 | yydestruct (yymsg, yytype, yyvaluep, yylocationp) | 1092 | yydestruct (yymsg, yytype, yyvaluep) |
1119 | const char *yymsg; | 1093 | const char *yymsg; |
1120 | int yytype; | 1094 | int yytype; |
1121 | YYSTYPE *yyvaluep; | 1095 | YYSTYPE *yyvaluep; |
1122 | YYLTYPE *yylocationp; | ||
1123 | #endif | 1096 | #endif |
1124 | { | 1097 | { |
1125 | YYUSE (yyvaluep); | 1098 | YYUSE (yyvaluep); |
1126 | YYUSE (yylocationp); | ||
1127 | 1099 | ||
1128 | if (!yymsg) | 1100 | if (!yymsg) |
1129 | yymsg = "Deleting"; | 1101 | yymsg = "Deleting"; |
@@ -1136,10 +1108,8 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) | |||
1136 | break; | 1108 | break; |
1137 | } | 1109 | } |
1138 | } | 1110 | } |
1139 | |||
1140 | 1111 | ||
1141 | /* Prevent warnings from -Wmissing-prototypes. */ | 1112 | /* Prevent warnings from -Wmissing-prototypes. */ |
1142 | |||
1143 | #ifdef YYPARSE_PARAM | 1113 | #ifdef YYPARSE_PARAM |
1144 | #if defined __STDC__ || defined __cplusplus | 1114 | #if defined __STDC__ || defined __cplusplus |
1145 | int yyparse (void *YYPARSE_PARAM); | 1115 | int yyparse (void *YYPARSE_PARAM); |
@@ -1155,23 +1125,20 @@ int yyparse (); | |||
1155 | #endif /* ! YYPARSE_PARAM */ | 1125 | #endif /* ! YYPARSE_PARAM */ |
1156 | 1126 | ||
1157 | 1127 | ||
1158 | 1128 | /* The lookahead symbol. */ | |
1159 | /* The look-ahead symbol. */ | ||
1160 | int yychar; | 1129 | int yychar; |
1161 | 1130 | ||
1162 | /* The semantic value of the look-ahead symbol. */ | 1131 | /* The semantic value of the lookahead symbol. */ |
1163 | YYSTYPE yylval; | 1132 | YYSTYPE yylval; |
1164 | 1133 | ||
1165 | /* Number of syntax errors so far. */ | 1134 | /* Number of syntax errors so far. */ |
1166 | int yynerrs; | 1135 | int yynerrs; |
1167 | /* Location data for the look-ahead symbol. */ | ||
1168 | YYLTYPE yylloc; | ||
1169 | 1136 | ||
1170 | 1137 | ||
1171 | 1138 | ||
1172 | /*----------. | 1139 | /*-------------------------. |
1173 | | yyparse. | | 1140 | | yyparse or yypush_parse. | |
1174 | `----------*/ | 1141 | `-------------------------*/ |
1175 | 1142 | ||
1176 | #ifdef YYPARSE_PARAM | 1143 | #ifdef YYPARSE_PARAM |
1177 | #if (defined __STDC__ || defined __C99__FUNC__ \ | 1144 | #if (defined __STDC__ || defined __C99__FUNC__ \ |
@@ -1195,79 +1162,70 @@ yyparse () | |||
1195 | #endif | 1162 | #endif |
1196 | #endif | 1163 | #endif |
1197 | { | 1164 | { |
1198 | |||
1199 | int yystate; | ||
1200 | int yyn; | ||
1201 | int yyresult; | ||
1202 | /* Number of tokens to shift before error messages enabled. */ | ||
1203 | int yyerrstatus; | ||
1204 | /* Look-ahead token as an internal (translated) token number. */ | ||
1205 | int yytoken = 0; | ||
1206 | #if YYERROR_VERBOSE | ||
1207 | /* Buffer for error messages, and its allocated size. */ | ||
1208 | char yymsgbuf[128]; | ||
1209 | char *yymsg = yymsgbuf; | ||
1210 | YYSIZE_T yymsg_alloc = sizeof yymsgbuf; | ||
1211 | #endif | ||
1212 | 1165 | ||
1213 | /* Three stacks and their tools: | ||
1214 | `yyss': related to states, | ||
1215 | `yyvs': related to semantic values, | ||
1216 | `yyls': related to locations. | ||
1217 | 1166 | ||
1218 | Refer to the stacks thru separate pointers, to allow yyoverflow | 1167 | int yystate; |
1219 | to reallocate them elsewhere. */ | 1168 | /* Number of tokens to shift before error messages enabled. */ |
1169 | int yyerrstatus; | ||
1220 | 1170 | ||
1221 | /* The state stack. */ | 1171 | /* The stacks and their tools: |
1222 | yytype_int16 yyssa[YYINITDEPTH]; | 1172 | `yyss': related to states. |
1223 | yytype_int16 *yyss = yyssa; | 1173 | `yyvs': related to semantic values. |
1224 | yytype_int16 *yyssp; | ||
1225 | 1174 | ||
1226 | /* The semantic value stack. */ | 1175 | Refer to the stacks thru separate pointers, to allow yyoverflow |
1227 | YYSTYPE yyvsa[YYINITDEPTH]; | 1176 | to reallocate them elsewhere. */ |
1228 | YYSTYPE *yyvs = yyvsa; | ||
1229 | YYSTYPE *yyvsp; | ||
1230 | 1177 | ||
1231 | /* The location stack. */ | 1178 | /* The state stack. */ |
1232 | YYLTYPE yylsa[YYINITDEPTH]; | 1179 | yytype_int16 yyssa[YYINITDEPTH]; |
1233 | YYLTYPE *yyls = yylsa; | 1180 | yytype_int16 *yyss; |
1234 | YYLTYPE *yylsp; | 1181 | yytype_int16 *yyssp; |
1235 | /* The locations where the error started and ended. */ | ||
1236 | YYLTYPE yyerror_range[2]; | ||
1237 | 1182 | ||
1238 | #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) | 1183 | /* The semantic value stack. */ |
1184 | YYSTYPE yyvsa[YYINITDEPTH]; | ||
1185 | YYSTYPE *yyvs; | ||
1186 | YYSTYPE *yyvsp; | ||
1239 | 1187 | ||
1240 | YYSIZE_T yystacksize = YYINITDEPTH; | 1188 | YYSIZE_T yystacksize; |
1241 | 1189 | ||
1190 | int yyn; | ||
1191 | int yyresult; | ||
1192 | /* Lookahead token as an internal (translated) token number. */ | ||
1193 | int yytoken; | ||
1242 | /* The variables used to return semantic value and location from the | 1194 | /* The variables used to return semantic value and location from the |
1243 | action routines. */ | 1195 | action routines. */ |
1244 | YYSTYPE yyval; | 1196 | YYSTYPE yyval; |
1245 | YYLTYPE yyloc; | 1197 | |
1198 | #if YYERROR_VERBOSE | ||
1199 | /* Buffer for error messages, and its allocated size. */ | ||
1200 | char yymsgbuf[128]; | ||
1201 | char *yymsg = yymsgbuf; | ||
1202 | YYSIZE_T yymsg_alloc = sizeof yymsgbuf; | ||
1203 | #endif | ||
1204 | |||
1205 | #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) | ||
1246 | 1206 | ||
1247 | /* The number of symbols on the RHS of the reduced rule. | 1207 | /* The number of symbols on the RHS of the reduced rule. |
1248 | Keep to zero when no symbol should be popped. */ | 1208 | Keep to zero when no symbol should be popped. */ |
1249 | int yylen = 0; | 1209 | int yylen = 0; |
1250 | 1210 | ||
1211 | yytoken = 0; | ||
1212 | yyss = yyssa; | ||
1213 | yyvs = yyvsa; | ||
1214 | yystacksize = YYINITDEPTH; | ||
1215 | |||
1251 | YYDPRINTF ((stderr, "Starting parse\n")); | 1216 | YYDPRINTF ((stderr, "Starting parse\n")); |
1252 | 1217 | ||
1253 | yystate = 0; | 1218 | yystate = 0; |
1254 | yyerrstatus = 0; | 1219 | yyerrstatus = 0; |
1255 | yynerrs = 0; | 1220 | yynerrs = 0; |
1256 | yychar = YYEMPTY; /* Cause a token to be read. */ | 1221 | yychar = YYEMPTY; /* Cause a token to be read. */ |
1257 | 1222 | ||
1258 | /* Initialize stack pointers. | 1223 | /* Initialize stack pointers. |
1259 | Waste one element of value and location stack | 1224 | Waste one element of value and location stack |
1260 | so that they stay on the same level as the state stack. | 1225 | so that they stay on the same level as the state stack. |
1261 | The wasted elements are never initialized. */ | 1226 | The wasted elements are never initialized. */ |
1262 | |||
1263 | yyssp = yyss; | 1227 | yyssp = yyss; |
1264 | yyvsp = yyvs; | 1228 | yyvsp = yyvs; |
1265 | yylsp = yyls; | ||
1266 | #if YYLTYPE_IS_TRIVIAL | ||
1267 | /* Initialize the default location before parsing starts. */ | ||
1268 | yylloc.first_line = yylloc.last_line = 1; | ||
1269 | yylloc.first_column = yylloc.last_column = 0; | ||
1270 | #endif | ||
1271 | 1229 | ||
1272 | goto yysetstate; | 1230 | goto yysetstate; |
1273 | 1231 | ||
@@ -1294,7 +1252,6 @@ yyparse () | |||
1294 | memory. */ | 1252 | memory. */ |
1295 | YYSTYPE *yyvs1 = yyvs; | 1253 | YYSTYPE *yyvs1 = yyvs; |
1296 | yytype_int16 *yyss1 = yyss; | 1254 | yytype_int16 *yyss1 = yyss; |
1297 | YYLTYPE *yyls1 = yyls; | ||
1298 | 1255 | ||
1299 | /* Each stack pointer address is followed by the size of the | 1256 | /* Each stack pointer address is followed by the size of the |
1300 | data in use in that stack, in bytes. This used to be a | 1257 | data in use in that stack, in bytes. This used to be a |
@@ -1303,9 +1260,8 @@ yyparse () | |||
1303 | yyoverflow (YY_("memory exhausted"), | 1260 | yyoverflow (YY_("memory exhausted"), |
1304 | &yyss1, yysize * sizeof (*yyssp), | 1261 | &yyss1, yysize * sizeof (*yyssp), |
1305 | &yyvs1, yysize * sizeof (*yyvsp), | 1262 | &yyvs1, yysize * sizeof (*yyvsp), |
1306 | &yyls1, yysize * sizeof (*yylsp), | ||
1307 | &yystacksize); | 1263 | &yystacksize); |
1308 | yyls = yyls1; | 1264 | |
1309 | yyss = yyss1; | 1265 | yyss = yyss1; |
1310 | yyvs = yyvs1; | 1266 | yyvs = yyvs1; |
1311 | } | 1267 | } |
@@ -1326,9 +1282,8 @@ yyparse () | |||
1326 | (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); | 1282 | (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); |
1327 | if (! yyptr) | 1283 | if (! yyptr) |
1328 | goto yyexhaustedlab; | 1284 | goto yyexhaustedlab; |
1329 | YYSTACK_RELOCATE (yyss); | 1285 | YYSTACK_RELOCATE (yyss_alloc, yyss); |
1330 | YYSTACK_RELOCATE (yyvs); | 1286 | YYSTACK_RELOCATE (yyvs_alloc, yyvs); |
1331 | YYSTACK_RELOCATE (yyls); | ||
1332 | # undef YYSTACK_RELOCATE | 1287 | # undef YYSTACK_RELOCATE |
1333 | if (yyss1 != yyssa) | 1288 | if (yyss1 != yyssa) |
1334 | YYSTACK_FREE (yyss1); | 1289 | YYSTACK_FREE (yyss1); |
@@ -1338,7 +1293,6 @@ yyparse () | |||
1338 | 1293 | ||
1339 | yyssp = yyss + yysize - 1; | 1294 | yyssp = yyss + yysize - 1; |
1340 | yyvsp = yyvs + yysize - 1; | 1295 | yyvsp = yyvs + yysize - 1; |
1341 | yylsp = yyls + yysize - 1; | ||
1342 | 1296 | ||
1343 | YYDPRINTF ((stderr, "Stack size increased to %lu\n", | 1297 | YYDPRINTF ((stderr, "Stack size increased to %lu\n", |
1344 | (unsigned long int) yystacksize)); | 1298 | (unsigned long int) yystacksize)); |
@@ -1349,6 +1303,9 @@ yyparse () | |||
1349 | 1303 | ||
1350 | YYDPRINTF ((stderr, "Entering state %d\n", yystate)); | 1304 | YYDPRINTF ((stderr, "Entering state %d\n", yystate)); |
1351 | 1305 | ||
1306 | if (yystate == YYFINAL) | ||
1307 | YYACCEPT; | ||
1308 | |||
1352 | goto yybackup; | 1309 | goto yybackup; |
1353 | 1310 | ||
1354 | /*-----------. | 1311 | /*-----------. |
@@ -1357,16 +1314,16 @@ yyparse () | |||
1357 | yybackup: | 1314 | yybackup: |
1358 | 1315 | ||
1359 | /* Do appropriate processing given the current state. Read a | 1316 | /* Do appropriate processing given the current state. Read a |
1360 | look-ahead token if we need one and don't already have one. */ | 1317 | lookahead token if we need one and don't already have one. */ |
1361 | 1318 | ||
1362 | /* First try to decide what to do without reference to look-ahead token. */ | 1319 | /* First try to decide what to do without reference to lookahead token. */ |
1363 | yyn = yypact[yystate]; | 1320 | yyn = yypact[yystate]; |
1364 | if (yyn == YYPACT_NINF) | 1321 | if (yyn == YYPACT_NINF) |
1365 | goto yydefault; | 1322 | goto yydefault; |
1366 | 1323 | ||
1367 | /* Not known => get a look-ahead token if don't already have one. */ | 1324 | /* Not known => get a lookahead token if don't already have one. */ |
1368 | 1325 | ||
1369 | /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ | 1326 | /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ |
1370 | if (yychar == YYEMPTY) | 1327 | if (yychar == YYEMPTY) |
1371 | { | 1328 | { |
1372 | YYDPRINTF ((stderr, "Reading a token: ")); | 1329 | YYDPRINTF ((stderr, "Reading a token: ")); |
@@ -1398,24 +1355,20 @@ yybackup: | |||
1398 | goto yyreduce; | 1355 | goto yyreduce; |
1399 | } | 1356 | } |
1400 | 1357 | ||
1401 | if (yyn == YYFINAL) | ||
1402 | YYACCEPT; | ||
1403 | |||
1404 | /* Count tokens shifted since error; after three, turn off error | 1358 | /* Count tokens shifted since error; after three, turn off error |
1405 | status. */ | 1359 | status. */ |
1406 | if (yyerrstatus) | 1360 | if (yyerrstatus) |
1407 | yyerrstatus--; | 1361 | yyerrstatus--; |
1408 | 1362 | ||
1409 | /* Shift the look-ahead token. */ | 1363 | /* Shift the lookahead token. */ |
1410 | YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); | 1364 | YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); |
1411 | 1365 | ||
1412 | /* Discard the shifted token unless it is eof. */ | 1366 | /* Discard the shifted token. */ |
1413 | if (yychar != YYEOF) | 1367 | yychar = YYEMPTY; |
1414 | yychar = YYEMPTY; | ||
1415 | 1368 | ||
1416 | yystate = yyn; | 1369 | yystate = yyn; |
1417 | *++yyvsp = yylval; | 1370 | *++yyvsp = yylval; |
1418 | *++yylsp = yylloc; | 1371 | |
1419 | goto yynewstate; | 1372 | goto yynewstate; |
1420 | 1373 | ||
1421 | 1374 | ||
@@ -1446,337 +1399,387 @@ yyreduce: | |||
1446 | GCC warning that YYVAL may be used uninitialized. */ | 1399 | GCC warning that YYVAL may be used uninitialized. */ |
1447 | yyval = yyvsp[1-yylen]; | 1400 | yyval = yyvsp[1-yylen]; |
1448 | 1401 | ||
1449 | /* Default location. */ | 1402 | |
1450 | YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); | ||
1451 | YY_REDUCE_PRINT (yyn); | 1403 | YY_REDUCE_PRINT (yyn); |
1452 | switch (yyn) | 1404 | switch (yyn) |
1453 | { | 1405 | { |
1454 | case 2: | 1406 | case 2: |
1455 | #line 90 "dtc-parser.y" | 1407 | |
1408 | /* Line 1455 of yacc.c */ | ||
1409 | #line 87 "dtc-parser.y" | ||
1456 | { | 1410 | { |
1457 | the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node), 0); | 1411 | the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node), |
1412 | guess_boot_cpuid((yyvsp[(4) - (4)].node))); | ||
1458 | ;} | 1413 | ;} |
1459 | break; | 1414 | break; |
1460 | 1415 | ||
1461 | case 3: | 1416 | case 3: |
1462 | #line 94 "dtc-parser.y" | 1417 | |
1418 | /* Line 1455 of yacc.c */ | ||
1419 | #line 95 "dtc-parser.y" | ||
1463 | { | 1420 | { |
1464 | the_boot_info = build_boot_info((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].node), 0); | 1421 | (yyval.re) = NULL; |
1465 | ;} | 1422 | ;} |
1466 | break; | 1423 | break; |
1467 | 1424 | ||
1468 | case 4: | 1425 | case 4: |
1469 | #line 101 "dtc-parser.y" | 1426 | |
1427 | /* Line 1455 of yacc.c */ | ||
1428 | #line 99 "dtc-parser.y" | ||
1470 | { | 1429 | { |
1471 | (yyval.re) = NULL; | 1430 | (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re)); |
1472 | ;} | 1431 | ;} |
1473 | break; | 1432 | break; |
1474 | 1433 | ||
1475 | case 5: | 1434 | case 5: |
1476 | #line 105 "dtc-parser.y" | 1435 | |
1436 | /* Line 1455 of yacc.c */ | ||
1437 | #line 106 "dtc-parser.y" | ||
1477 | { | 1438 | { |
1478 | (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re)); | 1439 | (yyval.re) = build_reserve_entry((yyvsp[(2) - (4)].addr), (yyvsp[(3) - (4)].addr)); |
1479 | ;} | 1440 | ;} |
1480 | break; | 1441 | break; |
1481 | 1442 | ||
1482 | case 6: | 1443 | case 6: |
1483 | #line 112 "dtc-parser.y" | 1444 | |
1445 | /* Line 1455 of yacc.c */ | ||
1446 | #line 110 "dtc-parser.y" | ||
1484 | { | 1447 | { |
1485 | (yyval.re) = build_reserve_entry((yyvsp[(3) - (5)].addr), (yyvsp[(4) - (5)].addr), (yyvsp[(1) - (5)].labelref)); | 1448 | add_label(&(yyvsp[(2) - (2)].re)->labels, (yyvsp[(1) - (2)].labelref)); |
1449 | (yyval.re) = (yyvsp[(2) - (2)].re); | ||
1486 | ;} | 1450 | ;} |
1487 | break; | 1451 | break; |
1488 | 1452 | ||
1489 | case 7: | 1453 | case 7: |
1490 | #line 119 "dtc-parser.y" | 1454 | |
1455 | /* Line 1455 of yacc.c */ | ||
1456 | #line 118 "dtc-parser.y" | ||
1491 | { | 1457 | { |
1492 | (yyval.re) = NULL; | 1458 | (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64); |
1493 | ;} | 1459 | ;} |
1494 | break; | 1460 | break; |
1495 | 1461 | ||
1496 | case 8: | 1462 | case 8: |
1497 | #line 123 "dtc-parser.y" | 1463 | |
1464 | /* Line 1455 of yacc.c */ | ||
1465 | #line 125 "dtc-parser.y" | ||
1498 | { | 1466 | { |
1499 | (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re)); | 1467 | (yyval.node) = name_node((yyvsp[(2) - (2)].node), ""); |
1500 | ;} | 1468 | ;} |
1501 | break; | 1469 | break; |
1502 | 1470 | ||
1503 | case 9: | 1471 | case 9: |
1504 | #line 130 "dtc-parser.y" | 1472 | |
1473 | /* Line 1455 of yacc.c */ | ||
1474 | #line 129 "dtc-parser.y" | ||
1505 | { | 1475 | { |
1506 | (yyval.re) = (yyvsp[(1) - (1)].re); | 1476 | (yyval.node) = merge_nodes((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); |
1507 | ;} | 1477 | ;} |
1508 | break; | 1478 | break; |
1509 | 1479 | ||
1510 | case 10: | 1480 | case 10: |
1511 | #line 134 "dtc-parser.y" | 1481 | |
1482 | /* Line 1455 of yacc.c */ | ||
1483 | #line 133 "dtc-parser.y" | ||
1512 | { | 1484 | { |
1513 | (yyval.re) = build_reserve_entry((yyvsp[(3) - (6)].addr), (yyvsp[(5) - (6)].addr) - (yyvsp[(3) - (6)].addr) + 1, (yyvsp[(1) - (6)].labelref)); | 1485 | struct node *target = get_node_by_ref((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].labelref)); |
1486 | |||
1487 | if (target) | ||
1488 | merge_nodes(target, (yyvsp[(3) - (3)].node)); | ||
1489 | else | ||
1490 | print_error("label or path, '%s', not found", (yyvsp[(2) - (3)].labelref)); | ||
1491 | (yyval.node) = (yyvsp[(1) - (3)].node); | ||
1514 | ;} | 1492 | ;} |
1515 | break; | 1493 | break; |
1516 | 1494 | ||
1517 | case 11: | 1495 | case 11: |
1518 | #line 141 "dtc-parser.y" | 1496 | |
1497 | /* Line 1455 of yacc.c */ | ||
1498 | #line 146 "dtc-parser.y" | ||
1519 | { | 1499 | { |
1520 | (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64); | 1500 | (yyval.node) = build_node((yyvsp[(2) - (5)].proplist), (yyvsp[(3) - (5)].nodelist)); |
1521 | ;} | 1501 | ;} |
1522 | break; | 1502 | break; |
1523 | 1503 | ||
1524 | case 12: | 1504 | case 12: |
1525 | #line 145 "dtc-parser.y" | 1505 | |
1506 | /* Line 1455 of yacc.c */ | ||
1507 | #line 153 "dtc-parser.y" | ||
1526 | { | 1508 | { |
1527 | (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 16, 64); | 1509 | (yyval.proplist) = NULL; |
1528 | ;} | 1510 | ;} |
1529 | break; | 1511 | break; |
1530 | 1512 | ||
1531 | case 13: | 1513 | case 13: |
1532 | #line 152 "dtc-parser.y" | 1514 | |
1515 | /* Line 1455 of yacc.c */ | ||
1516 | #line 157 "dtc-parser.y" | ||
1533 | { | 1517 | { |
1534 | (yyval.node) = name_node((yyvsp[(2) - (2)].node), "", NULL); | 1518 | (yyval.proplist) = chain_property((yyvsp[(2) - (2)].prop), (yyvsp[(1) - (2)].proplist)); |
1535 | ;} | 1519 | ;} |
1536 | break; | 1520 | break; |
1537 | 1521 | ||
1538 | case 14: | 1522 | case 14: |
1539 | #line 159 "dtc-parser.y" | 1523 | |
1524 | /* Line 1455 of yacc.c */ | ||
1525 | #line 164 "dtc-parser.y" | ||
1540 | { | 1526 | { |
1541 | (yyval.node) = build_node((yyvsp[(2) - (5)].proplist), (yyvsp[(3) - (5)].nodelist)); | 1527 | (yyval.prop) = build_property((yyvsp[(1) - (4)].propnodename), (yyvsp[(3) - (4)].data)); |
1542 | ;} | 1528 | ;} |
1543 | break; | 1529 | break; |
1544 | 1530 | ||
1545 | case 15: | 1531 | case 15: |
1546 | #line 166 "dtc-parser.y" | 1532 | |
1533 | /* Line 1455 of yacc.c */ | ||
1534 | #line 168 "dtc-parser.y" | ||
1547 | { | 1535 | { |
1548 | (yyval.proplist) = NULL; | 1536 | (yyval.prop) = build_property((yyvsp[(1) - (2)].propnodename), empty_data); |
1549 | ;} | 1537 | ;} |
1550 | break; | 1538 | break; |
1551 | 1539 | ||
1552 | case 16: | 1540 | case 16: |
1553 | #line 170 "dtc-parser.y" | 1541 | |
1542 | /* Line 1455 of yacc.c */ | ||
1543 | #line 172 "dtc-parser.y" | ||
1554 | { | 1544 | { |
1555 | (yyval.proplist) = chain_property((yyvsp[(2) - (2)].prop), (yyvsp[(1) - (2)].proplist)); | 1545 | add_label(&(yyvsp[(2) - (2)].prop)->labels, (yyvsp[(1) - (2)].labelref)); |
1546 | (yyval.prop) = (yyvsp[(2) - (2)].prop); | ||
1556 | ;} | 1547 | ;} |
1557 | break; | 1548 | break; |
1558 | 1549 | ||
1559 | case 17: | 1550 | case 17: |
1560 | #line 177 "dtc-parser.y" | 1551 | |
1552 | /* Line 1455 of yacc.c */ | ||
1553 | #line 180 "dtc-parser.y" | ||
1561 | { | 1554 | { |
1562 | (yyval.prop) = build_property((yyvsp[(2) - (5)].propnodename), (yyvsp[(4) - (5)].data), (yyvsp[(1) - (5)].labelref)); | 1555 | (yyval.data) = data_merge((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].data)); |
1563 | ;} | 1556 | ;} |
1564 | break; | 1557 | break; |
1565 | 1558 | ||
1566 | case 18: | 1559 | case 18: |
1567 | #line 181 "dtc-parser.y" | 1560 | |
1561 | /* Line 1455 of yacc.c */ | ||
1562 | #line 184 "dtc-parser.y" | ||
1568 | { | 1563 | { |
1569 | (yyval.prop) = build_property((yyvsp[(2) - (3)].propnodename), empty_data, (yyvsp[(1) - (3)].labelref)); | 1564 | (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data)); |
1570 | ;} | 1565 | ;} |
1571 | break; | 1566 | break; |
1572 | 1567 | ||
1573 | case 19: | 1568 | case 19: |
1569 | |||
1570 | /* Line 1455 of yacc.c */ | ||
1574 | #line 188 "dtc-parser.y" | 1571 | #line 188 "dtc-parser.y" |
1575 | { | 1572 | { |
1576 | (yyval.data) = data_merge((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].data)); | 1573 | (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data)); |
1577 | ;} | 1574 | ;} |
1578 | break; | 1575 | break; |
1579 | 1576 | ||
1580 | case 20: | 1577 | case 20: |
1578 | |||
1579 | /* Line 1455 of yacc.c */ | ||
1581 | #line 192 "dtc-parser.y" | 1580 | #line 192 "dtc-parser.y" |
1582 | { | 1581 | { |
1583 | (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data)); | 1582 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), REF_PATH, (yyvsp[(2) - (2)].labelref)); |
1584 | ;} | 1583 | ;} |
1585 | break; | 1584 | break; |
1586 | 1585 | ||
1587 | case 21: | 1586 | case 21: |
1588 | #line 196 "dtc-parser.y" | ||
1589 | { | ||
1590 | (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data)); | ||
1591 | ;} | ||
1592 | break; | ||
1593 | |||
1594 | case 22: | ||
1595 | #line 200 "dtc-parser.y" | ||
1596 | { | ||
1597 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), REF_PATH, (yyvsp[(2) - (2)].labelref)); | ||
1598 | ;} | ||
1599 | break; | ||
1600 | 1587 | ||
1601 | case 23: | 1588 | /* Line 1455 of yacc.c */ |
1602 | #line 204 "dtc-parser.y" | 1589 | #line 196 "dtc-parser.y" |
1603 | { | 1590 | { |
1604 | struct search_path path = { srcpos_file->dir, NULL, NULL }; | 1591 | FILE *f = srcfile_relative_open((yyvsp[(4) - (9)].data).val, NULL); |
1605 | struct dtc_file *file = dtc_open_file((yyvsp[(4) - (9)].data).val, &path); | 1592 | struct data d; |
1606 | struct data d = empty_data; | ||
1607 | 1593 | ||
1608 | if ((yyvsp[(6) - (9)].addr) != 0) | 1594 | if ((yyvsp[(6) - (9)].addr) != 0) |
1609 | if (fseek(file->file, (yyvsp[(6) - (9)].addr), SEEK_SET) != 0) | 1595 | if (fseek(f, (yyvsp[(6) - (9)].addr), SEEK_SET) != 0) |
1610 | yyerrorf("Couldn't seek to offset %llu in \"%s\": %s", | 1596 | print_error("Couldn't seek to offset %llu in \"%s\": %s", |
1611 | (unsigned long long)(yyvsp[(6) - (9)].addr), | 1597 | (unsigned long long)(yyvsp[(6) - (9)].addr), |
1612 | (yyvsp[(4) - (9)].data).val, strerror(errno)); | 1598 | (yyvsp[(4) - (9)].data).val, |
1599 | strerror(errno)); | ||
1613 | 1600 | ||
1614 | d = data_copy_file(file->file, (yyvsp[(8) - (9)].addr)); | 1601 | d = data_copy_file(f, (yyvsp[(8) - (9)].addr)); |
1615 | 1602 | ||
1616 | (yyval.data) = data_merge((yyvsp[(1) - (9)].data), d); | 1603 | (yyval.data) = data_merge((yyvsp[(1) - (9)].data), d); |
1617 | dtc_close_file(file); | 1604 | fclose(f); |
1618 | ;} | 1605 | ;} |
1619 | break; | 1606 | break; |
1620 | 1607 | ||
1621 | case 24: | 1608 | case 22: |
1622 | #line 221 "dtc-parser.y" | 1609 | |
1610 | /* Line 1455 of yacc.c */ | ||
1611 | #line 213 "dtc-parser.y" | ||
1623 | { | 1612 | { |
1624 | struct search_path path = { srcpos_file->dir, NULL, NULL }; | 1613 | FILE *f = srcfile_relative_open((yyvsp[(4) - (5)].data).val, NULL); |
1625 | struct dtc_file *file = dtc_open_file((yyvsp[(4) - (5)].data).val, &path); | ||
1626 | struct data d = empty_data; | 1614 | struct data d = empty_data; |
1627 | 1615 | ||
1628 | d = data_copy_file(file->file, -1); | 1616 | d = data_copy_file(f, -1); |
1629 | 1617 | ||
1630 | (yyval.data) = data_merge((yyvsp[(1) - (5)].data), d); | 1618 | (yyval.data) = data_merge((yyvsp[(1) - (5)].data), d); |
1631 | dtc_close_file(file); | 1619 | fclose(f); |
1632 | ;} | 1620 | ;} |
1633 | break; | 1621 | break; |
1634 | 1622 | ||
1635 | case 25: | 1623 | case 23: |
1636 | #line 232 "dtc-parser.y" | 1624 | |
1625 | /* Line 1455 of yacc.c */ | ||
1626 | #line 223 "dtc-parser.y" | ||
1637 | { | 1627 | { |
1638 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); | 1628 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); |
1639 | ;} | 1629 | ;} |
1640 | break; | 1630 | break; |
1641 | 1631 | ||
1642 | case 26: | 1632 | case 24: |
1643 | #line 239 "dtc-parser.y" | 1633 | |
1634 | /* Line 1455 of yacc.c */ | ||
1635 | #line 230 "dtc-parser.y" | ||
1644 | { | 1636 | { |
1645 | (yyval.data) = empty_data; | 1637 | (yyval.data) = empty_data; |
1646 | ;} | 1638 | ;} |
1647 | break; | 1639 | break; |
1648 | 1640 | ||
1649 | case 27: | 1641 | case 25: |
1650 | #line 243 "dtc-parser.y" | 1642 | |
1643 | /* Line 1455 of yacc.c */ | ||
1644 | #line 234 "dtc-parser.y" | ||
1651 | { | 1645 | { |
1652 | (yyval.data) = (yyvsp[(1) - (2)].data); | 1646 | (yyval.data) = (yyvsp[(1) - (2)].data); |
1653 | ;} | 1647 | ;} |
1654 | break; | 1648 | break; |
1655 | 1649 | ||
1656 | case 28: | 1650 | case 26: |
1657 | #line 247 "dtc-parser.y" | 1651 | |
1652 | /* Line 1455 of yacc.c */ | ||
1653 | #line 238 "dtc-parser.y" | ||
1658 | { | 1654 | { |
1659 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); | 1655 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); |
1660 | ;} | 1656 | ;} |
1661 | break; | 1657 | break; |
1662 | 1658 | ||
1663 | case 29: | 1659 | case 27: |
1664 | #line 254 "dtc-parser.y" | 1660 | |
1661 | /* Line 1455 of yacc.c */ | ||
1662 | #line 245 "dtc-parser.y" | ||
1665 | { | 1663 | { |
1666 | (yyval.data) = empty_data; | 1664 | (yyval.data) = empty_data; |
1667 | ;} | 1665 | ;} |
1668 | break; | 1666 | break; |
1669 | 1667 | ||
1670 | case 30: | 1668 | case 28: |
1671 | #line 258 "dtc-parser.y" | 1669 | |
1670 | /* Line 1455 of yacc.c */ | ||
1671 | #line 249 "dtc-parser.y" | ||
1672 | { | 1672 | { |
1673 | (yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell)); | 1673 | (yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell)); |
1674 | ;} | 1674 | ;} |
1675 | break; | 1675 | break; |
1676 | 1676 | ||
1677 | case 31: | 1677 | case 29: |
1678 | #line 262 "dtc-parser.y" | 1678 | |
1679 | /* Line 1455 of yacc.c */ | ||
1680 | #line 253 "dtc-parser.y" | ||
1679 | { | 1681 | { |
1680 | (yyval.data) = data_append_cell(data_add_marker((yyvsp[(1) - (2)].data), REF_PHANDLE, | 1682 | (yyval.data) = data_append_cell(data_add_marker((yyvsp[(1) - (2)].data), REF_PHANDLE, |
1681 | (yyvsp[(2) - (2)].labelref)), -1); | 1683 | (yyvsp[(2) - (2)].labelref)), -1); |
1682 | ;} | 1684 | ;} |
1683 | break; | 1685 | break; |
1684 | 1686 | ||
1685 | case 32: | 1687 | case 30: |
1686 | #line 267 "dtc-parser.y" | 1688 | |
1689 | /* Line 1455 of yacc.c */ | ||
1690 | #line 258 "dtc-parser.y" | ||
1687 | { | 1691 | { |
1688 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); | 1692 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); |
1689 | ;} | 1693 | ;} |
1690 | break; | 1694 | break; |
1691 | 1695 | ||
1692 | case 33: | 1696 | case 31: |
1693 | #line 274 "dtc-parser.y" | ||
1694 | { | ||
1695 | (yyval.cbase) = 16; | ||
1696 | ;} | ||
1697 | break; | ||
1698 | 1697 | ||
1699 | case 35: | 1698 | /* Line 1455 of yacc.c */ |
1700 | #line 282 "dtc-parser.y" | 1699 | #line 265 "dtc-parser.y" |
1701 | { | 1700 | { |
1702 | (yyval.cell) = eval_literal((yyvsp[(1) - (1)].literal), 0, 32); | 1701 | (yyval.cell) = eval_literal((yyvsp[(1) - (1)].literal), 0, 32); |
1703 | ;} | 1702 | ;} |
1704 | break; | 1703 | break; |
1705 | 1704 | ||
1706 | case 36: | 1705 | case 32: |
1707 | #line 286 "dtc-parser.y" | ||
1708 | { | ||
1709 | (yyval.cell) = eval_literal((yyvsp[(2) - (2)].literal), (yyvsp[(1) - (2)].cbase), 32); | ||
1710 | ;} | ||
1711 | break; | ||
1712 | 1706 | ||
1713 | case 37: | 1707 | /* Line 1455 of yacc.c */ |
1714 | #line 293 "dtc-parser.y" | 1708 | #line 272 "dtc-parser.y" |
1715 | { | 1709 | { |
1716 | (yyval.data) = empty_data; | 1710 | (yyval.data) = empty_data; |
1717 | ;} | 1711 | ;} |
1718 | break; | 1712 | break; |
1719 | 1713 | ||
1720 | case 38: | 1714 | case 33: |
1721 | #line 297 "dtc-parser.y" | 1715 | |
1716 | /* Line 1455 of yacc.c */ | ||
1717 | #line 276 "dtc-parser.y" | ||
1722 | { | 1718 | { |
1723 | (yyval.data) = data_append_byte((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].byte)); | 1719 | (yyval.data) = data_append_byte((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].byte)); |
1724 | ;} | 1720 | ;} |
1725 | break; | 1721 | break; |
1726 | 1722 | ||
1727 | case 39: | 1723 | case 34: |
1728 | #line 301 "dtc-parser.y" | 1724 | |
1725 | /* Line 1455 of yacc.c */ | ||
1726 | #line 280 "dtc-parser.y" | ||
1729 | { | 1727 | { |
1730 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); | 1728 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); |
1731 | ;} | 1729 | ;} |
1732 | break; | 1730 | break; |
1733 | 1731 | ||
1734 | case 40: | 1732 | case 35: |
1735 | #line 308 "dtc-parser.y" | 1733 | |
1734 | /* Line 1455 of yacc.c */ | ||
1735 | #line 287 "dtc-parser.y" | ||
1736 | { | 1736 | { |
1737 | (yyval.nodelist) = NULL; | 1737 | (yyval.nodelist) = NULL; |
1738 | ;} | 1738 | ;} |
1739 | break; | 1739 | break; |
1740 | 1740 | ||
1741 | case 41: | 1741 | case 36: |
1742 | #line 312 "dtc-parser.y" | 1742 | |
1743 | /* Line 1455 of yacc.c */ | ||
1744 | #line 291 "dtc-parser.y" | ||
1743 | { | 1745 | { |
1744 | (yyval.nodelist) = chain_node((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].nodelist)); | 1746 | (yyval.nodelist) = chain_node((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].nodelist)); |
1745 | ;} | 1747 | ;} |
1746 | break; | 1748 | break; |
1747 | 1749 | ||
1748 | case 42: | 1750 | case 37: |
1749 | #line 316 "dtc-parser.y" | 1751 | |
1752 | /* Line 1455 of yacc.c */ | ||
1753 | #line 295 "dtc-parser.y" | ||
1750 | { | 1754 | { |
1751 | yyerror("syntax error: properties must precede subnodes"); | 1755 | print_error("syntax error: properties must precede subnodes"); |
1752 | YYERROR; | 1756 | YYERROR; |
1753 | ;} | 1757 | ;} |
1754 | break; | 1758 | break; |
1755 | 1759 | ||
1756 | case 43: | 1760 | case 38: |
1757 | #line 324 "dtc-parser.y" | ||
1758 | { | ||
1759 | (yyval.node) = name_node((yyvsp[(3) - (3)].node), (yyvsp[(2) - (3)].propnodename), (yyvsp[(1) - (3)].labelref)); | ||
1760 | ;} | ||
1761 | break; | ||
1762 | 1761 | ||
1763 | case 44: | 1762 | /* Line 1455 of yacc.c */ |
1764 | #line 331 "dtc-parser.y" | 1763 | #line 303 "dtc-parser.y" |
1765 | { | 1764 | { |
1766 | (yyval.labelref) = NULL; | 1765 | (yyval.node) = name_node((yyvsp[(2) - (2)].node), (yyvsp[(1) - (2)].propnodename)); |
1767 | ;} | 1766 | ;} |
1768 | break; | 1767 | break; |
1769 | 1768 | ||
1770 | case 45: | 1769 | case 39: |
1771 | #line 335 "dtc-parser.y" | 1770 | |
1771 | /* Line 1455 of yacc.c */ | ||
1772 | #line 307 "dtc-parser.y" | ||
1772 | { | 1773 | { |
1773 | (yyval.labelref) = (yyvsp[(1) - (1)].labelref); | 1774 | add_label(&(yyvsp[(2) - (2)].node)->labels, (yyvsp[(1) - (2)].labelref)); |
1775 | (yyval.node) = (yyvsp[(2) - (2)].node); | ||
1774 | ;} | 1776 | ;} |
1775 | break; | 1777 | break; |
1776 | 1778 | ||
1777 | 1779 | ||
1778 | /* Line 1267 of yacc.c. */ | 1780 | |
1779 | #line 1780 "dtc-parser.tab.c" | 1781 | /* Line 1455 of yacc.c */ |
1782 | #line 1783 "dtc-parser.tab.c" | ||
1780 | default: break; | 1783 | default: break; |
1781 | } | 1784 | } |
1782 | YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); | 1785 | YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); |
@@ -1786,7 +1789,6 @@ yyreduce: | |||
1786 | YY_STACK_PRINT (yyss, yyssp); | 1789 | YY_STACK_PRINT (yyss, yyssp); |
1787 | 1790 | ||
1788 | *++yyvsp = yyval; | 1791 | *++yyvsp = yyval; |
1789 | *++yylsp = yyloc; | ||
1790 | 1792 | ||
1791 | /* Now `shift' the result of the reduction. Determine what state | 1793 | /* Now `shift' the result of the reduction. Determine what state |
1792 | that goes to, based on the state we popped back to and the rule | 1794 | that goes to, based on the state we popped back to and the rule |
@@ -1848,11 +1850,11 @@ yyerrlab: | |||
1848 | #endif | 1850 | #endif |
1849 | } | 1851 | } |
1850 | 1852 | ||
1851 | yyerror_range[0] = yylloc; | 1853 | |
1852 | 1854 | ||
1853 | if (yyerrstatus == 3) | 1855 | if (yyerrstatus == 3) |
1854 | { | 1856 | { |
1855 | /* If just tried and failed to reuse look-ahead token after an | 1857 | /* If just tried and failed to reuse lookahead token after an |
1856 | error, discard it. */ | 1858 | error, discard it. */ |
1857 | 1859 | ||
1858 | if (yychar <= YYEOF) | 1860 | if (yychar <= YYEOF) |
@@ -1864,12 +1866,12 @@ yyerrlab: | |||
1864 | else | 1866 | else |
1865 | { | 1867 | { |
1866 | yydestruct ("Error: discarding", | 1868 | yydestruct ("Error: discarding", |
1867 | yytoken, &yylval, &yylloc); | 1869 | yytoken, &yylval); |
1868 | yychar = YYEMPTY; | 1870 | yychar = YYEMPTY; |
1869 | } | 1871 | } |
1870 | } | 1872 | } |
1871 | 1873 | ||
1872 | /* Else will try to reuse look-ahead token after shifting the error | 1874 | /* Else will try to reuse lookahead token after shifting the error |
1873 | token. */ | 1875 | token. */ |
1874 | goto yyerrlab1; | 1876 | goto yyerrlab1; |
1875 | 1877 | ||
@@ -1885,7 +1887,6 @@ yyerrorlab: | |||
1885 | if (/*CONSTCOND*/ 0) | 1887 | if (/*CONSTCOND*/ 0) |
1886 | goto yyerrorlab; | 1888 | goto yyerrorlab; |
1887 | 1889 | ||
1888 | yyerror_range[0] = yylsp[1-yylen]; | ||
1889 | /* Do not reclaim the symbols of the rule which action triggered | 1890 | /* Do not reclaim the symbols of the rule which action triggered |
1890 | this YYERROR. */ | 1891 | this YYERROR. */ |
1891 | YYPOPSTACK (yylen); | 1892 | YYPOPSTACK (yylen); |
@@ -1919,24 +1920,16 @@ yyerrlab1: | |||
1919 | if (yyssp == yyss) | 1920 | if (yyssp == yyss) |
1920 | YYABORT; | 1921 | YYABORT; |
1921 | 1922 | ||
1922 | yyerror_range[0] = *yylsp; | 1923 | |
1923 | yydestruct ("Error: popping", | 1924 | yydestruct ("Error: popping", |
1924 | yystos[yystate], yyvsp, yylsp); | 1925 | yystos[yystate], yyvsp); |
1925 | YYPOPSTACK (1); | 1926 | YYPOPSTACK (1); |
1926 | yystate = *yyssp; | 1927 | yystate = *yyssp; |
1927 | YY_STACK_PRINT (yyss, yyssp); | 1928 | YY_STACK_PRINT (yyss, yyssp); |
1928 | } | 1929 | } |
1929 | 1930 | ||
1930 | if (yyn == YYFINAL) | ||
1931 | YYACCEPT; | ||
1932 | |||
1933 | *++yyvsp = yylval; | 1931 | *++yyvsp = yylval; |
1934 | 1932 | ||
1935 | yyerror_range[1] = yylloc; | ||
1936 | /* Using YYLLOC is tempting, but would change the location of | ||
1937 | the look-ahead. YYLOC is available though. */ | ||
1938 | YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); | ||
1939 | *++yylsp = yyloc; | ||
1940 | 1933 | ||
1941 | /* Shift the error token. */ | 1934 | /* Shift the error token. */ |
1942 | YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); | 1935 | YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); |
@@ -1959,7 +1952,7 @@ yyabortlab: | |||
1959 | yyresult = 1; | 1952 | yyresult = 1; |
1960 | goto yyreturn; | 1953 | goto yyreturn; |
1961 | 1954 | ||
1962 | #ifndef yyoverflow | 1955 | #if !defined(yyoverflow) || YYERROR_VERBOSE |
1963 | /*-------------------------------------------------. | 1956 | /*-------------------------------------------------. |
1964 | | yyexhaustedlab -- memory exhaustion comes here. | | 1957 | | yyexhaustedlab -- memory exhaustion comes here. | |
1965 | `-------------------------------------------------*/ | 1958 | `-------------------------------------------------*/ |
@@ -1970,9 +1963,9 @@ yyexhaustedlab: | |||
1970 | #endif | 1963 | #endif |
1971 | 1964 | ||
1972 | yyreturn: | 1965 | yyreturn: |
1973 | if (yychar != YYEOF && yychar != YYEMPTY) | 1966 | if (yychar != YYEMPTY) |
1974 | yydestruct ("Cleanup: discarding lookahead", | 1967 | yydestruct ("Cleanup: discarding lookahead", |
1975 | yytoken, &yylval, &yylloc); | 1968 | yytoken, &yylval); |
1976 | /* Do not reclaim the symbols of the rule which action triggered | 1969 | /* Do not reclaim the symbols of the rule which action triggered |
1977 | this YYABORT or YYACCEPT. */ | 1970 | this YYABORT or YYACCEPT. */ |
1978 | YYPOPSTACK (yylen); | 1971 | YYPOPSTACK (yylen); |
@@ -1980,7 +1973,7 @@ yyreturn: | |||
1980 | while (yyssp != yyss) | 1973 | while (yyssp != yyss) |
1981 | { | 1974 | { |
1982 | yydestruct ("Cleanup: popping", | 1975 | yydestruct ("Cleanup: popping", |
1983 | yystos[*yyssp], yyvsp, yylsp); | 1976 | yystos[*yyssp], yyvsp); |
1984 | YYPOPSTACK (1); | 1977 | YYPOPSTACK (1); |
1985 | } | 1978 | } |
1986 | #ifndef yyoverflow | 1979 | #ifndef yyoverflow |
@@ -1996,29 +1989,24 @@ yyreturn: | |||
1996 | } | 1989 | } |
1997 | 1990 | ||
1998 | 1991 | ||
1999 | #line 340 "dtc-parser.y" | 1992 | |
1993 | /* Line 1675 of yacc.c */ | ||
1994 | #line 313 "dtc-parser.y" | ||
2000 | 1995 | ||
2001 | 1996 | ||
2002 | void yyerrorf(char const *s, ...) | 1997 | void print_error(char const *fmt, ...) |
2003 | { | 1998 | { |
2004 | const char *fname = srcpos_file ? srcpos_file->name : "<no-file>"; | ||
2005 | va_list va; | 1999 | va_list va; |
2006 | va_start(va, s); | ||
2007 | |||
2008 | if (strcmp(fname, "-") == 0) | ||
2009 | fname = "stdin"; | ||
2010 | 2000 | ||
2011 | fprintf(stderr, "%s:%d ", fname, yylloc.first_line); | 2001 | va_start(va, fmt); |
2012 | vfprintf(stderr, s, va); | 2002 | srcpos_verror(&yylloc, fmt, va); |
2013 | fprintf(stderr, "\n"); | 2003 | va_end(va); |
2014 | 2004 | ||
2015 | treesource_error = 1; | 2005 | treesource_error = 1; |
2016 | va_end(va); | ||
2017 | } | 2006 | } |
2018 | 2007 | ||
2019 | void yyerror (char const *s) | 2008 | void yyerror(char const *s) { |
2020 | { | 2009 | print_error("%s", s); |
2021 | yyerrorf("%s", s); | ||
2022 | } | 2010 | } |
2023 | 2011 | ||
2024 | static unsigned long long eval_literal(const char *s, int base, int bits) | 2012 | static unsigned long long eval_literal(const char *s, int base, int bits) |
@@ -2029,12 +2017,12 @@ static unsigned long long eval_literal(const char *s, int base, int bits) | |||
2029 | errno = 0; | 2017 | errno = 0; |
2030 | val = strtoull(s, &e, base); | 2018 | val = strtoull(s, &e, base); |
2031 | if (*e) | 2019 | if (*e) |
2032 | yyerror("bad characters in literal"); | 2020 | print_error("bad characters in literal"); |
2033 | else if ((errno == ERANGE) | 2021 | else if ((errno == ERANGE) |
2034 | || ((bits < 64) && (val >= (1ULL << bits)))) | 2022 | || ((bits < 64) && (val >= (1ULL << bits)))) |
2035 | yyerror("literal out of range"); | 2023 | print_error("literal out of range"); |
2036 | else if (errno != 0) | 2024 | else if (errno != 0) |
2037 | yyerror("bad literal"); | 2025 | print_error("bad literal"); |
2038 | return val; | 2026 | return val; |
2039 | } | 2027 | } |
2040 | 2028 | ||
diff --git a/scripts/dtc/dtc-parser.tab.h_shipped b/scripts/dtc/dtc-parser.tab.h_shipped index ba99100d55c..95c9547adea 100644 --- a/scripts/dtc/dtc-parser.tab.h_shipped +++ b/scripts/dtc/dtc-parser.tab.h_shipped | |||
@@ -1,24 +1,23 @@ | |||
1 | /* A Bison parser, made by GNU Bison 2.3. */ | ||
2 | 1 | ||
3 | /* Skeleton interface for Bison's Yacc-like parsers in C | 2 | /* A Bison parser, made by GNU Bison 2.4.1. */ |
4 | 3 | ||
5 | Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | 4 | /* Skeleton interface for Bison's Yacc-like parsers in C |
5 | |||
6 | Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | ||
6 | Free Software Foundation, Inc. | 7 | Free Software Foundation, Inc. |
7 | 8 | ||
8 | This program is free software; you can redistribute it and/or modify | 9 | This program is free software: you can redistribute it and/or modify |
9 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
10 | the Free Software Foundation; either version 2, or (at your option) | 11 | the Free Software Foundation, either version 3 of the License, or |
11 | any later version. | 12 | (at your option) any later version. |
12 | 13 | ||
13 | This program is distributed in the hope that it will be useful, | 14 | This program is distributed in the hope that it will be useful, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. | 17 | GNU General Public License for more details. |
17 | 18 | ||
18 | You should have received a copy of the GNU General Public License | 19 | You should have received a copy of the GNU General Public License |
19 | along with this program; if not, write to the Free Software | 20 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
20 | Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
21 | Boston, MA 02110-1301, USA. */ | ||
22 | 21 | ||
23 | /* As a special exception, you may create a larger work that contains | 22 | /* As a special exception, you may create a larger work that contains |
24 | part or all of the Bison parser skeleton and distribute that work | 23 | part or all of the Bison parser skeleton and distribute that work |
@@ -29,10 +28,11 @@ | |||
29 | special exception, which will cause the skeleton and the resulting | 28 | special exception, which will cause the skeleton and the resulting |
30 | Bison output files to be licensed under the GNU General Public | 29 | Bison output files to be licensed under the GNU General Public |
31 | License without this special exception. | 30 | License without this special exception. |
32 | 31 | ||
33 | This special exception was added by the Free Software Foundation in | 32 | This special exception was added by the Free Software Foundation in |
34 | version 2.2 of Bison. */ | 33 | version 2.2 of Bison. */ |
35 | 34 | ||
35 | |||
36 | /* Tokens. */ | 36 | /* Tokens. */ |
37 | #ifndef YYTOKENTYPE | 37 | #ifndef YYTOKENTYPE |
38 | # define YYTOKENTYPE | 38 | # define YYTOKENTYPE |
@@ -43,35 +43,24 @@ | |||
43 | DT_MEMRESERVE = 259, | 43 | DT_MEMRESERVE = 259, |
44 | DT_PROPNODENAME = 260, | 44 | DT_PROPNODENAME = 260, |
45 | DT_LITERAL = 261, | 45 | DT_LITERAL = 261, |
46 | DT_LEGACYLITERAL = 262, | 46 | DT_BASE = 262, |
47 | DT_BASE = 263, | 47 | DT_BYTE = 263, |
48 | DT_BYTE = 264, | 48 | DT_STRING = 264, |
49 | DT_STRING = 265, | 49 | DT_LABEL = 265, |
50 | DT_LABEL = 266, | 50 | DT_REF = 266, |
51 | DT_REF = 267, | 51 | DT_INCBIN = 267 |
52 | DT_INCBIN = 268 | ||
53 | }; | 52 | }; |
54 | #endif | 53 | #endif |
55 | /* Tokens. */ | ||
56 | #define DT_V1 258 | ||
57 | #define DT_MEMRESERVE 259 | ||
58 | #define DT_PROPNODENAME 260 | ||
59 | #define DT_LITERAL 261 | ||
60 | #define DT_LEGACYLITERAL 262 | ||
61 | #define DT_BASE 263 | ||
62 | #define DT_BYTE 264 | ||
63 | #define DT_STRING 265 | ||
64 | #define DT_LABEL 266 | ||
65 | #define DT_REF 267 | ||
66 | #define DT_INCBIN 268 | ||
67 | |||
68 | 54 | ||
69 | 55 | ||
70 | 56 | ||
71 | #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED | 57 | #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED |
72 | typedef union YYSTYPE | 58 | typedef union YYSTYPE |
73 | #line 37 "dtc-parser.y" | ||
74 | { | 59 | { |
60 | |||
61 | /* Line 1676 of yacc.c */ | ||
62 | #line 39 "dtc-parser.y" | ||
63 | |||
75 | char *propnodename; | 64 | char *propnodename; |
76 | char *literal; | 65 | char *literal; |
77 | char *labelref; | 66 | char *labelref; |
@@ -86,28 +75,17 @@ typedef union YYSTYPE | |||
86 | struct node *node; | 75 | struct node *node; |
87 | struct node *nodelist; | 76 | struct node *nodelist; |
88 | struct reserve_info *re; | 77 | struct reserve_info *re; |
89 | } | 78 | |
90 | /* Line 1489 of yacc.c. */ | 79 | |
91 | #line 92 "dtc-parser.tab.h" | 80 | |
92 | YYSTYPE; | 81 | /* Line 1676 of yacc.c */ |
82 | #line 83 "dtc-parser.tab.h" | ||
83 | } YYSTYPE; | ||
84 | # define YYSTYPE_IS_TRIVIAL 1 | ||
93 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ | 85 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ |
94 | # define YYSTYPE_IS_DECLARED 1 | 86 | # define YYSTYPE_IS_DECLARED 1 |
95 | # define YYSTYPE_IS_TRIVIAL 1 | ||
96 | #endif | 87 | #endif |
97 | 88 | ||
98 | extern YYSTYPE yylval; | 89 | extern YYSTYPE yylval; |
99 | 90 | ||
100 | #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED | ||
101 | typedef struct YYLTYPE | ||
102 | { | ||
103 | int first_line; | ||
104 | int first_column; | ||
105 | int last_line; | ||
106 | int last_column; | ||
107 | } YYLTYPE; | ||
108 | # define yyltype YYLTYPE /* obsolescent; will be withdrawn */ | ||
109 | # define YYLTYPE_IS_DECLARED 1 | ||
110 | # define YYLTYPE_IS_TRIVIAL 1 | ||
111 | #endif | ||
112 | 91 | ||
113 | extern YYLTYPE yylloc; | ||
diff --git a/scripts/dtc/dtc-parser.y b/scripts/dtc/dtc-parser.y index b2ab562420e..5e84a67fc1d 100644 --- a/scripts/dtc/dtc-parser.y +++ b/scripts/dtc/dtc-parser.y | |||
@@ -18,15 +18,17 @@ | |||
18 | * USA | 18 | * USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | %locations | ||
22 | |||
23 | %{ | 21 | %{ |
24 | #include <stdio.h> | 22 | #include <stdio.h> |
25 | 23 | ||
26 | #include "dtc.h" | 24 | #include "dtc.h" |
27 | #include "srcpos.h" | 25 | #include "srcpos.h" |
28 | 26 | ||
27 | YYLTYPE yylloc; | ||
28 | |||
29 | extern int yylex(void); | 29 | extern int yylex(void); |
30 | extern void print_error(char const *fmt, ...); | ||
31 | extern void yyerror(char const *s); | ||
30 | 32 | ||
31 | extern struct boot_info *the_boot_info; | 33 | extern struct boot_info *the_boot_info; |
32 | extern int treesource_error; | 34 | extern int treesource_error; |
@@ -55,7 +57,6 @@ static unsigned long long eval_literal(const char *s, int base, int bits); | |||
55 | %token DT_MEMRESERVE | 57 | %token DT_MEMRESERVE |
56 | %token <propnodename> DT_PROPNODENAME | 58 | %token <propnodename> DT_PROPNODENAME |
57 | %token <literal> DT_LITERAL | 59 | %token <literal> DT_LITERAL |
58 | %token <literal> DT_LEGACYLITERAL | ||
59 | %token <cbase> DT_BASE | 60 | %token <cbase> DT_BASE |
60 | %token <byte> DT_BYTE | 61 | %token <byte> DT_BYTE |
61 | %token <data> DT_STRING | 62 | %token <data> DT_STRING |
@@ -67,11 +68,8 @@ static unsigned long long eval_literal(const char *s, int base, int bits); | |||
67 | %type <data> propdataprefix | 68 | %type <data> propdataprefix |
68 | %type <re> memreserve | 69 | %type <re> memreserve |
69 | %type <re> memreserves | 70 | %type <re> memreserves |
70 | %type <re> v0_memreserve | ||
71 | %type <re> v0_memreserves | ||
72 | %type <addr> addr | 71 | %type <addr> addr |
73 | %type <data> celllist | 72 | %type <data> celllist |
74 | %type <cbase> cellbase | ||
75 | %type <cell> cellval | 73 | %type <cell> cellval |
76 | %type <data> bytestring | 74 | %type <data> bytestring |
77 | %type <prop> propdef | 75 | %type <prop> propdef |
@@ -81,18 +79,14 @@ static unsigned long long eval_literal(const char *s, int base, int bits); | |||
81 | %type <node> nodedef | 79 | %type <node> nodedef |
82 | %type <node> subnode | 80 | %type <node> subnode |
83 | %type <nodelist> subnodes | 81 | %type <nodelist> subnodes |
84 | %type <labelref> label | ||
85 | 82 | ||
86 | %% | 83 | %% |
87 | 84 | ||
88 | sourcefile: | 85 | sourcefile: |
89 | DT_V1 ';' memreserves devicetree | 86 | DT_V1 ';' memreserves devicetree |
90 | { | 87 | { |
91 | the_boot_info = build_boot_info($3, $4, 0); | 88 | the_boot_info = build_boot_info($3, $4, |
92 | } | 89 | guess_boot_cpuid($4)); |
93 | | v0_memreserves devicetree | ||
94 | { | ||
95 | the_boot_info = build_boot_info($1, $2, 0); | ||
96 | } | 90 | } |
97 | ; | 91 | ; |
98 | 92 | ||
@@ -108,31 +102,14 @@ memreserves: | |||
108 | ; | 102 | ; |
109 | 103 | ||
110 | memreserve: | 104 | memreserve: |
111 | label DT_MEMRESERVE addr addr ';' | 105 | DT_MEMRESERVE addr addr ';' |
112 | { | 106 | { |
113 | $$ = build_reserve_entry($3, $4, $1); | 107 | $$ = build_reserve_entry($2, $3); |
114 | } | 108 | } |
115 | ; | 109 | | DT_LABEL memreserve |
116 | |||
117 | v0_memreserves: | ||
118 | /* empty */ | ||
119 | { | 110 | { |
120 | $$ = NULL; | 111 | add_label(&$2->labels, $1); |
121 | } | 112 | $$ = $2; |
122 | | v0_memreserve v0_memreserves | ||
123 | { | ||
124 | $$ = chain_reserve_entry($1, $2); | ||
125 | }; | ||
126 | ; | ||
127 | |||
128 | v0_memreserve: | ||
129 | memreserve | ||
130 | { | ||
131 | $$ = $1; | ||
132 | } | ||
133 | | label DT_MEMRESERVE addr '-' addr ';' | ||
134 | { | ||
135 | $$ = build_reserve_entry($3, $5 - $3 + 1, $1); | ||
136 | } | 113 | } |
137 | ; | 114 | ; |
138 | 115 | ||
@@ -141,16 +118,26 @@ addr: | |||
141 | { | 118 | { |
142 | $$ = eval_literal($1, 0, 64); | 119 | $$ = eval_literal($1, 0, 64); |
143 | } | 120 | } |
144 | | DT_LEGACYLITERAL | ||
145 | { | ||
146 | $$ = eval_literal($1, 16, 64); | ||
147 | } | ||
148 | ; | 121 | ; |
149 | 122 | ||
150 | devicetree: | 123 | devicetree: |
151 | '/' nodedef | 124 | '/' nodedef |
152 | { | 125 | { |
153 | $$ = name_node($2, "", NULL); | 126 | $$ = name_node($2, ""); |
127 | } | ||
128 | | devicetree '/' nodedef | ||
129 | { | ||
130 | $$ = merge_nodes($1, $3); | ||
131 | } | ||
132 | | devicetree DT_REF nodedef | ||
133 | { | ||
134 | struct node *target = get_node_by_ref($1, $2); | ||
135 | |||
136 | if (target) | ||
137 | merge_nodes(target, $3); | ||
138 | else | ||
139 | print_error("label or path, '%s', not found", $2); | ||
140 | $$ = $1; | ||
154 | } | 141 | } |
155 | ; | 142 | ; |
156 | 143 | ||
@@ -173,13 +160,18 @@ proplist: | |||
173 | ; | 160 | ; |
174 | 161 | ||
175 | propdef: | 162 | propdef: |
176 | label DT_PROPNODENAME '=' propdata ';' | 163 | DT_PROPNODENAME '=' propdata ';' |
164 | { | ||
165 | $$ = build_property($1, $3); | ||
166 | } | ||
167 | | DT_PROPNODENAME ';' | ||
177 | { | 168 | { |
178 | $$ = build_property($2, $4, $1); | 169 | $$ = build_property($1, empty_data); |
179 | } | 170 | } |
180 | | label DT_PROPNODENAME ';' | 171 | | DT_LABEL propdef |
181 | { | 172 | { |
182 | $$ = build_property($2, empty_data, $1); | 173 | add_label(&$2->labels, $1); |
174 | $$ = $2; | ||
183 | } | 175 | } |
184 | ; | 176 | ; |
185 | 177 | ||
@@ -202,31 +194,30 @@ propdata: | |||
202 | } | 194 | } |
203 | | propdataprefix DT_INCBIN '(' DT_STRING ',' addr ',' addr ')' | 195 | | propdataprefix DT_INCBIN '(' DT_STRING ',' addr ',' addr ')' |
204 | { | 196 | { |
205 | struct search_path path = { srcpos_file->dir, NULL, NULL }; | 197 | FILE *f = srcfile_relative_open($4.val, NULL); |
206 | struct dtc_file *file = dtc_open_file($4.val, &path); | 198 | struct data d; |
207 | struct data d = empty_data; | ||
208 | 199 | ||
209 | if ($6 != 0) | 200 | if ($6 != 0) |
210 | if (fseek(file->file, $6, SEEK_SET) != 0) | 201 | if (fseek(f, $6, SEEK_SET) != 0) |
211 | yyerrorf("Couldn't seek to offset %llu in \"%s\": %s", | 202 | print_error("Couldn't seek to offset %llu in \"%s\": %s", |
212 | (unsigned long long)$6, | 203 | (unsigned long long)$6, |
213 | $4.val, strerror(errno)); | 204 | $4.val, |
205 | strerror(errno)); | ||
214 | 206 | ||
215 | d = data_copy_file(file->file, $8); | 207 | d = data_copy_file(f, $8); |
216 | 208 | ||
217 | $$ = data_merge($1, d); | 209 | $$ = data_merge($1, d); |
218 | dtc_close_file(file); | 210 | fclose(f); |
219 | } | 211 | } |
220 | | propdataprefix DT_INCBIN '(' DT_STRING ')' | 212 | | propdataprefix DT_INCBIN '(' DT_STRING ')' |
221 | { | 213 | { |
222 | struct search_path path = { srcpos_file->dir, NULL, NULL }; | 214 | FILE *f = srcfile_relative_open($4.val, NULL); |
223 | struct dtc_file *file = dtc_open_file($4.val, &path); | ||
224 | struct data d = empty_data; | 215 | struct data d = empty_data; |
225 | 216 | ||
226 | d = data_copy_file(file->file, -1); | 217 | d = data_copy_file(f, -1); |
227 | 218 | ||
228 | $$ = data_merge($1, d); | 219 | $$ = data_merge($1, d); |
229 | dtc_close_file(file); | 220 | fclose(f); |
230 | } | 221 | } |
231 | | propdata DT_LABEL | 222 | | propdata DT_LABEL |
232 | { | 223 | { |
@@ -269,23 +260,11 @@ celllist: | |||
269 | } | 260 | } |
270 | ; | 261 | ; |
271 | 262 | ||
272 | cellbase: | ||
273 | /* empty */ | ||
274 | { | ||
275 | $$ = 16; | ||
276 | } | ||
277 | | DT_BASE | ||
278 | ; | ||
279 | |||
280 | cellval: | 263 | cellval: |
281 | DT_LITERAL | 264 | DT_LITERAL |
282 | { | 265 | { |
283 | $$ = eval_literal($1, 0, 32); | 266 | $$ = eval_literal($1, 0, 32); |
284 | } | 267 | } |
285 | | cellbase DT_LEGACYLITERAL | ||
286 | { | ||
287 | $$ = eval_literal($2, $1, 32); | ||
288 | } | ||
289 | ; | 268 | ; |
290 | 269 | ||
291 | bytestring: | 270 | bytestring: |
@@ -308,57 +287,44 @@ subnodes: | |||
308 | { | 287 | { |
309 | $$ = NULL; | 288 | $$ = NULL; |
310 | } | 289 | } |
311 | | subnode subnodes | 290 | | subnode subnodes |
312 | { | 291 | { |
313 | $$ = chain_node($1, $2); | 292 | $$ = chain_node($1, $2); |
314 | } | 293 | } |
315 | | subnode propdef | 294 | | subnode propdef |
316 | { | 295 | { |
317 | yyerror("syntax error: properties must precede subnodes"); | 296 | print_error("syntax error: properties must precede subnodes"); |
318 | YYERROR; | 297 | YYERROR; |
319 | } | 298 | } |
320 | ; | 299 | ; |
321 | 300 | ||
322 | subnode: | 301 | subnode: |
323 | label DT_PROPNODENAME nodedef | 302 | DT_PROPNODENAME nodedef |
324 | { | 303 | { |
325 | $$ = name_node($3, $2, $1); | 304 | $$ = name_node($2, $1); |
326 | } | 305 | } |
327 | ; | 306 | | DT_LABEL subnode |
328 | |||
329 | label: | ||
330 | /* empty */ | ||
331 | { | 307 | { |
332 | $$ = NULL; | 308 | add_label(&$2->labels, $1); |
333 | } | 309 | $$ = $2; |
334 | | DT_LABEL | ||
335 | { | ||
336 | $$ = $1; | ||
337 | } | 310 | } |
338 | ; | 311 | ; |
339 | 312 | ||
340 | %% | 313 | %% |
341 | 314 | ||
342 | void yyerrorf(char const *s, ...) | 315 | void print_error(char const *fmt, ...) |
343 | { | 316 | { |
344 | const char *fname = srcpos_file ? srcpos_file->name : "<no-file>"; | ||
345 | va_list va; | 317 | va_list va; |
346 | va_start(va, s); | ||
347 | |||
348 | if (strcmp(fname, "-") == 0) | ||
349 | fname = "stdin"; | ||
350 | 318 | ||
351 | fprintf(stderr, "%s:%d ", fname, yylloc.first_line); | 319 | va_start(va, fmt); |
352 | vfprintf(stderr, s, va); | 320 | srcpos_verror(&yylloc, fmt, va); |
353 | fprintf(stderr, "\n"); | 321 | va_end(va); |
354 | 322 | ||
355 | treesource_error = 1; | 323 | treesource_error = 1; |
356 | va_end(va); | ||
357 | } | 324 | } |
358 | 325 | ||
359 | void yyerror (char const *s) | 326 | void yyerror(char const *s) { |
360 | { | 327 | print_error("%s", s); |
361 | yyerrorf("%s", s); | ||
362 | } | 328 | } |
363 | 329 | ||
364 | static unsigned long long eval_literal(const char *s, int base, int bits) | 330 | static unsigned long long eval_literal(const char *s, int base, int bits) |
@@ -369,11 +335,11 @@ static unsigned long long eval_literal(const char *s, int base, int bits) | |||
369 | errno = 0; | 335 | errno = 0; |
370 | val = strtoull(s, &e, base); | 336 | val = strtoull(s, &e, base); |
371 | if (*e) | 337 | if (*e) |
372 | yyerror("bad characters in literal"); | 338 | print_error("bad characters in literal"); |
373 | else if ((errno == ERANGE) | 339 | else if ((errno == ERANGE) |
374 | || ((bits < 64) && (val >= (1ULL << bits)))) | 340 | || ((bits < 64) && (val >= (1ULL << bits)))) |
375 | yyerror("literal out of range"); | 341 | print_error("literal out of range"); |
376 | else if (errno != 0) | 342 | else if (errno != 0) |
377 | yyerror("bad literal"); | 343 | print_error("bad literal"); |
378 | return val; | 344 | return val; |
379 | } | 345 | } |
diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c index d8fd43b4ac1..cbc0193098e 100644 --- a/scripts/dtc/dtc.c +++ b/scripts/dtc/dtc.c | |||
@@ -30,30 +30,7 @@ int quiet; /* Level of quietness */ | |||
30 | int reservenum; /* Number of memory reservation slots */ | 30 | int reservenum; /* Number of memory reservation slots */ |
31 | int minsize; /* Minimum blob size */ | 31 | int minsize; /* Minimum blob size */ |
32 | int padsize; /* Additional padding to blob */ | 32 | int padsize; /* Additional padding to blob */ |
33 | 33 | int phandle_format = PHANDLE_BOTH; /* Use linux,phandle or phandle properties */ | |
34 | char *join_path(const char *path, const char *name) | ||
35 | { | ||
36 | int lenp = strlen(path); | ||
37 | int lenn = strlen(name); | ||
38 | int len; | ||
39 | int needslash = 1; | ||
40 | char *str; | ||
41 | |||
42 | len = lenp + lenn + 2; | ||
43 | if ((lenp > 0) && (path[lenp-1] == '/')) { | ||
44 | needslash = 0; | ||
45 | len--; | ||
46 | } | ||
47 | |||
48 | str = xmalloc(len); | ||
49 | memcpy(str, path, lenp); | ||
50 | if (needslash) { | ||
51 | str[lenp] = '/'; | ||
52 | lenp++; | ||
53 | } | ||
54 | memcpy(str+lenp, name, lenn+1); | ||
55 | return str; | ||
56 | } | ||
57 | 34 | ||
58 | static void fill_fullpaths(struct node *tree, const char *prefix) | 35 | static void fill_fullpaths(struct node *tree, const char *prefix) |
59 | { | 36 | { |
@@ -104,8 +81,15 @@ static void __attribute__ ((noreturn)) usage(void) | |||
104 | fprintf(stderr, "\t\tSet the physical boot cpu\n"); | 81 | fprintf(stderr, "\t\tSet the physical boot cpu\n"); |
105 | fprintf(stderr, "\t-f\n"); | 82 | fprintf(stderr, "\t-f\n"); |
106 | fprintf(stderr, "\t\tForce - try to produce output even if the input tree has errors\n"); | 83 | fprintf(stderr, "\t\tForce - try to produce output even if the input tree has errors\n"); |
84 | fprintf(stderr, "\t-s\n"); | ||
85 | fprintf(stderr, "\t\tSort nodes and properties before outputting (only useful for\n\t\tcomparing trees)\n"); | ||
107 | fprintf(stderr, "\t-v\n"); | 86 | fprintf(stderr, "\t-v\n"); |
108 | fprintf(stderr, "\t\tPrint DTC version and exit\n"); | 87 | fprintf(stderr, "\t\tPrint DTC version and exit\n"); |
88 | fprintf(stderr, "\t-H <phandle format>\n"); | ||
89 | fprintf(stderr, "\t\tphandle formats are:\n"); | ||
90 | fprintf(stderr, "\t\t\tlegacy - \"linux,phandle\" properties only\n"); | ||
91 | fprintf(stderr, "\t\t\tepapr - \"phandle\" properties only\n"); | ||
92 | fprintf(stderr, "\t\t\tboth - Both \"linux,phandle\" and \"phandle\" properties\n"); | ||
109 | exit(3); | 93 | exit(3); |
110 | } | 94 | } |
111 | 95 | ||
@@ -115,7 +99,7 @@ int main(int argc, char *argv[]) | |||
115 | const char *inform = "dts"; | 99 | const char *inform = "dts"; |
116 | const char *outform = "dts"; | 100 | const char *outform = "dts"; |
117 | const char *outname = "-"; | 101 | const char *outname = "-"; |
118 | int force = 0, check = 0; | 102 | int force = 0, check = 0, sort = 0; |
119 | const char *arg; | 103 | const char *arg; |
120 | int opt; | 104 | int opt; |
121 | FILE *outf = NULL; | 105 | FILE *outf = NULL; |
@@ -127,7 +111,7 @@ int main(int argc, char *argv[]) | |||
127 | minsize = 0; | 111 | minsize = 0; |
128 | padsize = 0; | 112 | padsize = 0; |
129 | 113 | ||
130 | while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:v")) != EOF) { | 114 | while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:vH:s")) != EOF) { |
131 | switch (opt) { | 115 | switch (opt) { |
132 | case 'I': | 116 | case 'I': |
133 | inform = optarg; | 117 | inform = optarg; |
@@ -165,6 +149,22 @@ int main(int argc, char *argv[]) | |||
165 | case 'v': | 149 | case 'v': |
166 | printf("Version: %s\n", DTC_VERSION); | 150 | printf("Version: %s\n", DTC_VERSION); |
167 | exit(0); | 151 | exit(0); |
152 | case 'H': | ||
153 | if (streq(optarg, "legacy")) | ||
154 | phandle_format = PHANDLE_LEGACY; | ||
155 | else if (streq(optarg, "epapr")) | ||
156 | phandle_format = PHANDLE_EPAPR; | ||
157 | else if (streq(optarg, "both")) | ||
158 | phandle_format = PHANDLE_BOTH; | ||
159 | else | ||
160 | die("Invalid argument \"%s\" to -H option\n", | ||
161 | optarg); | ||
162 | break; | ||
163 | |||
164 | case 's': | ||
165 | sort = 1; | ||
166 | break; | ||
167 | |||
168 | case 'h': | 168 | case 'h': |
169 | default: | 169 | default: |
170 | usage(); | 170 | usage(); |
@@ -182,6 +182,9 @@ int main(int argc, char *argv[]) | |||
182 | if (minsize && padsize) | 182 | if (minsize && padsize) |
183 | die("Can't set both -p and -S\n"); | 183 | die("Can't set both -p and -S\n"); |
184 | 184 | ||
185 | if (minsize) | ||
186 | fprintf(stderr, "DTC: Use of \"-S\" is deprecated; it will be removed soon, use \"-p\" instead\n"); | ||
187 | |||
185 | fprintf(stderr, "DTC: %s->%s on file \"%s\"\n", | 188 | fprintf(stderr, "DTC: %s->%s on file \"%s\"\n", |
186 | inform, outform, arg); | 189 | inform, outform, arg); |
187 | 190 | ||
@@ -200,6 +203,8 @@ int main(int argc, char *argv[]) | |||
200 | fill_fullpaths(bi->dt, ""); | 203 | fill_fullpaths(bi->dt, ""); |
201 | process_checks(force, bi); | 204 | process_checks(force, bi); |
202 | 205 | ||
206 | if (sort) | ||
207 | sort_tree(bi); | ||
203 | 208 | ||
204 | if (streq(outname, "-")) { | 209 | if (streq(outname, "-")) { |
205 | outf = stdout; | 210 | outf = stdout; |
diff --git a/scripts/dtc/dtc.h b/scripts/dtc/dtc.h index 08d54c87008..f37c97eb3df 100644 --- a/scripts/dtc/dtc.h +++ b/scripts/dtc/dtc.h | |||
@@ -34,7 +34,17 @@ | |||
34 | #include <libfdt_env.h> | 34 | #include <libfdt_env.h> |
35 | #include <fdt.h> | 35 | #include <fdt.h> |
36 | 36 | ||
37 | #include "util.h" | ||
38 | |||
39 | #ifdef DEBUG | ||
40 | #define debug(fmt,args...) printf(fmt, ##args) | ||
41 | #else | ||
42 | #define debug(fmt,args...) | ||
43 | #endif | ||
44 | |||
45 | |||
37 | #define DEFAULT_FDT_VERSION 17 | 46 | #define DEFAULT_FDT_VERSION 17 |
47 | |||
38 | /* | 48 | /* |
39 | * Command line options | 49 | * Command line options |
40 | */ | 50 | */ |
@@ -42,36 +52,11 @@ extern int quiet; /* Level of quietness */ | |||
42 | extern int reservenum; /* Number of memory reservation slots */ | 52 | extern int reservenum; /* Number of memory reservation slots */ |
43 | extern int minsize; /* Minimum blob size */ | 53 | extern int minsize; /* Minimum blob size */ |
44 | extern int padsize; /* Additional padding to blob */ | 54 | extern int padsize; /* Additional padding to blob */ |
55 | extern int phandle_format; /* Use linux,phandle or phandle properties */ | ||
45 | 56 | ||
46 | static inline void __attribute__((noreturn)) die(char * str, ...) | 57 | #define PHANDLE_LEGACY 0x1 |
47 | { | 58 | #define PHANDLE_EPAPR 0x2 |
48 | va_list ap; | 59 | #define PHANDLE_BOTH 0x3 |
49 | |||
50 | va_start(ap, str); | ||
51 | fprintf(stderr, "FATAL ERROR: "); | ||
52 | vfprintf(stderr, str, ap); | ||
53 | exit(1); | ||
54 | } | ||
55 | |||
56 | static inline void *xmalloc(size_t len) | ||
57 | { | ||
58 | void *new = malloc(len); | ||
59 | |||
60 | if (! new) | ||
61 | die("malloc() failed\n"); | ||
62 | |||
63 | return new; | ||
64 | } | ||
65 | |||
66 | static inline void *xrealloc(void *p, size_t len) | ||
67 | { | ||
68 | void *new = realloc(p, len); | ||
69 | |||
70 | if (! new) | ||
71 | die("realloc() failed (len=%d)\n", len); | ||
72 | |||
73 | return new; | ||
74 | } | ||
75 | 60 | ||
76 | typedef uint32_t cell_t; | 61 | typedef uint32_t cell_t; |
77 | 62 | ||
@@ -140,13 +125,18 @@ int data_is_one_string(struct data d); | |||
140 | #define MAX_NODENAME_LEN 31 | 125 | #define MAX_NODENAME_LEN 31 |
141 | 126 | ||
142 | /* Live trees */ | 127 | /* Live trees */ |
128 | struct label { | ||
129 | char *label; | ||
130 | struct label *next; | ||
131 | }; | ||
132 | |||
143 | struct property { | 133 | struct property { |
144 | char *name; | 134 | char *name; |
145 | struct data val; | 135 | struct data val; |
146 | 136 | ||
147 | struct property *next; | 137 | struct property *next; |
148 | 138 | ||
149 | char *label; | 139 | struct label *labels; |
150 | }; | 140 | }; |
151 | 141 | ||
152 | struct node { | 142 | struct node { |
@@ -163,22 +153,28 @@ struct node { | |||
163 | cell_t phandle; | 153 | cell_t phandle; |
164 | int addr_cells, size_cells; | 154 | int addr_cells, size_cells; |
165 | 155 | ||
166 | char *label; | 156 | struct label *labels; |
167 | }; | 157 | }; |
168 | 158 | ||
159 | #define for_each_label(l0, l) \ | ||
160 | for ((l) = (l0); (l); (l) = (l)->next) | ||
161 | |||
169 | #define for_each_property(n, p) \ | 162 | #define for_each_property(n, p) \ |
170 | for ((p) = (n)->proplist; (p); (p) = (p)->next) | 163 | for ((p) = (n)->proplist; (p); (p) = (p)->next) |
171 | 164 | ||
172 | #define for_each_child(n, c) \ | 165 | #define for_each_child(n, c) \ |
173 | for ((c) = (n)->children; (c); (c) = (c)->next_sibling) | 166 | for ((c) = (n)->children; (c); (c) = (c)->next_sibling) |
174 | 167 | ||
175 | struct property *build_property(char *name, struct data val, char *label); | 168 | void add_label(struct label **labels, char *label); |
169 | |||
170 | struct property *build_property(char *name, struct data val); | ||
176 | struct property *chain_property(struct property *first, struct property *list); | 171 | struct property *chain_property(struct property *first, struct property *list); |
177 | struct property *reverse_properties(struct property *first); | 172 | struct property *reverse_properties(struct property *first); |
178 | 173 | ||
179 | struct node *build_node(struct property *proplist, struct node *children); | 174 | struct node *build_node(struct property *proplist, struct node *children); |
180 | struct node *name_node(struct node *node, char *name, char *label); | 175 | struct node *name_node(struct node *node, char *name); |
181 | struct node *chain_node(struct node *first, struct node *list); | 176 | struct node *chain_node(struct node *first, struct node *list); |
177 | struct node *merge_nodes(struct node *old_node, struct node *new_node); | ||
182 | 178 | ||
183 | void add_property(struct node *node, struct property *prop); | 179 | void add_property(struct node *node, struct property *prop); |
184 | void add_child(struct node *parent, struct node *child); | 180 | void add_child(struct node *parent, struct node *child); |
@@ -186,6 +182,10 @@ void add_child(struct node *parent, struct node *child); | |||
186 | const char *get_unitname(struct node *node); | 182 | const char *get_unitname(struct node *node); |
187 | struct property *get_property(struct node *node, const char *propname); | 183 | struct property *get_property(struct node *node, const char *propname); |
188 | cell_t propval_cell(struct property *prop); | 184 | cell_t propval_cell(struct property *prop); |
185 | struct property *get_property_by_label(struct node *tree, const char *label, | ||
186 | struct node **node); | ||
187 | struct marker *get_marker_label(struct node *tree, const char *label, | ||
188 | struct node **node, struct property **prop); | ||
189 | struct node *get_subnode(struct node *node, const char *nodename); | 189 | struct node *get_subnode(struct node *node, const char *nodename); |
190 | struct node *get_node_by_path(struct node *tree, const char *path); | 190 | struct node *get_node_by_path(struct node *tree, const char *path); |
191 | struct node *get_node_by_label(struct node *tree, const char *label); | 191 | struct node *get_node_by_label(struct node *tree, const char *label); |
@@ -193,6 +193,8 @@ struct node *get_node_by_phandle(struct node *tree, cell_t phandle); | |||
193 | struct node *get_node_by_ref(struct node *tree, const char *ref); | 193 | struct node *get_node_by_ref(struct node *tree, const char *ref); |
194 | cell_t get_node_phandle(struct node *root, struct node *node); | 194 | cell_t get_node_phandle(struct node *root, struct node *node); |
195 | 195 | ||
196 | uint32_t guess_boot_cpuid(struct node *tree); | ||
197 | |||
196 | /* Boot info (tree plus memreserve information */ | 198 | /* Boot info (tree plus memreserve information */ |
197 | 199 | ||
198 | struct reserve_info { | 200 | struct reserve_info { |
@@ -200,10 +202,10 @@ struct reserve_info { | |||
200 | 202 | ||
201 | struct reserve_info *next; | 203 | struct reserve_info *next; |
202 | 204 | ||
203 | char *label; | 205 | struct label *labels; |
204 | }; | 206 | }; |
205 | 207 | ||
206 | struct reserve_info *build_reserve_entry(uint64_t start, uint64_t len, char *label); | 208 | struct reserve_info *build_reserve_entry(uint64_t start, uint64_t len); |
207 | struct reserve_info *chain_reserve_entry(struct reserve_info *first, | 209 | struct reserve_info *chain_reserve_entry(struct reserve_info *first, |
208 | struct reserve_info *list); | 210 | struct reserve_info *list); |
209 | struct reserve_info *add_reserve_entry(struct reserve_info *list, | 211 | struct reserve_info *add_reserve_entry(struct reserve_info *list, |
@@ -218,6 +220,7 @@ struct boot_info { | |||
218 | 220 | ||
219 | struct boot_info *build_boot_info(struct reserve_info *reservelist, | 221 | struct boot_info *build_boot_info(struct reserve_info *reservelist, |
220 | struct node *tree, uint32_t boot_cpuid_phys); | 222 | struct node *tree, uint32_t boot_cpuid_phys); |
223 | void sort_tree(struct boot_info *bi); | ||
221 | 224 | ||
222 | /* Checks */ | 225 | /* Checks */ |
223 | 226 | ||
@@ -239,8 +242,4 @@ struct boot_info *dt_from_source(const char *f); | |||
239 | 242 | ||
240 | struct boot_info *dt_from_fs(const char *dirname); | 243 | struct boot_info *dt_from_fs(const char *dirname); |
241 | 244 | ||
242 | /* misc */ | ||
243 | |||
244 | char *join_path(const char *path, const char *name); | ||
245 | |||
246 | #endif /* _DTC_H */ | 245 | #endif /* _DTC_H */ |
diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c index 76acd28c068..ead0332c87e 100644 --- a/scripts/dtc/flattree.c +++ b/scripts/dtc/flattree.c | |||
@@ -52,9 +52,9 @@ struct emitter { | |||
52 | void (*string)(void *, char *, int); | 52 | void (*string)(void *, char *, int); |
53 | void (*align)(void *, int); | 53 | void (*align)(void *, int); |
54 | void (*data)(void *, struct data); | 54 | void (*data)(void *, struct data); |
55 | void (*beginnode)(void *, const char *); | 55 | void (*beginnode)(void *, struct label *labels); |
56 | void (*endnode)(void *, const char *); | 56 | void (*endnode)(void *, struct label *labels); |
57 | void (*property)(void *, const char *); | 57 | void (*property)(void *, struct label *labels); |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static void bin_emit_cell(void *e, cell_t val) | 60 | static void bin_emit_cell(void *e, cell_t val) |
@@ -89,17 +89,17 @@ static void bin_emit_data(void *e, struct data d) | |||
89 | *dtbuf = data_append_data(*dtbuf, d.val, d.len); | 89 | *dtbuf = data_append_data(*dtbuf, d.val, d.len); |
90 | } | 90 | } |
91 | 91 | ||
92 | static void bin_emit_beginnode(void *e, const char *label) | 92 | static void bin_emit_beginnode(void *e, struct label *labels) |
93 | { | 93 | { |
94 | bin_emit_cell(e, FDT_BEGIN_NODE); | 94 | bin_emit_cell(e, FDT_BEGIN_NODE); |
95 | } | 95 | } |
96 | 96 | ||
97 | static void bin_emit_endnode(void *e, const char *label) | 97 | static void bin_emit_endnode(void *e, struct label *labels) |
98 | { | 98 | { |
99 | bin_emit_cell(e, FDT_END_NODE); | 99 | bin_emit_cell(e, FDT_END_NODE); |
100 | } | 100 | } |
101 | 101 | ||
102 | static void bin_emit_property(void *e, const char *label) | 102 | static void bin_emit_property(void *e, struct label *labels) |
103 | { | 103 | { |
104 | bin_emit_cell(e, FDT_PROP); | 104 | bin_emit_cell(e, FDT_PROP); |
105 | } | 105 | } |
@@ -127,11 +127,21 @@ static void emit_offset_label(FILE *f, const char *label, int offset) | |||
127 | fprintf(f, "%s\t= . + %d\n", label, offset); | 127 | fprintf(f, "%s\t= . + %d\n", label, offset); |
128 | } | 128 | } |
129 | 129 | ||
130 | #define ASM_EMIT_BELONG(f, fmt, ...) \ | ||
131 | { \ | ||
132 | fprintf((f), "\t.byte\t((" fmt ") >> 24) & 0xff\n", __VA_ARGS__); \ | ||
133 | fprintf((f), "\t.byte\t((" fmt ") >> 16) & 0xff\n", __VA_ARGS__); \ | ||
134 | fprintf((f), "\t.byte\t((" fmt ") >> 8) & 0xff\n", __VA_ARGS__); \ | ||
135 | fprintf((f), "\t.byte\t(" fmt ") & 0xff\n", __VA_ARGS__); \ | ||
136 | } | ||
137 | |||
130 | static void asm_emit_cell(void *e, cell_t val) | 138 | static void asm_emit_cell(void *e, cell_t val) |
131 | { | 139 | { |
132 | FILE *f = e; | 140 | FILE *f = e; |
133 | 141 | ||
134 | fprintf(f, "\t.long\t0x%x\n", val); | 142 | fprintf(f, "\t.byte 0x%02x; .byte 0x%02x; .byte 0x%02x; .byte 0x%02x\n", |
143 | (val >> 24) & 0xff, (val >> 16) & 0xff, | ||
144 | (val >> 8) & 0xff, val & 0xff); | ||
135 | } | 145 | } |
136 | 146 | ||
137 | static void asm_emit_string(void *e, char *str, int len) | 147 | static void asm_emit_string(void *e, char *str, int len) |
@@ -156,7 +166,7 @@ static void asm_emit_align(void *e, int a) | |||
156 | { | 166 | { |
157 | FILE *f = e; | 167 | FILE *f = e; |
158 | 168 | ||
159 | fprintf(f, "\t.balign\t%d\n", a); | 169 | fprintf(f, "\t.balign\t%d, 0\n", a); |
160 | } | 170 | } |
161 | 171 | ||
162 | static void asm_emit_data(void *e, struct data d) | 172 | static void asm_emit_data(void *e, struct data d) |
@@ -169,8 +179,7 @@ static void asm_emit_data(void *e, struct data d) | |||
169 | emit_offset_label(f, m->ref, m->offset); | 179 | emit_offset_label(f, m->ref, m->offset); |
170 | 180 | ||
171 | while ((d.len - off) >= sizeof(uint32_t)) { | 181 | while ((d.len - off) >= sizeof(uint32_t)) { |
172 | fprintf(f, "\t.long\t0x%x\n", | 182 | asm_emit_cell(e, fdt32_to_cpu(*((uint32_t *)(d.val+off)))); |
173 | fdt32_to_cpu(*((uint32_t *)(d.val+off)))); | ||
174 | off += sizeof(uint32_t); | 183 | off += sizeof(uint32_t); |
175 | } | 184 | } |
176 | 185 | ||
@@ -182,37 +191,43 @@ static void asm_emit_data(void *e, struct data d) | |||
182 | assert(off == d.len); | 191 | assert(off == d.len); |
183 | } | 192 | } |
184 | 193 | ||
185 | static void asm_emit_beginnode(void *e, const char *label) | 194 | static void asm_emit_beginnode(void *e, struct label *labels) |
186 | { | 195 | { |
187 | FILE *f = e; | 196 | FILE *f = e; |
197 | struct label *l; | ||
188 | 198 | ||
189 | if (label) { | 199 | for_each_label(labels, l) { |
190 | fprintf(f, "\t.globl\t%s\n", label); | 200 | fprintf(f, "\t.globl\t%s\n", l->label); |
191 | fprintf(f, "%s:\n", label); | 201 | fprintf(f, "%s:\n", l->label); |
192 | } | 202 | } |
193 | fprintf(f, "\t.long\tFDT_BEGIN_NODE\n"); | 203 | fprintf(f, "\t/* FDT_BEGIN_NODE */\n"); |
204 | asm_emit_cell(e, FDT_BEGIN_NODE); | ||
194 | } | 205 | } |
195 | 206 | ||
196 | static void asm_emit_endnode(void *e, const char *label) | 207 | static void asm_emit_endnode(void *e, struct label *labels) |
197 | { | 208 | { |
198 | FILE *f = e; | 209 | FILE *f = e; |
210 | struct label *l; | ||
199 | 211 | ||
200 | fprintf(f, "\t.long\tFDT_END_NODE\n"); | 212 | fprintf(f, "\t/* FDT_END_NODE */\n"); |
201 | if (label) { | 213 | asm_emit_cell(e, FDT_END_NODE); |
202 | fprintf(f, "\t.globl\t%s_end\n", label); | 214 | for_each_label(labels, l) { |
203 | fprintf(f, "%s_end:\n", label); | 215 | fprintf(f, "\t.globl\t%s_end\n", l->label); |
216 | fprintf(f, "%s_end:\n", l->label); | ||
204 | } | 217 | } |
205 | } | 218 | } |
206 | 219 | ||
207 | static void asm_emit_property(void *e, const char *label) | 220 | static void asm_emit_property(void *e, struct label *labels) |
208 | { | 221 | { |
209 | FILE *f = e; | 222 | FILE *f = e; |
223 | struct label *l; | ||
210 | 224 | ||
211 | if (label) { | 225 | for_each_label(labels, l) { |
212 | fprintf(f, "\t.globl\t%s\n", label); | 226 | fprintf(f, "\t.globl\t%s\n", l->label); |
213 | fprintf(f, "%s:\n", label); | 227 | fprintf(f, "%s:\n", l->label); |
214 | } | 228 | } |
215 | fprintf(f, "\t.long\tFDT_PROP\n"); | 229 | fprintf(f, "\t/* FDT_PROP */\n"); |
230 | asm_emit_cell(e, FDT_PROP); | ||
216 | } | 231 | } |
217 | 232 | ||
218 | static struct emitter asm_emitter = { | 233 | static struct emitter asm_emitter = { |
@@ -248,7 +263,7 @@ static void flatten_tree(struct node *tree, struct emitter *emit, | |||
248 | struct node *child; | 263 | struct node *child; |
249 | int seen_name_prop = 0; | 264 | int seen_name_prop = 0; |
250 | 265 | ||
251 | emit->beginnode(etarget, tree->label); | 266 | emit->beginnode(etarget, tree->labels); |
252 | 267 | ||
253 | if (vi->flags & FTF_FULLPATH) | 268 | if (vi->flags & FTF_FULLPATH) |
254 | emit->string(etarget, tree->fullpath, 0); | 269 | emit->string(etarget, tree->fullpath, 0); |
@@ -265,7 +280,7 @@ static void flatten_tree(struct node *tree, struct emitter *emit, | |||
265 | 280 | ||
266 | nameoff = stringtable_insert(strbuf, prop->name); | 281 | nameoff = stringtable_insert(strbuf, prop->name); |
267 | 282 | ||
268 | emit->property(etarget, prop->label); | 283 | emit->property(etarget, prop->labels); |
269 | emit->cell(etarget, prop->val.len); | 284 | emit->cell(etarget, prop->val.len); |
270 | emit->cell(etarget, nameoff); | 285 | emit->cell(etarget, nameoff); |
271 | 286 | ||
@@ -292,7 +307,7 @@ static void flatten_tree(struct node *tree, struct emitter *emit, | |||
292 | flatten_tree(child, emit, etarget, strbuf, vi); | 307 | flatten_tree(child, emit, etarget, strbuf, vi); |
293 | } | 308 | } |
294 | 309 | ||
295 | emit->endnode(etarget, tree->label); | 310 | emit->endnode(etarget, tree->labels); |
296 | } | 311 | } |
297 | 312 | ||
298 | static struct data flatten_reserve_list(struct reserve_info *reservelist, | 313 | static struct data flatten_reserve_list(struct reserve_info *reservelist, |
@@ -413,10 +428,13 @@ void dt_to_blob(FILE *f, struct boot_info *bi, int version) | |||
413 | if (padlen > 0) | 428 | if (padlen > 0) |
414 | blob = data_append_zeroes(blob, padlen); | 429 | blob = data_append_zeroes(blob, padlen); |
415 | 430 | ||
416 | fwrite(blob.val, blob.len, 1, f); | 431 | if (fwrite(blob.val, blob.len, 1, f) != 1) { |
417 | 432 | if (ferror(f)) | |
418 | if (ferror(f)) | 433 | die("Error writing device tree blob: %s\n", |
419 | die("Error writing device tree blob: %s\n", strerror(errno)); | 434 | strerror(errno)); |
435 | else | ||
436 | die("Short write on device tree blob\n"); | ||
437 | } | ||
420 | 438 | ||
421 | /* | 439 | /* |
422 | * data_merge() frees the right-hand element so only the blob | 440 | * data_merge() frees the right-hand element so only the blob |
@@ -455,39 +473,44 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int version) | |||
455 | die("Unknown device tree blob version %d\n", version); | 473 | die("Unknown device tree blob version %d\n", version); |
456 | 474 | ||
457 | fprintf(f, "/* autogenerated by dtc, do not edit */\n\n"); | 475 | fprintf(f, "/* autogenerated by dtc, do not edit */\n\n"); |
458 | fprintf(f, "#define FDT_MAGIC 0x%x\n", FDT_MAGIC); | ||
459 | fprintf(f, "#define FDT_BEGIN_NODE 0x%x\n", FDT_BEGIN_NODE); | ||
460 | fprintf(f, "#define FDT_END_NODE 0x%x\n", FDT_END_NODE); | ||
461 | fprintf(f, "#define FDT_PROP 0x%x\n", FDT_PROP); | ||
462 | fprintf(f, "#define FDT_END 0x%x\n", FDT_END); | ||
463 | fprintf(f, "\n"); | ||
464 | 476 | ||
465 | emit_label(f, symprefix, "blob_start"); | 477 | emit_label(f, symprefix, "blob_start"); |
466 | emit_label(f, symprefix, "header"); | 478 | emit_label(f, symprefix, "header"); |
467 | fprintf(f, "\t.long\tFDT_MAGIC\t\t\t\t/* magic */\n"); | 479 | fprintf(f, "\t/* magic */\n"); |
468 | fprintf(f, "\t.long\t_%s_blob_abs_end - _%s_blob_start\t/* totalsize */\n", | 480 | asm_emit_cell(f, FDT_MAGIC); |
469 | symprefix, symprefix); | 481 | fprintf(f, "\t/* totalsize */\n"); |
470 | fprintf(f, "\t.long\t_%s_struct_start - _%s_blob_start\t/* off_dt_struct */\n", | 482 | ASM_EMIT_BELONG(f, "_%s_blob_abs_end - _%s_blob_start", |
483 | symprefix, symprefix); | ||
484 | fprintf(f, "\t/* off_dt_struct */\n"); | ||
485 | ASM_EMIT_BELONG(f, "_%s_struct_start - _%s_blob_start", | ||
471 | symprefix, symprefix); | 486 | symprefix, symprefix); |
472 | fprintf(f, "\t.long\t_%s_strings_start - _%s_blob_start\t/* off_dt_strings */\n", | 487 | fprintf(f, "\t/* off_dt_strings */\n"); |
488 | ASM_EMIT_BELONG(f, "_%s_strings_start - _%s_blob_start", | ||
473 | symprefix, symprefix); | 489 | symprefix, symprefix); |
474 | fprintf(f, "\t.long\t_%s_reserve_map - _%s_blob_start\t/* off_dt_strings */\n", | 490 | fprintf(f, "\t/* off_mem_rsvmap */\n"); |
491 | ASM_EMIT_BELONG(f, "_%s_reserve_map - _%s_blob_start", | ||
475 | symprefix, symprefix); | 492 | symprefix, symprefix); |
476 | fprintf(f, "\t.long\t%d\t\t\t\t\t/* version */\n", vi->version); | 493 | fprintf(f, "\t/* version */\n"); |
477 | fprintf(f, "\t.long\t%d\t\t\t\t\t/* last_comp_version */\n", | 494 | asm_emit_cell(f, vi->version); |
478 | vi->last_comp_version); | 495 | fprintf(f, "\t/* last_comp_version */\n"); |
479 | 496 | asm_emit_cell(f, vi->last_comp_version); | |
480 | if (vi->flags & FTF_BOOTCPUID) | 497 | |
481 | fprintf(f, "\t.long\t%i\t\t\t\t\t/* boot_cpuid_phys */\n", | 498 | if (vi->flags & FTF_BOOTCPUID) { |
482 | bi->boot_cpuid_phys); | 499 | fprintf(f, "\t/* boot_cpuid_phys */\n"); |
500 | asm_emit_cell(f, bi->boot_cpuid_phys); | ||
501 | } | ||
483 | 502 | ||
484 | if (vi->flags & FTF_STRTABSIZE) | 503 | if (vi->flags & FTF_STRTABSIZE) { |
485 | fprintf(f, "\t.long\t_%s_strings_end - _%s_strings_start\t/* size_dt_strings */\n", | 504 | fprintf(f, "\t/* size_dt_strings */\n"); |
486 | symprefix, symprefix); | 505 | ASM_EMIT_BELONG(f, "_%s_strings_end - _%s_strings_start", |
506 | symprefix, symprefix); | ||
507 | } | ||
487 | 508 | ||
488 | if (vi->flags & FTF_STRUCTSIZE) | 509 | if (vi->flags & FTF_STRUCTSIZE) { |
489 | fprintf(f, "\t.long\t_%s_struct_end - _%s_struct_start\t/* size_dt_struct */\n", | 510 | fprintf(f, "\t/* size_dt_struct */\n"); |
511 | ASM_EMIT_BELONG(f, "_%s_struct_end - _%s_struct_start", | ||
490 | symprefix, symprefix); | 512 | symprefix, symprefix); |
513 | } | ||
491 | 514 | ||
492 | /* | 515 | /* |
493 | * Reserve map entries. | 516 | * Reserve map entries. |
@@ -505,16 +528,17 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int version) | |||
505 | * as it appears .quad isn't available in some assemblers. | 528 | * as it appears .quad isn't available in some assemblers. |
506 | */ | 529 | */ |
507 | for (re = bi->reservelist; re; re = re->next) { | 530 | for (re = bi->reservelist; re; re = re->next) { |
508 | if (re->label) { | 531 | struct label *l; |
509 | fprintf(f, "\t.globl\t%s\n", re->label); | 532 | |
510 | fprintf(f, "%s:\n", re->label); | 533 | for_each_label(re->labels, l) { |
534 | fprintf(f, "\t.globl\t%s\n", l->label); | ||
535 | fprintf(f, "%s:\n", l->label); | ||
511 | } | 536 | } |
512 | fprintf(f, "\t.long\t0x%08x, 0x%08x\n", | 537 | ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->re.address >> 32)); |
513 | (unsigned int)(re->re.address >> 32), | 538 | ASM_EMIT_BELONG(f, "0x%08x", |
514 | (unsigned int)(re->re.address & 0xffffffff)); | 539 | (unsigned int)(re->re.address & 0xffffffff)); |
515 | fprintf(f, "\t.long\t0x%08x, 0x%08x\n", | 540 | ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->re.size >> 32)); |
516 | (unsigned int)(re->re.size >> 32), | 541 | ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->re.size & 0xffffffff)); |
517 | (unsigned int)(re->re.size & 0xffffffff)); | ||
518 | } | 542 | } |
519 | for (i = 0; i < reservenum; i++) { | 543 | for (i = 0; i < reservenum; i++) { |
520 | fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n"); | 544 | fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n"); |
@@ -524,7 +548,9 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int version) | |||
524 | 548 | ||
525 | emit_label(f, symprefix, "struct_start"); | 549 | emit_label(f, symprefix, "struct_start"); |
526 | flatten_tree(bi->dt, &asm_emitter, f, &strbuf, vi); | 550 | flatten_tree(bi->dt, &asm_emitter, f, &strbuf, vi); |
527 | fprintf(f, "\t.long\tFDT_END\n"); | 551 | |
552 | fprintf(f, "\t/* FDT_END */\n"); | ||
553 | asm_emit_cell(f, FDT_END); | ||
528 | emit_label(f, symprefix, "struct_end"); | 554 | emit_label(f, symprefix, "struct_end"); |
529 | 555 | ||
530 | emit_label(f, symprefix, "strings_start"); | 556 | emit_label(f, symprefix, "strings_start"); |
@@ -601,7 +627,7 @@ static char *flat_read_string(struct inbuf *inb) | |||
601 | len++; | 627 | len++; |
602 | } while ((*p++) != '\0'); | 628 | } while ((*p++) != '\0'); |
603 | 629 | ||
604 | str = strdup(inb->ptr); | 630 | str = xstrdup(inb->ptr); |
605 | 631 | ||
606 | inb->ptr += len; | 632 | inb->ptr += len; |
607 | 633 | ||
@@ -643,7 +669,7 @@ static char *flat_read_stringtable(struct inbuf *inb, int offset) | |||
643 | p++; | 669 | p++; |
644 | } | 670 | } |
645 | 671 | ||
646 | return strdup(inb->base + offset); | 672 | return xstrdup(inb->base + offset); |
647 | } | 673 | } |
648 | 674 | ||
649 | static struct property *flat_read_property(struct inbuf *dtbuf, | 675 | static struct property *flat_read_property(struct inbuf *dtbuf, |
@@ -663,7 +689,7 @@ static struct property *flat_read_property(struct inbuf *dtbuf, | |||
663 | 689 | ||
664 | val = flat_read_data(dtbuf, proplen); | 690 | val = flat_read_data(dtbuf, proplen); |
665 | 691 | ||
666 | return build_property(name, val, NULL); | 692 | return build_property(name, val); |
667 | } | 693 | } |
668 | 694 | ||
669 | 695 | ||
@@ -688,7 +714,7 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb) | |||
688 | if (re.size == 0) | 714 | if (re.size == 0) |
689 | break; | 715 | break; |
690 | 716 | ||
691 | new = build_reserve_entry(re.address, re.size, NULL); | 717 | new = build_reserve_entry(re.address, re.size); |
692 | reservelist = add_reserve_entry(reservelist, new); | 718 | reservelist = add_reserve_entry(reservelist, new); |
693 | } | 719 | } |
694 | 720 | ||
@@ -710,7 +736,7 @@ static char *nodename_from_path(const char *ppath, const char *cpath) | |||
710 | if (!streq(ppath, "/")) | 736 | if (!streq(ppath, "/")) |
711 | plen++; | 737 | plen++; |
712 | 738 | ||
713 | return strdup(cpath + plen); | 739 | return xstrdup(cpath + plen); |
714 | } | 740 | } |
715 | 741 | ||
716 | static struct node *unflatten_tree(struct inbuf *dtbuf, | 742 | static struct node *unflatten_tree(struct inbuf *dtbuf, |
@@ -776,7 +802,7 @@ static struct node *unflatten_tree(struct inbuf *dtbuf, | |||
776 | 802 | ||
777 | struct boot_info *dt_from_blob(const char *fname) | 803 | struct boot_info *dt_from_blob(const char *fname) |
778 | { | 804 | { |
779 | struct dtc_file *dtcf; | 805 | FILE *f; |
780 | uint32_t magic, totalsize, version, size_dt, boot_cpuid_phys; | 806 | uint32_t magic, totalsize, version, size_dt, boot_cpuid_phys; |
781 | uint32_t off_dt, off_str, off_mem_rsvmap; | 807 | uint32_t off_dt, off_str, off_mem_rsvmap; |
782 | int rc; | 808 | int rc; |
@@ -791,14 +817,14 @@ struct boot_info *dt_from_blob(const char *fname) | |||
791 | uint32_t val; | 817 | uint32_t val; |
792 | int flags = 0; | 818 | int flags = 0; |
793 | 819 | ||
794 | dtcf = dtc_open_file(fname, NULL); | 820 | f = srcfile_relative_open(fname, NULL); |
795 | 821 | ||
796 | rc = fread(&magic, sizeof(magic), 1, dtcf->file); | 822 | rc = fread(&magic, sizeof(magic), 1, f); |
797 | if (ferror(dtcf->file)) | 823 | if (ferror(f)) |
798 | die("Error reading DT blob magic number: %s\n", | 824 | die("Error reading DT blob magic number: %s\n", |
799 | strerror(errno)); | 825 | strerror(errno)); |
800 | if (rc < 1) { | 826 | if (rc < 1) { |
801 | if (feof(dtcf->file)) | 827 | if (feof(f)) |
802 | die("EOF reading DT blob magic number\n"); | 828 | die("EOF reading DT blob magic number\n"); |
803 | else | 829 | else |
804 | die("Mysterious short read reading magic number\n"); | 830 | die("Mysterious short read reading magic number\n"); |
@@ -808,11 +834,11 @@ struct boot_info *dt_from_blob(const char *fname) | |||
808 | if (magic != FDT_MAGIC) | 834 | if (magic != FDT_MAGIC) |
809 | die("Blob has incorrect magic number\n"); | 835 | die("Blob has incorrect magic number\n"); |
810 | 836 | ||
811 | rc = fread(&totalsize, sizeof(totalsize), 1, dtcf->file); | 837 | rc = fread(&totalsize, sizeof(totalsize), 1, f); |
812 | if (ferror(dtcf->file)) | 838 | if (ferror(f)) |
813 | die("Error reading DT blob size: %s\n", strerror(errno)); | 839 | die("Error reading DT blob size: %s\n", strerror(errno)); |
814 | if (rc < 1) { | 840 | if (rc < 1) { |
815 | if (feof(dtcf->file)) | 841 | if (feof(f)) |
816 | die("EOF reading DT blob size\n"); | 842 | die("EOF reading DT blob size\n"); |
817 | else | 843 | else |
818 | die("Mysterious short read reading blob size\n"); | 844 | die("Mysterious short read reading blob size\n"); |
@@ -832,12 +858,12 @@ struct boot_info *dt_from_blob(const char *fname) | |||
832 | p = blob + sizeof(magic) + sizeof(totalsize); | 858 | p = blob + sizeof(magic) + sizeof(totalsize); |
833 | 859 | ||
834 | while (sizeleft) { | 860 | while (sizeleft) { |
835 | if (feof(dtcf->file)) | 861 | if (feof(f)) |
836 | die("EOF before reading %d bytes of DT blob\n", | 862 | die("EOF before reading %d bytes of DT blob\n", |
837 | totalsize); | 863 | totalsize); |
838 | 864 | ||
839 | rc = fread(p, 1, sizeleft, dtcf->file); | 865 | rc = fread(p, 1, sizeleft, f); |
840 | if (ferror(dtcf->file)) | 866 | if (ferror(f)) |
841 | die("Error reading DT blob: %s\n", | 867 | die("Error reading DT blob: %s\n", |
842 | strerror(errno)); | 868 | strerror(errno)); |
843 | 869 | ||
@@ -900,7 +926,7 @@ struct boot_info *dt_from_blob(const char *fname) | |||
900 | 926 | ||
901 | free(blob); | 927 | free(blob); |
902 | 928 | ||
903 | dtc_close_file(dtcf); | 929 | fclose(f); |
904 | 930 | ||
905 | return build_boot_info(reservelist, tree, boot_cpuid_phys); | 931 | return build_boot_info(reservelist, tree, boot_cpuid_phys); |
906 | } | 932 | } |
diff --git a/scripts/dtc/fstree.c b/scripts/dtc/fstree.c index 766b2694d93..f3774530170 100644 --- a/scripts/dtc/fstree.c +++ b/scripts/dtc/fstree.c | |||
@@ -58,10 +58,9 @@ static struct node *read_fstree(const char *dirname) | |||
58 | "WARNING: Cannot open %s: %s\n", | 58 | "WARNING: Cannot open %s: %s\n", |
59 | tmpnam, strerror(errno)); | 59 | tmpnam, strerror(errno)); |
60 | } else { | 60 | } else { |
61 | prop = build_property(strdup(de->d_name), | 61 | prop = build_property(xstrdup(de->d_name), |
62 | data_copy_file(pfile, | 62 | data_copy_file(pfile, |
63 | st.st_size), | 63 | st.st_size)); |
64 | NULL); | ||
65 | add_property(tree, prop); | 64 | add_property(tree, prop); |
66 | fclose(pfile); | 65 | fclose(pfile); |
67 | } | 66 | } |
@@ -69,14 +68,14 @@ static struct node *read_fstree(const char *dirname) | |||
69 | struct node *newchild; | 68 | struct node *newchild; |
70 | 69 | ||
71 | newchild = read_fstree(tmpnam); | 70 | newchild = read_fstree(tmpnam); |
72 | newchild = name_node(newchild, strdup(de->d_name), | 71 | newchild = name_node(newchild, xstrdup(de->d_name)); |
73 | NULL); | ||
74 | add_child(tree, newchild); | 72 | add_child(tree, newchild); |
75 | } | 73 | } |
76 | 74 | ||
77 | free(tmpnam); | 75 | free(tmpnam); |
78 | } | 76 | } |
79 | 77 | ||
78 | closedir(d); | ||
80 | return tree; | 79 | return tree; |
81 | } | 80 | } |
82 | 81 | ||
@@ -85,8 +84,8 @@ struct boot_info *dt_from_fs(const char *dirname) | |||
85 | struct node *tree; | 84 | struct node *tree; |
86 | 85 | ||
87 | tree = read_fstree(dirname); | 86 | tree = read_fstree(dirname); |
88 | tree = name_node(tree, "", NULL); | 87 | tree = name_node(tree, ""); |
89 | 88 | ||
90 | return build_boot_info(NULL, tree, 0); | 89 | return build_boot_info(NULL, tree, guess_boot_cpuid(tree)); |
91 | } | 90 | } |
92 | 91 | ||
diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c index 0ca3de550b3..c9209d5c999 100644 --- a/scripts/dtc/livetree.c +++ b/scripts/dtc/livetree.c | |||
@@ -24,17 +24,30 @@ | |||
24 | * Tree building functions | 24 | * Tree building functions |
25 | */ | 25 | */ |
26 | 26 | ||
27 | struct property *build_property(char *name, struct data val, char *label) | 27 | void add_label(struct label **labels, char *label) |
28 | { | ||
29 | struct label *new; | ||
30 | |||
31 | /* Make sure the label isn't already there */ | ||
32 | for_each_label(*labels, new) | ||
33 | if (streq(new->label, label)) | ||
34 | return; | ||
35 | |||
36 | new = xmalloc(sizeof(*new)); | ||
37 | new->label = label; | ||
38 | new->next = *labels; | ||
39 | *labels = new; | ||
40 | } | ||
41 | |||
42 | struct property *build_property(char *name, struct data val) | ||
28 | { | 43 | { |
29 | struct property *new = xmalloc(sizeof(*new)); | 44 | struct property *new = xmalloc(sizeof(*new)); |
30 | 45 | ||
46 | memset(new, 0, sizeof(*new)); | ||
47 | |||
31 | new->name = name; | 48 | new->name = name; |
32 | new->val = val; | 49 | new->val = val; |
33 | 50 | ||
34 | new->next = NULL; | ||
35 | |||
36 | new->label = label; | ||
37 | |||
38 | return new; | 51 | return new; |
39 | } | 52 | } |
40 | 53 | ||
@@ -78,17 +91,82 @@ struct node *build_node(struct property *proplist, struct node *children) | |||
78 | return new; | 91 | return new; |
79 | } | 92 | } |
80 | 93 | ||
81 | struct node *name_node(struct node *node, char *name, char * label) | 94 | struct node *name_node(struct node *node, char *name) |
82 | { | 95 | { |
83 | assert(node->name == NULL); | 96 | assert(node->name == NULL); |
84 | 97 | ||
85 | node->name = name; | 98 | node->name = name; |
86 | 99 | ||
87 | node->label = label; | ||
88 | |||
89 | return node; | 100 | return node; |
90 | } | 101 | } |
91 | 102 | ||
103 | struct node *merge_nodes(struct node *old_node, struct node *new_node) | ||
104 | { | ||
105 | struct property *new_prop, *old_prop; | ||
106 | struct node *new_child, *old_child; | ||
107 | struct label *l; | ||
108 | |||
109 | /* Add new node labels to old node */ | ||
110 | for_each_label(new_node->labels, l) | ||
111 | add_label(&old_node->labels, l->label); | ||
112 | |||
113 | /* Move properties from the new node to the old node. If there | ||
114 | * is a collision, replace the old value with the new */ | ||
115 | while (new_node->proplist) { | ||
116 | /* Pop the property off the list */ | ||
117 | new_prop = new_node->proplist; | ||
118 | new_node->proplist = new_prop->next; | ||
119 | new_prop->next = NULL; | ||
120 | |||
121 | /* Look for a collision, set new value if there is */ | ||
122 | for_each_property(old_node, old_prop) { | ||
123 | if (streq(old_prop->name, new_prop->name)) { | ||
124 | /* Add new labels to old property */ | ||
125 | for_each_label(new_prop->labels, l) | ||
126 | add_label(&old_prop->labels, l->label); | ||
127 | |||
128 | old_prop->val = new_prop->val; | ||
129 | free(new_prop); | ||
130 | new_prop = NULL; | ||
131 | break; | ||
132 | } | ||
133 | } | ||
134 | |||
135 | /* if no collision occurred, add property to the old node. */ | ||
136 | if (new_prop) | ||
137 | add_property(old_node, new_prop); | ||
138 | } | ||
139 | |||
140 | /* Move the override child nodes into the primary node. If | ||
141 | * there is a collision, then merge the nodes. */ | ||
142 | while (new_node->children) { | ||
143 | /* Pop the child node off the list */ | ||
144 | new_child = new_node->children; | ||
145 | new_node->children = new_child->next_sibling; | ||
146 | new_child->parent = NULL; | ||
147 | new_child->next_sibling = NULL; | ||
148 | |||
149 | /* Search for a collision. Merge if there is */ | ||
150 | for_each_child(old_node, old_child) { | ||
151 | if (streq(old_child->name, new_child->name)) { | ||
152 | merge_nodes(old_child, new_child); | ||
153 | new_child = NULL; | ||
154 | break; | ||
155 | } | ||
156 | } | ||
157 | |||
158 | /* if no collision occured, add child to the old node. */ | ||
159 | if (new_child) | ||
160 | add_child(old_node, new_child); | ||
161 | } | ||
162 | |||
163 | /* The new node contents are now merged into the old node. Free | ||
164 | * the new node. */ | ||
165 | free(new_node); | ||
166 | |||
167 | return old_node; | ||
168 | } | ||
169 | |||
92 | struct node *chain_node(struct node *first, struct node *list) | 170 | struct node *chain_node(struct node *first, struct node *list) |
93 | { | 171 | { |
94 | assert(first->next_sibling == NULL); | 172 | assert(first->next_sibling == NULL); |
@@ -124,18 +202,15 @@ void add_child(struct node *parent, struct node *child) | |||
124 | *p = child; | 202 | *p = child; |
125 | } | 203 | } |
126 | 204 | ||
127 | struct reserve_info *build_reserve_entry(uint64_t address, uint64_t size, | 205 | struct reserve_info *build_reserve_entry(uint64_t address, uint64_t size) |
128 | char *label) | ||
129 | { | 206 | { |
130 | struct reserve_info *new = xmalloc(sizeof(*new)); | 207 | struct reserve_info *new = xmalloc(sizeof(*new)); |
131 | 208 | ||
209 | memset(new, 0, sizeof(*new)); | ||
210 | |||
132 | new->re.address = address; | 211 | new->re.address = address; |
133 | new->re.size = size; | 212 | new->re.size = size; |
134 | 213 | ||
135 | new->next = NULL; | ||
136 | |||
137 | new->label = label; | ||
138 | |||
139 | return new; | 214 | return new; |
140 | } | 215 | } |
141 | 216 | ||
@@ -208,6 +283,60 @@ cell_t propval_cell(struct property *prop) | |||
208 | return fdt32_to_cpu(*((cell_t *)prop->val.val)); | 283 | return fdt32_to_cpu(*((cell_t *)prop->val.val)); |
209 | } | 284 | } |
210 | 285 | ||
286 | struct property *get_property_by_label(struct node *tree, const char *label, | ||
287 | struct node **node) | ||
288 | { | ||
289 | struct property *prop; | ||
290 | struct node *c; | ||
291 | |||
292 | *node = tree; | ||
293 | |||
294 | for_each_property(tree, prop) { | ||
295 | struct label *l; | ||
296 | |||
297 | for_each_label(prop->labels, l) | ||
298 | if (streq(l->label, label)) | ||
299 | return prop; | ||
300 | } | ||
301 | |||
302 | for_each_child(tree, c) { | ||
303 | prop = get_property_by_label(c, label, node); | ||
304 | if (prop) | ||
305 | return prop; | ||
306 | } | ||
307 | |||
308 | *node = NULL; | ||
309 | return NULL; | ||
310 | } | ||
311 | |||
312 | struct marker *get_marker_label(struct node *tree, const char *label, | ||
313 | struct node **node, struct property **prop) | ||
314 | { | ||
315 | struct marker *m; | ||
316 | struct property *p; | ||
317 | struct node *c; | ||
318 | |||
319 | *node = tree; | ||
320 | |||
321 | for_each_property(tree, p) { | ||
322 | *prop = p; | ||
323 | m = p->val.markers; | ||
324 | for_each_marker_of_type(m, LABEL) | ||
325 | if (streq(m->ref, label)) | ||
326 | return m; | ||
327 | } | ||
328 | |||
329 | for_each_child(tree, c) { | ||
330 | m = get_marker_label(c, label, node, prop); | ||
331 | if (m) | ||
332 | return m; | ||
333 | } | ||
334 | |||
335 | *prop = NULL; | ||
336 | *node = NULL; | ||
337 | return NULL; | ||
338 | } | ||
339 | |||
211 | struct node *get_subnode(struct node *node, const char *nodename) | 340 | struct node *get_subnode(struct node *node, const char *nodename) |
212 | { | 341 | { |
213 | struct node *child; | 342 | struct node *child; |
@@ -245,11 +374,13 @@ struct node *get_node_by_path(struct node *tree, const char *path) | |||
245 | struct node *get_node_by_label(struct node *tree, const char *label) | 374 | struct node *get_node_by_label(struct node *tree, const char *label) |
246 | { | 375 | { |
247 | struct node *child, *node; | 376 | struct node *child, *node; |
377 | struct label *l; | ||
248 | 378 | ||
249 | assert(label && (strlen(label) > 0)); | 379 | assert(label && (strlen(label) > 0)); |
250 | 380 | ||
251 | if (tree->label && streq(tree->label, label)) | 381 | for_each_label(tree->labels, l) |
252 | return tree; | 382 | if (streq(l->label, label)) |
383 | return tree; | ||
253 | 384 | ||
254 | for_each_child(tree, child) { | 385 | for_each_child(tree, child) { |
255 | node = get_node_by_label(child, label); | 386 | node = get_node_by_label(child, label); |
@@ -293,16 +424,186 @@ cell_t get_node_phandle(struct node *root, struct node *node) | |||
293 | if ((node->phandle != 0) && (node->phandle != -1)) | 424 | if ((node->phandle != 0) && (node->phandle != -1)) |
294 | return node->phandle; | 425 | return node->phandle; |
295 | 426 | ||
296 | assert(! get_property(node, "linux,phandle")); | ||
297 | |||
298 | while (get_node_by_phandle(root, phandle)) | 427 | while (get_node_by_phandle(root, phandle)) |
299 | phandle++; | 428 | phandle++; |
300 | 429 | ||
301 | node->phandle = phandle; | 430 | node->phandle = phandle; |
302 | add_property(node, | 431 | |
303 | build_property("linux,phandle", | 432 | if (!get_property(node, "linux,phandle") |
304 | data_append_cell(empty_data, phandle), | 433 | && (phandle_format & PHANDLE_LEGACY)) |
305 | NULL)); | 434 | add_property(node, |
435 | build_property("linux,phandle", | ||
436 | data_append_cell(empty_data, phandle))); | ||
437 | |||
438 | if (!get_property(node, "phandle") | ||
439 | && (phandle_format & PHANDLE_EPAPR)) | ||
440 | add_property(node, | ||
441 | build_property("phandle", | ||
442 | data_append_cell(empty_data, phandle))); | ||
443 | |||
444 | /* If the node *does* have a phandle property, we must | ||
445 | * be dealing with a self-referencing phandle, which will be | ||
446 | * fixed up momentarily in the caller */ | ||
306 | 447 | ||
307 | return node->phandle; | 448 | return node->phandle; |
308 | } | 449 | } |
450 | |||
451 | uint32_t guess_boot_cpuid(struct node *tree) | ||
452 | { | ||
453 | struct node *cpus, *bootcpu; | ||
454 | struct property *reg; | ||
455 | |||
456 | cpus = get_node_by_path(tree, "/cpus"); | ||
457 | if (!cpus) | ||
458 | return 0; | ||
459 | |||
460 | |||
461 | bootcpu = cpus->children; | ||
462 | if (!bootcpu) | ||
463 | return 0; | ||
464 | |||
465 | reg = get_property(bootcpu, "reg"); | ||
466 | if (!reg || (reg->val.len != sizeof(uint32_t))) | ||
467 | return 0; | ||
468 | |||
469 | /* FIXME: Sanity check node? */ | ||
470 | |||
471 | return propval_cell(reg); | ||
472 | } | ||
473 | |||
474 | static int cmp_reserve_info(const void *ax, const void *bx) | ||
475 | { | ||
476 | const struct reserve_info *a, *b; | ||
477 | |||
478 | a = *((const struct reserve_info * const *)ax); | ||
479 | b = *((const struct reserve_info * const *)bx); | ||
480 | |||
481 | if (a->re.address < b->re.address) | ||
482 | return -1; | ||
483 | else if (a->re.address > b->re.address) | ||
484 | return 1; | ||
485 | else if (a->re.size < b->re.size) | ||
486 | return -1; | ||
487 | else if (a->re.size > b->re.size) | ||
488 | return 1; | ||
489 | else | ||
490 | return 0; | ||
491 | } | ||
492 | |||
493 | static void sort_reserve_entries(struct boot_info *bi) | ||
494 | { | ||
495 | struct reserve_info *ri, **tbl; | ||
496 | int n = 0, i = 0; | ||
497 | |||
498 | for (ri = bi->reservelist; | ||
499 | ri; | ||
500 | ri = ri->next) | ||
501 | n++; | ||
502 | |||
503 | if (n == 0) | ||
504 | return; | ||
505 | |||
506 | tbl = xmalloc(n * sizeof(*tbl)); | ||
507 | |||
508 | for (ri = bi->reservelist; | ||
509 | ri; | ||
510 | ri = ri->next) | ||
511 | tbl[i++] = ri; | ||
512 | |||
513 | qsort(tbl, n, sizeof(*tbl), cmp_reserve_info); | ||
514 | |||
515 | bi->reservelist = tbl[0]; | ||
516 | for (i = 0; i < (n-1); i++) | ||
517 | tbl[i]->next = tbl[i+1]; | ||
518 | tbl[n-1]->next = NULL; | ||
519 | |||
520 | free(tbl); | ||
521 | } | ||
522 | |||
523 | static int cmp_prop(const void *ax, const void *bx) | ||
524 | { | ||
525 | const struct property *a, *b; | ||
526 | |||
527 | a = *((const struct property * const *)ax); | ||
528 | b = *((const struct property * const *)bx); | ||
529 | |||
530 | return strcmp(a->name, b->name); | ||
531 | } | ||
532 | |||
533 | static void sort_properties(struct node *node) | ||
534 | { | ||
535 | int n = 0, i = 0; | ||
536 | struct property *prop, **tbl; | ||
537 | |||
538 | for_each_property(node, prop) | ||
539 | n++; | ||
540 | |||
541 | if (n == 0) | ||
542 | return; | ||
543 | |||
544 | tbl = xmalloc(n * sizeof(*tbl)); | ||
545 | |||
546 | for_each_property(node, prop) | ||
547 | tbl[i++] = prop; | ||
548 | |||
549 | qsort(tbl, n, sizeof(*tbl), cmp_prop); | ||
550 | |||
551 | node->proplist = tbl[0]; | ||
552 | for (i = 0; i < (n-1); i++) | ||
553 | tbl[i]->next = tbl[i+1]; | ||
554 | tbl[n-1]->next = NULL; | ||
555 | |||
556 | free(tbl); | ||
557 | } | ||
558 | |||
559 | static int cmp_subnode(const void *ax, const void *bx) | ||
560 | { | ||
561 | const struct node *a, *b; | ||
562 | |||
563 | a = *((const struct node * const *)ax); | ||
564 | b = *((const struct node * const *)bx); | ||
565 | |||
566 | return strcmp(a->name, b->name); | ||
567 | } | ||
568 | |||
569 | static void sort_subnodes(struct node *node) | ||
570 | { | ||
571 | int n = 0, i = 0; | ||
572 | struct node *subnode, **tbl; | ||
573 | |||
574 | for_each_child(node, subnode) | ||
575 | n++; | ||
576 | |||
577 | if (n == 0) | ||
578 | return; | ||
579 | |||
580 | tbl = xmalloc(n * sizeof(*tbl)); | ||
581 | |||
582 | for_each_child(node, subnode) | ||
583 | tbl[i++] = subnode; | ||
584 | |||
585 | qsort(tbl, n, sizeof(*tbl), cmp_subnode); | ||
586 | |||
587 | node->children = tbl[0]; | ||
588 | for (i = 0; i < (n-1); i++) | ||
589 | tbl[i]->next_sibling = tbl[i+1]; | ||
590 | tbl[n-1]->next_sibling = NULL; | ||
591 | |||
592 | free(tbl); | ||
593 | } | ||
594 | |||
595 | static void sort_node(struct node *node) | ||
596 | { | ||
597 | struct node *c; | ||
598 | |||
599 | sort_properties(node); | ||
600 | sort_subnodes(node); | ||
601 | for_each_child(node, c) | ||
602 | sort_node(c); | ||
603 | } | ||
604 | |||
605 | void sort_tree(struct boot_info *bi) | ||
606 | { | ||
607 | sort_reserve_entries(bi); | ||
608 | sort_node(bi->dt); | ||
609 | } | ||
diff --git a/scripts/dtc/srcpos.c b/scripts/dtc/srcpos.c index 9641b7628b4..2dbc874288c 100644 --- a/scripts/dtc/srcpos.c +++ b/scripts/dtc/srcpos.c | |||
@@ -17,100 +17,232 @@ | |||
17 | * USA | 17 | * USA |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #define _GNU_SOURCE | ||
21 | |||
22 | #include <stdio.h> | ||
23 | |||
20 | #include "dtc.h" | 24 | #include "dtc.h" |
21 | #include "srcpos.h" | 25 | #include "srcpos.h" |
22 | 26 | ||
23 | /* | ||
24 | * Like yylineno, this is the current open file pos. | ||
25 | */ | ||
26 | 27 | ||
27 | struct dtc_file *srcpos_file; | 28 | static char *dirname(const char *path) |
29 | { | ||
30 | const char *slash = strrchr(path, '/'); | ||
31 | |||
32 | if (slash) { | ||
33 | int len = slash - path; | ||
34 | char *dir = xmalloc(len + 1); | ||
35 | |||
36 | memcpy(dir, path, len); | ||
37 | dir[len] = '\0'; | ||
38 | return dir; | ||
39 | } | ||
40 | return NULL; | ||
41 | } | ||
42 | |||
43 | struct srcfile_state *current_srcfile; /* = NULL */ | ||
28 | 44 | ||
29 | static int dtc_open_one(struct dtc_file *file, | 45 | /* Detect infinite include recursion. */ |
30 | const char *search, | 46 | #define MAX_SRCFILE_DEPTH (100) |
31 | const char *fname) | 47 | static int srcfile_depth; /* = 0 */ |
48 | |||
49 | FILE *srcfile_relative_open(const char *fname, char **fullnamep) | ||
32 | { | 50 | { |
51 | FILE *f; | ||
33 | char *fullname; | 52 | char *fullname; |
34 | 53 | ||
35 | if (search) { | 54 | if (streq(fname, "-")) { |
36 | fullname = xmalloc(strlen(search) + strlen(fname) + 2); | 55 | f = stdin; |
37 | 56 | fullname = xstrdup("<stdin>"); | |
38 | strcpy(fullname, search); | ||
39 | strcat(fullname, "/"); | ||
40 | strcat(fullname, fname); | ||
41 | } else { | 57 | } else { |
42 | fullname = strdup(fname); | 58 | if (!current_srcfile || !current_srcfile->dir |
59 | || (fname[0] == '/')) | ||
60 | fullname = xstrdup(fname); | ||
61 | else | ||
62 | fullname = join_path(current_srcfile->dir, fname); | ||
63 | |||
64 | f = fopen(fullname, "r"); | ||
65 | if (!f) | ||
66 | die("Couldn't open \"%s\": %s\n", fname, | ||
67 | strerror(errno)); | ||
43 | } | 68 | } |
44 | 69 | ||
45 | file->file = fopen(fullname, "r"); | 70 | if (fullnamep) |
46 | if (!file->file) { | 71 | *fullnamep = fullname; |
72 | else | ||
47 | free(fullname); | 73 | free(fullname); |
48 | return 0; | ||
49 | } | ||
50 | 74 | ||
51 | file->name = fullname; | 75 | return f; |
52 | return 1; | ||
53 | } | 76 | } |
54 | 77 | ||
78 | void srcfile_push(const char *fname) | ||
79 | { | ||
80 | struct srcfile_state *srcfile; | ||
81 | |||
82 | if (srcfile_depth++ >= MAX_SRCFILE_DEPTH) | ||
83 | die("Includes nested too deeply"); | ||
84 | |||
85 | srcfile = xmalloc(sizeof(*srcfile)); | ||
86 | |||
87 | srcfile->f = srcfile_relative_open(fname, &srcfile->name); | ||
88 | srcfile->dir = dirname(srcfile->name); | ||
89 | srcfile->prev = current_srcfile; | ||
90 | |||
91 | srcfile->lineno = 1; | ||
92 | srcfile->colno = 1; | ||
93 | |||
94 | current_srcfile = srcfile; | ||
95 | } | ||
55 | 96 | ||
56 | struct dtc_file *dtc_open_file(const char *fname, | 97 | int srcfile_pop(void) |
57 | const struct search_path *search) | ||
58 | { | 98 | { |
59 | static const struct search_path default_search = { NULL, NULL, NULL }; | 99 | struct srcfile_state *srcfile = current_srcfile; |
60 | 100 | ||
61 | struct dtc_file *file; | 101 | assert(srcfile); |
62 | const char *slash; | ||
63 | 102 | ||
64 | file = xmalloc(sizeof(struct dtc_file)); | 103 | current_srcfile = srcfile->prev; |
65 | 104 | ||
66 | slash = strrchr(fname, '/'); | 105 | if (fclose(srcfile->f)) |
67 | if (slash) { | 106 | die("Error closing \"%s\": %s\n", srcfile->name, |
68 | char *dir = xmalloc(slash - fname + 1); | 107 | strerror(errno)); |
69 | 108 | ||
70 | memcpy(dir, fname, slash - fname); | 109 | /* FIXME: We allow the srcfile_state structure to leak, |
71 | dir[slash - fname] = 0; | 110 | * because it could still be referenced from a location |
72 | file->dir = dir; | 111 | * variable being carried through the parser somewhere. To |
73 | } else { | 112 | * fix this we could either allocate all the files from a |
74 | file->dir = NULL; | 113 | * table, or use a pool allocator. */ |
75 | } | ||
76 | 114 | ||
77 | if (streq(fname, "-")) { | 115 | return current_srcfile ? 1 : 0; |
78 | file->name = "stdin"; | 116 | } |
79 | file->file = stdin; | ||
80 | return file; | ||
81 | } | ||
82 | 117 | ||
83 | if (fname[0] == '/') { | 118 | /* |
84 | file->file = fopen(fname, "r"); | 119 | * The empty source position. |
85 | if (!file->file) | 120 | */ |
86 | goto fail; | ||
87 | 121 | ||
88 | file->name = strdup(fname); | 122 | struct srcpos srcpos_empty = { |
89 | return file; | 123 | .first_line = 0, |
90 | } | 124 | .first_column = 0, |
125 | .last_line = 0, | ||
126 | .last_column = 0, | ||
127 | .file = NULL, | ||
128 | }; | ||
91 | 129 | ||
92 | if (!search) | 130 | #define TAB_SIZE 8 |
93 | search = &default_search; | ||
94 | 131 | ||
95 | while (search) { | 132 | void srcpos_update(struct srcpos *pos, const char *text, int len) |
96 | if (dtc_open_one(file, search->dir, fname)) | 133 | { |
97 | return file; | 134 | int i; |
135 | |||
136 | pos->file = current_srcfile; | ||
137 | |||
138 | pos->first_line = current_srcfile->lineno; | ||
139 | pos->first_column = current_srcfile->colno; | ||
140 | |||
141 | for (i = 0; i < len; i++) | ||
142 | if (text[i] == '\n') { | ||
143 | current_srcfile->lineno++; | ||
144 | current_srcfile->colno = 1; | ||
145 | } else if (text[i] == '\t') { | ||
146 | current_srcfile->colno = | ||
147 | ALIGN(current_srcfile->colno, TAB_SIZE); | ||
148 | } else { | ||
149 | current_srcfile->colno++; | ||
150 | } | ||
151 | |||
152 | pos->last_line = current_srcfile->lineno; | ||
153 | pos->last_column = current_srcfile->colno; | ||
154 | } | ||
98 | 155 | ||
99 | if (errno != ENOENT) | 156 | struct srcpos * |
100 | goto fail; | 157 | srcpos_copy(struct srcpos *pos) |
158 | { | ||
159 | struct srcpos *pos_new; | ||
101 | 160 | ||
102 | search = search->next; | 161 | pos_new = xmalloc(sizeof(struct srcpos)); |
103 | } | 162 | memcpy(pos_new, pos, sizeof(struct srcpos)); |
163 | |||
164 | return pos_new; | ||
165 | } | ||
166 | |||
167 | |||
168 | |||
169 | void | ||
170 | srcpos_dump(struct srcpos *pos) | ||
171 | { | ||
172 | printf("file : \"%s\"\n", | ||
173 | pos->file ? (char *) pos->file : "<no file>"); | ||
174 | printf("first_line : %d\n", pos->first_line); | ||
175 | printf("first_column: %d\n", pos->first_column); | ||
176 | printf("last_line : %d\n", pos->last_line); | ||
177 | printf("last_column : %d\n", pos->last_column); | ||
178 | printf("file : %s\n", pos->file->name); | ||
179 | } | ||
104 | 180 | ||
105 | fail: | 181 | |
106 | die("Couldn't open \"%s\": %s\n", fname, strerror(errno)); | 182 | char * |
183 | srcpos_string(struct srcpos *pos) | ||
184 | { | ||
185 | const char *fname = "<no-file>"; | ||
186 | char *pos_str; | ||
187 | int rc; | ||
188 | |||
189 | if (pos) | ||
190 | fname = pos->file->name; | ||
191 | |||
192 | |||
193 | if (pos->first_line != pos->last_line) | ||
194 | rc = asprintf(&pos_str, "%s:%d.%d-%d.%d", fname, | ||
195 | pos->first_line, pos->first_column, | ||
196 | pos->last_line, pos->last_column); | ||
197 | else if (pos->first_column != pos->last_column) | ||
198 | rc = asprintf(&pos_str, "%s:%d.%d-%d", fname, | ||
199 | pos->first_line, pos->first_column, | ||
200 | pos->last_column); | ||
201 | else | ||
202 | rc = asprintf(&pos_str, "%s:%d.%d", fname, | ||
203 | pos->first_line, pos->first_column); | ||
204 | |||
205 | if (rc == -1) | ||
206 | die("Couldn't allocate in srcpos string"); | ||
207 | |||
208 | return pos_str; | ||
209 | } | ||
210 | |||
211 | void | ||
212 | srcpos_verror(struct srcpos *pos, char const *fmt, va_list va) | ||
213 | { | ||
214 | const char *srcstr; | ||
215 | |||
216 | srcstr = srcpos_string(pos); | ||
217 | |||
218 | fprintf(stdout, "Error: %s ", srcstr); | ||
219 | vfprintf(stdout, fmt, va); | ||
220 | fprintf(stdout, "\n"); | ||
107 | } | 221 | } |
108 | 222 | ||
109 | void dtc_close_file(struct dtc_file *file) | 223 | void |
224 | srcpos_error(struct srcpos *pos, char const *fmt, ...) | ||
110 | { | 225 | { |
111 | if (fclose(file->file)) | 226 | va_list va; |
112 | die("Error closing \"%s\": %s\n", file->name, strerror(errno)); | 227 | |
228 | va_start(va, fmt); | ||
229 | srcpos_verror(pos, fmt, va); | ||
230 | va_end(va); | ||
231 | } | ||
232 | |||
233 | |||
234 | void | ||
235 | srcpos_warn(struct srcpos *pos, char const *fmt, ...) | ||
236 | { | ||
237 | const char *srcstr; | ||
238 | va_list va; | ||
239 | va_start(va, fmt); | ||
240 | |||
241 | srcstr = srcpos_string(pos); | ||
242 | |||
243 | fprintf(stderr, "Warning: %s ", srcstr); | ||
244 | vfprintf(stderr, fmt, va); | ||
245 | fprintf(stderr, "\n"); | ||
113 | 246 | ||
114 | free(file->dir); | 247 | va_end(va); |
115 | free(file); | ||
116 | } | 248 | } |
diff --git a/scripts/dtc/srcpos.h b/scripts/dtc/srcpos.h index e17c7c04db8..bd7966e56a5 100644 --- a/scripts/dtc/srcpos.h +++ b/scripts/dtc/srcpos.h | |||
@@ -17,69 +17,70 @@ | |||
17 | * USA | 17 | * USA |
18 | */ | 18 | */ |
19 | 19 | ||
20 | /* | 20 | #ifndef _SRCPOS_H_ |
21 | * Augment the standard YYLTYPE with a filenum index into an | 21 | #define _SRCPOS_H_ |
22 | * array of all opened filenames. | ||
23 | */ | ||
24 | 22 | ||
25 | #include <stdio.h> | 23 | #include <stdio.h> |
26 | 24 | ||
27 | struct dtc_file { | 25 | struct srcfile_state { |
26 | FILE *f; | ||
27 | char *name; | ||
28 | char *dir; | 28 | char *dir; |
29 | const char *name; | 29 | int lineno, colno; |
30 | FILE *file; | 30 | struct srcfile_state *prev; |
31 | }; | 31 | }; |
32 | 32 | ||
33 | #if ! defined(YYLTYPE) && ! defined(YYLTYPE_IS_DECLARED) | 33 | extern struct srcfile_state *current_srcfile; /* = NULL */ |
34 | typedef struct YYLTYPE { | 34 | |
35 | FILE *srcfile_relative_open(const char *fname, char **fullnamep); | ||
36 | void srcfile_push(const char *fname); | ||
37 | int srcfile_pop(void); | ||
38 | |||
39 | struct srcpos { | ||
35 | int first_line; | 40 | int first_line; |
36 | int first_column; | 41 | int first_column; |
37 | int last_line; | 42 | int last_line; |
38 | int last_column; | 43 | int last_column; |
39 | struct dtc_file *file; | 44 | struct srcfile_state *file; |
40 | } YYLTYPE; | 45 | }; |
41 | |||
42 | #define YYLTYPE_IS_DECLARED 1 | ||
43 | #define YYLTYPE_IS_TRIVIAL 1 | ||
44 | #endif | ||
45 | |||
46 | /* Cater to old parser templates. */ | ||
47 | #ifndef YYID | ||
48 | #define YYID(n) (n) | ||
49 | #endif | ||
50 | 46 | ||
51 | #define YYLLOC_DEFAULT(Current, Rhs, N) \ | 47 | #define YYLTYPE struct srcpos |
52 | do \ | ||
53 | if (YYID (N)) \ | ||
54 | { \ | ||
55 | (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ | ||
56 | (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ | ||
57 | (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ | ||
58 | (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ | ||
59 | (Current).file = YYRHSLOC (Rhs, N).file; \ | ||
60 | } \ | ||
61 | else \ | ||
62 | { \ | ||
63 | (Current).first_line = (Current).last_line = \ | ||
64 | YYRHSLOC (Rhs, 0).last_line; \ | ||
65 | (Current).first_column = (Current).last_column = \ | ||
66 | YYRHSLOC (Rhs, 0).last_column; \ | ||
67 | (Current).file = YYRHSLOC (Rhs, 0).file; \ | ||
68 | } \ | ||
69 | while (YYID (0)) | ||
70 | 48 | ||
49 | #define YYLLOC_DEFAULT(Current, Rhs, N) \ | ||
50 | do { \ | ||
51 | if (N) { \ | ||
52 | (Current).first_line = YYRHSLOC(Rhs, 1).first_line; \ | ||
53 | (Current).first_column = YYRHSLOC(Rhs, 1).first_column; \ | ||
54 | (Current).last_line = YYRHSLOC(Rhs, N).last_line; \ | ||
55 | (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ | ||
56 | (Current).file = YYRHSLOC(Rhs, N).file; \ | ||
57 | } else { \ | ||
58 | (Current).first_line = (Current).last_line = \ | ||
59 | YYRHSLOC(Rhs, 0).last_line; \ | ||
60 | (Current).first_column = (Current).last_column = \ | ||
61 | YYRHSLOC(Rhs, 0).last_column; \ | ||
62 | (Current).file = YYRHSLOC (Rhs, 0).file; \ | ||
63 | } \ | ||
64 | } while (0) | ||
71 | 65 | ||
72 | 66 | ||
73 | extern void yyerror(char const *); | 67 | /* |
74 | extern void yyerrorf(char const *, ...) __attribute__((format(printf, 1, 2))); | 68 | * Fictional source position used for IR nodes that are |
69 | * created without otherwise knowing a true source position. | ||
70 | * For example,constant definitions from the command line. | ||
71 | */ | ||
72 | extern struct srcpos srcpos_empty; | ||
75 | 73 | ||
76 | extern struct dtc_file *srcpos_file; | 74 | extern void srcpos_update(struct srcpos *pos, const char *text, int len); |
75 | extern struct srcpos *srcpos_copy(struct srcpos *pos); | ||
76 | extern char *srcpos_string(struct srcpos *pos); | ||
77 | extern void srcpos_dump(struct srcpos *pos); | ||
77 | 78 | ||
78 | struct search_path { | 79 | extern void srcpos_verror(struct srcpos *pos, char const *, va_list va) |
79 | const char *dir; /* NULL for current directory */ | 80 | __attribute__((format(printf, 2, 0))); |
80 | struct search_path *prev, *next; | 81 | extern void srcpos_error(struct srcpos *pos, char const *, ...) |
81 | }; | 82 | __attribute__((format(printf, 2, 3))); |
83 | extern void srcpos_warn(struct srcpos *pos, char const *, ...) | ||
84 | __attribute__((format(printf, 2, 3))); | ||
82 | 85 | ||
83 | extern struct dtc_file *dtc_open_file(const char *fname, | 86 | #endif /* _SRCPOS_H_ */ |
84 | const struct search_path *search); | ||
85 | extern void dtc_close_file(struct dtc_file *file); | ||
diff --git a/scripts/dtc/treesource.c b/scripts/dtc/treesource.c index 1521ff11bb9..c09aafade31 100644 --- a/scripts/dtc/treesource.c +++ b/scripts/dtc/treesource.c | |||
@@ -32,8 +32,8 @@ struct boot_info *dt_from_source(const char *fname) | |||
32 | the_boot_info = NULL; | 32 | the_boot_info = NULL; |
33 | treesource_error = 0; | 33 | treesource_error = 0; |
34 | 34 | ||
35 | srcpos_file = dtc_open_file(fname, NULL); | 35 | srcfile_push(fname); |
36 | yyin = srcpos_file->file; | 36 | yyin = current_srcfile->f; |
37 | 37 | ||
38 | if (yyparse() != 0) | 38 | if (yyparse() != 0) |
39 | die("Unable to parse input tree\n"); | 39 | die("Unable to parse input tree\n"); |
@@ -63,26 +63,20 @@ static void write_propval_string(FILE *f, struct data val) | |||
63 | { | 63 | { |
64 | const char *str = val.val; | 64 | const char *str = val.val; |
65 | int i; | 65 | int i; |
66 | int newchunk = 1; | ||
67 | struct marker *m = val.markers; | 66 | struct marker *m = val.markers; |
68 | 67 | ||
69 | assert(str[val.len-1] == '\0'); | 68 | assert(str[val.len-1] == '\0'); |
70 | 69 | ||
70 | while (m && (m->offset == 0)) { | ||
71 | if (m->type == LABEL) | ||
72 | fprintf(f, "%s: ", m->ref); | ||
73 | m = m->next; | ||
74 | } | ||
75 | fprintf(f, "\""); | ||
76 | |||
71 | for (i = 0; i < (val.len-1); i++) { | 77 | for (i = 0; i < (val.len-1); i++) { |
72 | char c = str[i]; | 78 | char c = str[i]; |
73 | 79 | ||
74 | if (newchunk) { | ||
75 | while (m && (m->offset <= i)) { | ||
76 | if (m->type == LABEL) { | ||
77 | assert(m->offset == i); | ||
78 | fprintf(f, "%s: ", m->ref); | ||
79 | } | ||
80 | m = m->next; | ||
81 | } | ||
82 | fprintf(f, "\""); | ||
83 | newchunk = 0; | ||
84 | } | ||
85 | |||
86 | switch (c) { | 80 | switch (c) { |
87 | case '\a': | 81 | case '\a': |
88 | fprintf(f, "\\a"); | 82 | fprintf(f, "\\a"); |
@@ -113,7 +107,14 @@ static void write_propval_string(FILE *f, struct data val) | |||
113 | break; | 107 | break; |
114 | case '\0': | 108 | case '\0': |
115 | fprintf(f, "\", "); | 109 | fprintf(f, "\", "); |
116 | newchunk = 1; | 110 | while (m && (m->offset < i)) { |
111 | if (m->type == LABEL) { | ||
112 | assert(m->offset == (i+1)); | ||
113 | fprintf(f, "%s: ", m->ref); | ||
114 | } | ||
115 | m = m->next; | ||
116 | } | ||
117 | fprintf(f, "\""); | ||
117 | break; | 118 | break; |
118 | default: | 119 | default: |
119 | if (isprint(c)) | 120 | if (isprint(c)) |
@@ -234,10 +235,11 @@ static void write_tree_source_node(FILE *f, struct node *tree, int level) | |||
234 | { | 235 | { |
235 | struct property *prop; | 236 | struct property *prop; |
236 | struct node *child; | 237 | struct node *child; |
238 | struct label *l; | ||
237 | 239 | ||
238 | write_prefix(f, level); | 240 | write_prefix(f, level); |
239 | if (tree->label) | 241 | for_each_label(tree->labels, l) |
240 | fprintf(f, "%s: ", tree->label); | 242 | fprintf(f, "%s: ", l->label); |
241 | if (tree->name && (*tree->name)) | 243 | if (tree->name && (*tree->name)) |
242 | fprintf(f, "%s {\n", tree->name); | 244 | fprintf(f, "%s {\n", tree->name); |
243 | else | 245 | else |
@@ -245,8 +247,8 @@ static void write_tree_source_node(FILE *f, struct node *tree, int level) | |||
245 | 247 | ||
246 | for_each_property(tree, prop) { | 248 | for_each_property(tree, prop) { |
247 | write_prefix(f, level+1); | 249 | write_prefix(f, level+1); |
248 | if (prop->label) | 250 | for_each_label(prop->labels, l) |
249 | fprintf(f, "%s: ", prop->label); | 251 | fprintf(f, "%s: ", l->label); |
250 | fprintf(f, "%s", prop->name); | 252 | fprintf(f, "%s", prop->name); |
251 | write_propval(f, prop); | 253 | write_propval(f, prop); |
252 | } | 254 | } |
@@ -266,8 +268,10 @@ void dt_to_source(FILE *f, struct boot_info *bi) | |||
266 | fprintf(f, "/dts-v1/;\n\n"); | 268 | fprintf(f, "/dts-v1/;\n\n"); |
267 | 269 | ||
268 | for (re = bi->reservelist; re; re = re->next) { | 270 | for (re = bi->reservelist; re; re = re->next) { |
269 | if (re->label) | 271 | struct label *l; |
270 | fprintf(f, "%s: ", re->label); | 272 | |
273 | for_each_label(re->labels, l) | ||
274 | fprintf(f, "%s: ", l->label); | ||
271 | fprintf(f, "/memreserve/\t0x%016llx 0x%016llx;\n", | 275 | fprintf(f, "/memreserve/\t0x%016llx 0x%016llx;\n", |
272 | (unsigned long long)re->re.address, | 276 | (unsigned long long)re->re.address, |
273 | (unsigned long long)re->re.size); | 277 | (unsigned long long)re->re.size); |
diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c new file mode 100644 index 00000000000..d7ac27d2ae1 --- /dev/null +++ b/scripts/dtc/util.c | |||
@@ -0,0 +1,59 @@ | |||
1 | /* | ||
2 | * Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License as | ||
6 | * published by the Free Software Foundation; either version 2 of the | ||
7 | * License, or (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | * General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | ||
17 | * USA | ||
18 | */ | ||
19 | |||
20 | #include <stdio.h> | ||
21 | #include <stdlib.h> | ||
22 | #include <stdarg.h> | ||
23 | #include <string.h> | ||
24 | |||
25 | #include "util.h" | ||
26 | |||
27 | char *xstrdup(const char *s) | ||
28 | { | ||
29 | int len = strlen(s) + 1; | ||
30 | char *dup = xmalloc(len); | ||
31 | |||
32 | memcpy(dup, s, len); | ||
33 | |||
34 | return dup; | ||
35 | } | ||
36 | |||
37 | char *join_path(const char *path, const char *name) | ||
38 | { | ||
39 | int lenp = strlen(path); | ||
40 | int lenn = strlen(name); | ||
41 | int len; | ||
42 | int needslash = 1; | ||
43 | char *str; | ||
44 | |||
45 | len = lenp + lenn + 2; | ||
46 | if ((lenp > 0) && (path[lenp-1] == '/')) { | ||
47 | needslash = 0; | ||
48 | len--; | ||
49 | } | ||
50 | |||
51 | str = xmalloc(len); | ||
52 | memcpy(str, path, lenp); | ||
53 | if (needslash) { | ||
54 | str[lenp] = '/'; | ||
55 | lenp++; | ||
56 | } | ||
57 | memcpy(str+lenp, name, lenn+1); | ||
58 | return str; | ||
59 | } | ||
diff --git a/scripts/dtc/util.h b/scripts/dtc/util.h new file mode 100644 index 00000000000..9cead842c11 --- /dev/null +++ b/scripts/dtc/util.h | |||
@@ -0,0 +1,56 @@ | |||
1 | #ifndef _UTIL_H | ||
2 | #define _UTIL_H | ||
3 | |||
4 | /* | ||
5 | * Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc. | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or | ||
8 | * modify it under the terms of the GNU General Public License as | ||
9 | * published by the Free Software Foundation; either version 2 of the | ||
10 | * License, or (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | * General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | ||
20 | * USA | ||
21 | */ | ||
22 | |||
23 | static inline void __attribute__((noreturn)) die(char * str, ...) | ||
24 | { | ||
25 | va_list ap; | ||
26 | |||
27 | va_start(ap, str); | ||
28 | fprintf(stderr, "FATAL ERROR: "); | ||
29 | vfprintf(stderr, str, ap); | ||
30 | exit(1); | ||
31 | } | ||
32 | |||
33 | static inline void *xmalloc(size_t len) | ||
34 | { | ||
35 | void *new = malloc(len); | ||
36 | |||
37 | if (!new) | ||
38 | die("malloc() failed\n"); | ||
39 | |||
40 | return new; | ||
41 | } | ||
42 | |||
43 | static inline void *xrealloc(void *p, size_t len) | ||
44 | { | ||
45 | void *new = realloc(p, len); | ||
46 | |||
47 | if (!new) | ||
48 | die("realloc() failed (len=%d)\n", len); | ||
49 | |||
50 | return new; | ||
51 | } | ||
52 | |||
53 | extern char *xstrdup(const char *s); | ||
54 | extern char *join_path(const char *path, const char *name); | ||
55 | |||
56 | #endif /* _UTIL_H */ | ||
diff --git a/scripts/dtc/version_gen.h b/scripts/dtc/version_gen.h index 658ff42429d..6158b867df9 100644 --- a/scripts/dtc/version_gen.h +++ b/scripts/dtc/version_gen.h | |||
@@ -1 +1 @@ | |||
#define DTC_VERSION "DTC 1.2.0" | #define DTC_VERSION "DTC 1.2.0-g37c0b6a0" | ||
diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig index de233ff43c1..1512c0a755a 100755 --- a/scripts/extract-ikconfig +++ b/scripts/extract-ikconfig | |||
@@ -1,92 +1,66 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # extracts .config info from a [b]zImage file | 2 | # ---------------------------------------------------------------------- |
3 | # uses: binoffset (new), dd, zcat, strings, grep | 3 | # extract-ikconfig - Extract the .config file from a kernel image |
4 | # $arg1 is [b]zImage filename | 4 | # |
5 | 5 | # This will only work when the kernel was compiled with CONFIG_IKCONFIG. | |
6 | binoffset="./scripts/binoffset" | 6 | # |
7 | test -e $binoffset || cc -o $binoffset ./scripts/binoffset.c || exit 1 | 7 | # The obscure use of the "tr" filter is to work around older versions of |
8 | 8 | # "grep" that report the byte offset of the line instead of the pattern. | |
9 | IKCFG_ST="0x49 0x4b 0x43 0x46 0x47 0x5f 0x53 0x54" | 9 | # |
10 | IKCFG_ED="0x49 0x4b 0x43 0x46 0x47 0x5f 0x45 0x44" | 10 | # (c) 2009,2010 Dick Streefland <dick@streefland.net> |
11 | dump_config() { | 11 | # Licensed under the terms of the GNU General Public License. |
12 | file="$1" | 12 | # ---------------------------------------------------------------------- |
13 | 13 | ||
14 | start=`$binoffset $file $IKCFG_ST 2>/dev/null` | 14 | cf1='IKCFG_ST\037\213\010' |
15 | [ "$?" != "0" ] && start="-1" | 15 | cf2='0123456789' |
16 | if [ "$start" -eq "-1" ]; then | 16 | |
17 | return | 17 | dump_config() |
18 | fi | ||
19 | end=`$binoffset $file $IKCFG_ED 2>/dev/null` | ||
20 | [ "$?" != "0" ] && end="-1" | ||
21 | if [ "$end" -eq "-1" ]; then | ||
22 | return | ||
23 | fi | ||
24 | |||
25 | start=`expr $start + 8` | ||
26 | size=`expr $end - $start` | ||
27 | |||
28 | dd if="$file" ibs=1 skip="$start" count="$size" 2>/dev/null | zcat | ||
29 | |||
30 | clean_up | ||
31 | exit 0 | ||
32 | } | ||
33 | |||
34 | |||
35 | usage() | ||
36 | { | 18 | { |
37 | echo " usage: extract-ikconfig [b]zImage_filename" | 19 | if pos=`tr "$cf1\n$cf2" "\n$cf2=" < "$1" | grep -abo "^$cf2"` |
20 | then | ||
21 | pos=${pos%%:*} | ||
22 | tail -c+$(($pos+8)) "$1" | zcat > $tmp1 2> /dev/null | ||
23 | if [ $? != 1 ] | ||
24 | then # exit status must be 0 or 2 (trailing garbage warning) | ||
25 | cat $tmp1 | ||
26 | exit 0 | ||
27 | fi | ||
28 | fi | ||
38 | } | 29 | } |
39 | 30 | ||
40 | clean_up() | 31 | try_decompress() |
41 | { | 32 | { |
42 | if [ "$TMPFILE" != "" ]; then | 33 | for pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"` |
43 | rm -f $TMPFILE | 34 | do |
44 | fi | 35 | pos=${pos%%:*} |
36 | tail -c+$pos "$img" | $3 > $tmp2 2> /dev/null | ||
37 | dump_config $tmp2 | ||
38 | done | ||
45 | } | 39 | } |
46 | 40 | ||
47 | if [ $# -lt 1 ] | 41 | # Check invocation: |
42 | me=${0##*/} | ||
43 | img=$1 | ||
44 | if [ $# -ne 1 -o ! -s "$img" ] | ||
48 | then | 45 | then |
49 | usage | 46 | echo "Usage: $me <kernel-image>" >&2 |
50 | exit 1 | 47 | exit 2 |
51 | fi | 48 | fi |
52 | 49 | ||
53 | TMPFILE=`mktemp -t ikconfig-XXXXXX` || exit 1 | 50 | # Prepare temp files: |
54 | image="$1" | 51 | tmp1=/tmp/ikconfig$$.1 |
55 | 52 | tmp2=/tmp/ikconfig$$.2 | |
56 | # vmlinux: Attempt to dump the configuration from the file directly | 53 | trap "rm -f $tmp1 $tmp2" 0 |
57 | dump_config "$image" | ||
58 | |||
59 | GZHDR1="0x1f 0x8b 0x08 0x00" | ||
60 | GZHDR2="0x1f 0x8b 0x08 0x08" | ||
61 | |||
62 | ELFHDR="0x7f 0x45 0x4c 0x46" | ||
63 | 54 | ||
64 | # vmlinux.gz: Check for a compressed images | 55 | # Initial attempt for uncompressed images or objects: |
65 | off=`$binoffset "$image" $GZHDR1 2>/dev/null` | 56 | dump_config "$img" |
66 | [ "$?" != "0" ] && off="-1" | ||
67 | if [ "$off" -eq "-1" ]; then | ||
68 | off=`$binoffset "$image" $GZHDR2 2>/dev/null` | ||
69 | [ "$?" != "0" ] && off="-1" | ||
70 | fi | ||
71 | if [ "$off" -eq "0" ]; then | ||
72 | zcat <"$image" >"$TMPFILE" | ||
73 | dump_config "$TMPFILE" | ||
74 | elif [ "$off" -ne "-1" ]; then | ||
75 | (dd ibs="$off" skip=1 count=0 && dd bs=512k) <"$image" 2>/dev/null | \ | ||
76 | zcat >"$TMPFILE" | ||
77 | dump_config "$TMPFILE" | ||
78 | |||
79 | # check if this is simply an ELF file | ||
80 | else | ||
81 | off=`$binoffset "$image" $ELFHDR 2>/dev/null` | ||
82 | [ "$?" != "0" ] && off="-1" | ||
83 | if [ "$off" -eq "0" ]; then | ||
84 | dump_config "$image" | ||
85 | fi | ||
86 | fi | ||
87 | 57 | ||
88 | echo "ERROR: Unable to extract kernel configuration information." | 58 | # That didn't work, so retry after decompression. |
89 | echo " This kernel image may not have the config info." | 59 | try_decompress '\037\213\010' xy gunzip |
60 | try_decompress 'BZh' xy bunzip2 | ||
61 | try_decompress '\135\0\0\0' xxx unlzma | ||
62 | try_decompress '\211\114\132' xy 'lzop -d' | ||
90 | 63 | ||
91 | clean_up | 64 | # Bail out: |
65 | echo "$me: Cannot find kernel config." >&2 | ||
92 | exit 1 | 66 | exit 1 |
diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh new file mode 100644 index 00000000000..520d16b1ffa --- /dev/null +++ b/scripts/gcc-goto.sh | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | # Test for gcc 'asm goto' suport | ||
3 | # Copyright (C) 2010, Jason Baron <jbaron@redhat.com> | ||
4 | |||
5 | echo "int main(void) { entry: asm goto (\"\"::::entry); return 0; }" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y" | ||
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh index f3b5c05ced4..55caecdad99 100644 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh | |||
@@ -243,6 +243,9 @@ case "$arg" in | |||
243 | echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f" | 243 | echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f" |
244 | echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f" | 244 | echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f" |
245 | echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f" | 245 | echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f" |
246 | echo "$output_file" | grep -q "\.xz$" && \ | ||
247 | compr="xz --check=crc32 --lzma2=dict=1MiB" | ||
248 | echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f" | ||
246 | echo "$output_file" | grep -q "\.cpio$" && compr="cat" | 249 | echo "$output_file" | grep -q "\.cpio$" && compr="cat" |
247 | shift | 250 | shift |
248 | ;; | 251 | ;; |
diff --git a/scripts/genksyms/parse.c_shipped b/scripts/genksyms/parse.c_shipped index eaee44e66a4..809b949e495 100644 --- a/scripts/genksyms/parse.c_shipped +++ b/scripts/genksyms/parse.c_shipped | |||
@@ -160,7 +160,7 @@ | |||
160 | 160 | ||
161 | 161 | ||
162 | #include <assert.h> | 162 | #include <assert.h> |
163 | #include <malloc.h> | 163 | #include <stdlib.h> |
164 | #include "genksyms.h" | 164 | #include "genksyms.h" |
165 | 165 | ||
166 | static int is_typedef; | 166 | static int is_typedef; |
diff --git a/scripts/genksyms/parse.y b/scripts/genksyms/parse.y index 10d7dc724b6..09a265cd719 100644 --- a/scripts/genksyms/parse.y +++ b/scripts/genksyms/parse.y | |||
@@ -24,7 +24,7 @@ | |||
24 | %{ | 24 | %{ |
25 | 25 | ||
26 | #include <assert.h> | 26 | #include <assert.h> |
27 | #include <malloc.h> | 27 | #include <stdlib.h> |
28 | #include "genksyms.h" | 28 | #include "genksyms.h" |
29 | 29 | ||
30 | static int is_typedef; | 30 | static int is_typedef; |
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 090f2483970..139e0fff8e3 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl | |||
@@ -13,7 +13,7 @@ | |||
13 | use strict; | 13 | use strict; |
14 | 14 | ||
15 | my $P = $0; | 15 | my $P = $0; |
16 | my $V = '0.23'; | 16 | my $V = '0.26'; |
17 | 17 | ||
18 | use Getopt::Long qw(:config no_auto_abbrev); | 18 | use Getopt::Long qw(:config no_auto_abbrev); |
19 | 19 | ||
@@ -24,34 +24,46 @@ my $email_maintainer = 1; | |||
24 | my $email_list = 1; | 24 | my $email_list = 1; |
25 | my $email_subscriber_list = 0; | 25 | my $email_subscriber_list = 0; |
26 | my $email_git_penguin_chiefs = 0; | 26 | my $email_git_penguin_chiefs = 0; |
27 | my $email_git = 1; | 27 | my $email_git = 0; |
28 | my $email_git_all_signature_types = 0; | ||
28 | my $email_git_blame = 0; | 29 | my $email_git_blame = 0; |
30 | my $email_git_blame_signatures = 1; | ||
31 | my $email_git_fallback = 1; | ||
29 | my $email_git_min_signatures = 1; | 32 | my $email_git_min_signatures = 1; |
30 | my $email_git_max_maintainers = 5; | 33 | my $email_git_max_maintainers = 5; |
31 | my $email_git_min_percent = 5; | 34 | my $email_git_min_percent = 5; |
32 | my $email_git_since = "1-year-ago"; | 35 | my $email_git_since = "1-year-ago"; |
33 | my $email_hg_since = "-365"; | 36 | my $email_hg_since = "-365"; |
37 | my $interactive = 0; | ||
34 | my $email_remove_duplicates = 1; | 38 | my $email_remove_duplicates = 1; |
39 | my $email_use_mailmap = 1; | ||
35 | my $output_multiline = 1; | 40 | my $output_multiline = 1; |
36 | my $output_separator = ", "; | 41 | my $output_separator = ", "; |
37 | my $output_roles = 0; | 42 | my $output_roles = 0; |
38 | my $output_rolestats = 0; | 43 | my $output_rolestats = 1; |
39 | my $scm = 0; | 44 | my $scm = 0; |
40 | my $web = 0; | 45 | my $web = 0; |
41 | my $subsystem = 0; | 46 | my $subsystem = 0; |
42 | my $status = 0; | 47 | my $status = 0; |
43 | my $keywords = 1; | 48 | my $keywords = 1; |
49 | my $sections = 0; | ||
50 | my $file_emails = 0; | ||
44 | my $from_filename = 0; | 51 | my $from_filename = 0; |
45 | my $pattern_depth = 0; | 52 | my $pattern_depth = 0; |
46 | my $version = 0; | 53 | my $version = 0; |
47 | my $help = 0; | 54 | my $help = 0; |
48 | 55 | ||
56 | my $vcs_used = 0; | ||
57 | |||
49 | my $exit = 0; | 58 | my $exit = 0; |
50 | 59 | ||
60 | my %commit_author_hash; | ||
61 | my %commit_signer_hash; | ||
62 | |||
51 | my @penguin_chief = (); | 63 | my @penguin_chief = (); |
52 | push(@penguin_chief,"Linus Torvalds:torvalds\@linux-foundation.org"); | 64 | push(@penguin_chief, "Linus Torvalds:torvalds\@linux-foundation.org"); |
53 | #Andrew wants in on most everything - 2009/01/14 | 65 | #Andrew wants in on most everything - 2009/01/14 |
54 | #push(@penguin_chief,"Andrew Morton:akpm\@linux-foundation.org"); | 66 | #push(@penguin_chief, "Andrew Morton:akpm\@linux-foundation.org"); |
55 | 67 | ||
56 | my @penguin_chief_names = (); | 68 | my @penguin_chief_names = (); |
57 | foreach my $chief (@penguin_chief) { | 69 | foreach my $chief (@penguin_chief) { |
@@ -61,7 +73,15 @@ foreach my $chief (@penguin_chief) { | |||
61 | push(@penguin_chief_names, $chief_name); | 73 | push(@penguin_chief_names, $chief_name); |
62 | } | 74 | } |
63 | } | 75 | } |
64 | my $penguin_chiefs = "\(" . join("|",@penguin_chief_names) . "\)"; | 76 | my $penguin_chiefs = "\(" . join("|", @penguin_chief_names) . "\)"; |
77 | |||
78 | # Signature types of people who are either | ||
79 | # a) responsible for the code in question, or | ||
80 | # b) familiar enough with it to give relevant feedback | ||
81 | my @signature_tags = (); | ||
82 | push(@signature_tags, "Signed-off-by:"); | ||
83 | push(@signature_tags, "Reviewed-by:"); | ||
84 | push(@signature_tags, "Acked-by:"); | ||
65 | 85 | ||
66 | # rfc822 email address - preloaded methods go here. | 86 | # rfc822 email address - preloaded methods go here. |
67 | my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; | 87 | my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; |
@@ -74,38 +94,106 @@ my %VCS_cmds; | |||
74 | my %VCS_cmds_git = ( | 94 | my %VCS_cmds_git = ( |
75 | "execute_cmd" => \&git_execute_cmd, | 95 | "execute_cmd" => \&git_execute_cmd, |
76 | "available" => '(which("git") ne "") && (-d ".git")', | 96 | "available" => '(which("git") ne "") && (-d ".git")', |
77 | "find_signers_cmd" => "git log --since=\$email_git_since -- \$file", | 97 | "find_signers_cmd" => |
78 | "find_commit_signers_cmd" => "git log -1 \$commit", | 98 | "git log --no-color --since=\$email_git_since " . |
99 | '--format="GitCommit: %H%n' . | ||
100 | 'GitAuthor: %an <%ae>%n' . | ||
101 | 'GitDate: %aD%n' . | ||
102 | 'GitSubject: %s%n' . | ||
103 | '%b%n"' . | ||
104 | " -- \$file", | ||
105 | "find_commit_signers_cmd" => | ||
106 | "git log --no-color " . | ||
107 | '--format="GitCommit: %H%n' . | ||
108 | 'GitAuthor: %an <%ae>%n' . | ||
109 | 'GitDate: %aD%n' . | ||
110 | 'GitSubject: %s%n' . | ||
111 | '%b%n"' . | ||
112 | " -1 \$commit", | ||
113 | "find_commit_author_cmd" => | ||
114 | "git log --no-color " . | ||
115 | '--format="GitCommit: %H%n' . | ||
116 | 'GitAuthor: %an <%ae>%n' . | ||
117 | 'GitDate: %aD%n' . | ||
118 | 'GitSubject: %s%n"' . | ||
119 | " -1 \$commit", | ||
79 | "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file", | 120 | "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file", |
80 | "blame_file_cmd" => "git blame -l \$file", | 121 | "blame_file_cmd" => "git blame -l \$file", |
81 | "commit_pattern" => "^commit [0-9a-f]{40,40}", | 122 | "commit_pattern" => "^GitCommit: ([0-9a-f]{40,40})", |
82 | "blame_commit_pattern" => "^([0-9a-f]+) " | 123 | "blame_commit_pattern" => "^([0-9a-f]+) ", |
124 | "author_pattern" => "^GitAuthor: (.*)", | ||
125 | "subject_pattern" => "^GitSubject: (.*)", | ||
83 | ); | 126 | ); |
84 | 127 | ||
85 | my %VCS_cmds_hg = ( | 128 | my %VCS_cmds_hg = ( |
86 | "execute_cmd" => \&hg_execute_cmd, | 129 | "execute_cmd" => \&hg_execute_cmd, |
87 | "available" => '(which("hg") ne "") && (-d ".hg")', | 130 | "available" => '(which("hg") ne "") && (-d ".hg")', |
88 | "find_signers_cmd" => | 131 | "find_signers_cmd" => |
89 | "hg log --date=\$email_hg_since" . | 132 | "hg log --date=\$email_hg_since " . |
90 | " --template='commit {node}\\n{desc}\\n' -- \$file", | 133 | "--template='HgCommit: {node}\\n" . |
91 | "find_commit_signers_cmd" => "hg log --template='{desc}\\n' -r \$commit", | 134 | "HgAuthor: {author}\\n" . |
135 | "HgSubject: {desc}\\n'" . | ||
136 | " -- \$file", | ||
137 | "find_commit_signers_cmd" => | ||
138 | "hg log " . | ||
139 | "--template='HgSubject: {desc}\\n'" . | ||
140 | " -r \$commit", | ||
141 | "find_commit_author_cmd" => | ||
142 | "hg log " . | ||
143 | "--template='HgCommit: {node}\\n" . | ||
144 | "HgAuthor: {author}\\n" . | ||
145 | "HgSubject: {desc|firstline}\\n'" . | ||
146 | " -r \$commit", | ||
92 | "blame_range_cmd" => "", # not supported | 147 | "blame_range_cmd" => "", # not supported |
93 | "blame_file_cmd" => "hg blame -c \$file", | 148 | "blame_file_cmd" => "hg blame -n \$file", |
94 | "commit_pattern" => "^commit [0-9a-f]{40,40}", | 149 | "commit_pattern" => "^HgCommit: ([0-9a-f]{40,40})", |
95 | "blame_commit_pattern" => "^([0-9a-f]+):" | 150 | "blame_commit_pattern" => "^([ 0-9a-f]+):", |
151 | "author_pattern" => "^HgAuthor: (.*)", | ||
152 | "subject_pattern" => "^HgSubject: (.*)", | ||
96 | ); | 153 | ); |
97 | 154 | ||
155 | my $conf = which_conf(".get_maintainer.conf"); | ||
156 | if (-f $conf) { | ||
157 | my @conf_args; | ||
158 | open(my $conffile, '<', "$conf") | ||
159 | or warn "$P: Can't find a readable .get_maintainer.conf file $!\n"; | ||
160 | |||
161 | while (<$conffile>) { | ||
162 | my $line = $_; | ||
163 | |||
164 | $line =~ s/\s*\n?$//g; | ||
165 | $line =~ s/^\s*//g; | ||
166 | $line =~ s/\s+/ /g; | ||
167 | |||
168 | next if ($line =~ m/^\s*#/); | ||
169 | next if ($line =~ m/^\s*$/); | ||
170 | |||
171 | my @words = split(" ", $line); | ||
172 | foreach my $word (@words) { | ||
173 | last if ($word =~ m/^#/); | ||
174 | push (@conf_args, $word); | ||
175 | } | ||
176 | } | ||
177 | close($conffile); | ||
178 | unshift(@ARGV, @conf_args) if @conf_args; | ||
179 | } | ||
180 | |||
98 | if (!GetOptions( | 181 | if (!GetOptions( |
99 | 'email!' => \$email, | 182 | 'email!' => \$email, |
100 | 'git!' => \$email_git, | 183 | 'git!' => \$email_git, |
184 | 'git-all-signature-types!' => \$email_git_all_signature_types, | ||
101 | 'git-blame!' => \$email_git_blame, | 185 | 'git-blame!' => \$email_git_blame, |
186 | 'git-blame-signatures!' => \$email_git_blame_signatures, | ||
187 | 'git-fallback!' => \$email_git_fallback, | ||
102 | 'git-chief-penguins!' => \$email_git_penguin_chiefs, | 188 | 'git-chief-penguins!' => \$email_git_penguin_chiefs, |
103 | 'git-min-signatures=i' => \$email_git_min_signatures, | 189 | 'git-min-signatures=i' => \$email_git_min_signatures, |
104 | 'git-max-maintainers=i' => \$email_git_max_maintainers, | 190 | 'git-max-maintainers=i' => \$email_git_max_maintainers, |
105 | 'git-min-percent=i' => \$email_git_min_percent, | 191 | 'git-min-percent=i' => \$email_git_min_percent, |
106 | 'git-since=s' => \$email_git_since, | 192 | 'git-since=s' => \$email_git_since, |
107 | 'hg-since=s' => \$email_hg_since, | 193 | 'hg-since=s' => \$email_hg_since, |
194 | 'i|interactive!' => \$interactive, | ||
108 | 'remove-duplicates!' => \$email_remove_duplicates, | 195 | 'remove-duplicates!' => \$email_remove_duplicates, |
196 | 'mailmap!' => \$email_use_mailmap, | ||
109 | 'm!' => \$email_maintainer, | 197 | 'm!' => \$email_maintainer, |
110 | 'n!' => \$email_usename, | 198 | 'n!' => \$email_usename, |
111 | 'l!' => \$email_list, | 199 | 'l!' => \$email_list, |
@@ -120,9 +208,11 @@ if (!GetOptions( | |||
120 | 'web!' => \$web, | 208 | 'web!' => \$web, |
121 | 'pattern-depth=i' => \$pattern_depth, | 209 | 'pattern-depth=i' => \$pattern_depth, |
122 | 'k|keywords!' => \$keywords, | 210 | 'k|keywords!' => \$keywords, |
211 | 'sections!' => \$sections, | ||
212 | 'fe|file-emails!' => \$file_emails, | ||
123 | 'f|file' => \$from_filename, | 213 | 'f|file' => \$from_filename, |
124 | 'v|version' => \$version, | 214 | 'v|version' => \$version, |
125 | 'h|help' => \$help, | 215 | 'h|help|usage' => \$help, |
126 | )) { | 216 | )) { |
127 | die "$P: invalid argument - use --help if necessary\n"; | 217 | die "$P: invalid argument - use --help if necessary\n"; |
128 | } | 218 | } |
@@ -137,29 +227,34 @@ if ($version != 0) { | |||
137 | exit 0; | 227 | exit 0; |
138 | } | 228 | } |
139 | 229 | ||
140 | if ($#ARGV < 0) { | 230 | if (-t STDIN && !@ARGV) { |
141 | usage(); | 231 | # We're talking to a terminal, but have no command line arguments. |
142 | die "$P: argument missing: patchfile or -f file please\n"; | 232 | die "$P: missing patchfile or -f file - use --help if necessary\n"; |
143 | } | ||
144 | |||
145 | if ($output_separator ne ", ") { | ||
146 | $output_multiline = 0; | ||
147 | } | 233 | } |
148 | 234 | ||
149 | if ($output_rolestats) { | 235 | $output_multiline = 0 if ($output_separator ne ", "); |
150 | $output_roles = 1; | 236 | $output_rolestats = 1 if ($interactive); |
151 | } | 237 | $output_roles = 1 if ($output_rolestats); |
152 | 238 | ||
153 | my $selections = $email + $scm + $status + $subsystem + $web; | 239 | if ($sections) { |
154 | if ($selections == 0) { | 240 | $email = 0; |
155 | usage(); | 241 | $email_list = 0; |
156 | die "$P: Missing required option: email, scm, status, subsystem or web\n"; | 242 | $scm = 0; |
243 | $status = 0; | ||
244 | $subsystem = 0; | ||
245 | $web = 0; | ||
246 | $keywords = 0; | ||
247 | $interactive = 0; | ||
248 | } else { | ||
249 | my $selections = $email + $scm + $status + $subsystem + $web; | ||
250 | if ($selections == 0) { | ||
251 | die "$P: Missing required option: email, scm, status, subsystem or web\n"; | ||
252 | } | ||
157 | } | 253 | } |
158 | 254 | ||
159 | if ($email && | 255 | if ($email && |
160 | ($email_maintainer + $email_list + $email_subscriber_list + | 256 | ($email_maintainer + $email_list + $email_subscriber_list + |
161 | $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) { | 257 | $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) { |
162 | usage(); | ||
163 | die "$P: Please select at least 1 email option\n"; | 258 | die "$P: Please select at least 1 email option\n"; |
164 | } | 259 | } |
165 | 260 | ||
@@ -173,8 +268,9 @@ if (!top_of_kernel_tree($lk_path)) { | |||
173 | my @typevalue = (); | 268 | my @typevalue = (); |
174 | my %keyword_hash; | 269 | my %keyword_hash; |
175 | 270 | ||
176 | open(MAINT, "<${lk_path}MAINTAINERS") || die "$P: Can't open MAINTAINERS\n"; | 271 | open (my $maint, '<', "${lk_path}MAINTAINERS") |
177 | while (<MAINT>) { | 272 | or die "$P: Can't open MAINTAINERS: $!\n"; |
273 | while (<$maint>) { | ||
178 | my $line = $_; | 274 | my $line = $_; |
179 | 275 | ||
180 | if ($line =~ m/^(\C):\s*(.*)/) { | 276 | if ($line =~ m/^(\C):\s*(.*)/) { |
@@ -199,32 +295,84 @@ while (<MAINT>) { | |||
199 | push(@typevalue, $line); | 295 | push(@typevalue, $line); |
200 | } | 296 | } |
201 | } | 297 | } |
202 | close(MAINT); | 298 | close($maint); |
203 | 299 | ||
204 | my %mailmap; | ||
205 | 300 | ||
206 | if ($email_remove_duplicates) { | 301 | # |
207 | open(MAILMAP, "<${lk_path}.mailmap") || warn "$P: Can't open .mailmap\n"; | 302 | # Read mail address map |
208 | while (<MAILMAP>) { | 303 | # |
209 | my $line = $_; | ||
210 | |||
211 | next if ($line =~ m/^\s*#/); | ||
212 | next if ($line =~ m/^\s*$/); | ||
213 | |||
214 | my ($name, $address) = parse_email($line); | ||
215 | $line = format_email($name, $address, $email_usename); | ||
216 | |||
217 | next if ($line =~ m/^\s*$/); | ||
218 | 304 | ||
219 | if (exists($mailmap{$name})) { | 305 | my $mailmap; |
220 | my $obj = $mailmap{$name}; | 306 | |
221 | push(@$obj, $address); | 307 | read_mailmap(); |
222 | } else { | 308 | |
223 | my @arr = ($address); | 309 | sub read_mailmap { |
224 | $mailmap{$name} = \@arr; | 310 | $mailmap = { |
311 | names => {}, | ||
312 | addresses => {} | ||
313 | }; | ||
314 | |||
315 | return if (!$email_use_mailmap || !(-f "${lk_path}.mailmap")); | ||
316 | |||
317 | open(my $mailmap_file, '<', "${lk_path}.mailmap") | ||
318 | or warn "$P: Can't open .mailmap: $!\n"; | ||
319 | |||
320 | while (<$mailmap_file>) { | ||
321 | s/#.*$//; #strip comments | ||
322 | s/^\s+|\s+$//g; #trim | ||
323 | |||
324 | next if (/^\s*$/); #skip empty lines | ||
325 | #entries have one of the following formats: | ||
326 | # name1 <mail1> | ||
327 | # <mail1> <mail2> | ||
328 | # name1 <mail1> <mail2> | ||
329 | # name1 <mail1> name2 <mail2> | ||
330 | # (see man git-shortlog) | ||
331 | if (/^(.+)<(.+)>$/) { | ||
332 | my $real_name = $1; | ||
333 | my $address = $2; | ||
334 | |||
335 | $real_name =~ s/\s+$//; | ||
336 | ($real_name, $address) = parse_email("$real_name <$address>"); | ||
337 | $mailmap->{names}->{$address} = $real_name; | ||
338 | |||
339 | } elsif (/^<([^\s]+)>\s*<([^\s]+)>$/) { | ||
340 | my $real_address = $1; | ||
341 | my $wrong_address = $2; | ||
342 | |||
343 | $mailmap->{addresses}->{$wrong_address} = $real_address; | ||
344 | |||
345 | } elsif (/^(.+)<([^\s]+)>\s*<([^\s]+)>$/) { | ||
346 | my $real_name = $1; | ||
347 | my $real_address = $2; | ||
348 | my $wrong_address = $3; | ||
349 | |||
350 | $real_name =~ s/\s+$//; | ||
351 | ($real_name, $real_address) = | ||
352 | parse_email("$real_name <$real_address>"); | ||
353 | $mailmap->{names}->{$wrong_address} = $real_name; | ||
354 | $mailmap->{addresses}->{$wrong_address} = $real_address; | ||
355 | |||
356 | } elsif (/^(.+)<([^\s]+)>\s*([^\s].*)<([^\s]+)>$/) { | ||
357 | my $real_name = $1; | ||
358 | my $real_address = $2; | ||
359 | my $wrong_name = $3; | ||
360 | my $wrong_address = $4; | ||
361 | |||
362 | $real_name =~ s/\s+$//; | ||
363 | ($real_name, $real_address) = | ||
364 | parse_email("$real_name <$real_address>"); | ||
365 | |||
366 | $wrong_name =~ s/\s+$//; | ||
367 | ($wrong_name, $wrong_address) = | ||
368 | parse_email("$wrong_name <$wrong_address>"); | ||
369 | |||
370 | my $wrong_email = format_email($wrong_name, $wrong_address, 1); | ||
371 | $mailmap->{names}->{$wrong_email} = $real_name; | ||
372 | $mailmap->{addresses}->{$wrong_email} = $real_address; | ||
225 | } | 373 | } |
226 | } | 374 | } |
227 | close(MAILMAP); | 375 | close($mailmap_file); |
228 | } | 376 | } |
229 | 377 | ||
230 | ## use the filenames on the command line or find the filenames in the patchfiles | 378 | ## use the filenames on the command line or find the filenames in the patchfiles |
@@ -232,31 +380,47 @@ if ($email_remove_duplicates) { | |||
232 | my @files = (); | 380 | my @files = (); |
233 | my @range = (); | 381 | my @range = (); |
234 | my @keyword_tvi = (); | 382 | my @keyword_tvi = (); |
383 | my @file_emails = (); | ||
384 | |||
385 | if (!@ARGV) { | ||
386 | push(@ARGV, "&STDIN"); | ||
387 | } | ||
235 | 388 | ||
236 | foreach my $file (@ARGV) { | 389 | foreach my $file (@ARGV) { |
237 | ##if $file is a directory and it lacks a trailing slash, add one | 390 | if ($file ne "&STDIN") { |
238 | if ((-d $file)) { | 391 | ##if $file is a directory and it lacks a trailing slash, add one |
239 | $file =~ s@([^/])$@$1/@; | 392 | if ((-d $file)) { |
240 | } elsif (!(-f $file)) { | 393 | $file =~ s@([^/])$@$1/@; |
241 | die "$P: file '${file}' not found\n"; | 394 | } elsif (!(-f $file)) { |
395 | die "$P: file '${file}' not found\n"; | ||
396 | } | ||
242 | } | 397 | } |
243 | if ($from_filename) { | 398 | if ($from_filename) { |
244 | push(@files, $file); | 399 | push(@files, $file); |
245 | if (-f $file && $keywords) { | 400 | if ($file ne "MAINTAINERS" && -f $file && ($keywords || $file_emails)) { |
246 | open(FILE, "<$file") or die "$P: Can't open ${file}\n"; | 401 | open(my $f, '<', $file) |
247 | my $text = do { local($/) ; <FILE> }; | 402 | or die "$P: Can't open $file: $!\n"; |
248 | foreach my $line (keys %keyword_hash) { | 403 | my $text = do { local($/) ; <$f> }; |
249 | if ($text =~ m/$keyword_hash{$line}/x) { | 404 | close($f); |
250 | push(@keyword_tvi, $line); | 405 | if ($keywords) { |
406 | foreach my $line (keys %keyword_hash) { | ||
407 | if ($text =~ m/$keyword_hash{$line}/x) { | ||
408 | push(@keyword_tvi, $line); | ||
409 | } | ||
251 | } | 410 | } |
252 | } | 411 | } |
253 | close(FILE); | 412 | if ($file_emails) { |
413 | my @poss_addr = $text =~ m$[A-Za-zÀ-ÿ\"\' \,\.\+-]*\s*[\,]*\s*[\(\<\{]{0,1}[A-Za-z0-9_\.\+-]+\@[A-Za-z0-9\.-]+\.[A-Za-z0-9]+[\)\>\}]{0,1}$g; | ||
414 | push(@file_emails, clean_file_emails(@poss_addr)); | ||
415 | } | ||
254 | } | 416 | } |
255 | } else { | 417 | } else { |
256 | my $file_cnt = @files; | 418 | my $file_cnt = @files; |
257 | my $lastfile; | 419 | my $lastfile; |
258 | open(PATCH, "<$file") or die "$P: Can't open ${file}\n"; | 420 | |
259 | while (<PATCH>) { | 421 | open(my $patch, "< $file") |
422 | or die "$P: Can't open $file: $!\n"; | ||
423 | while (<$patch>) { | ||
260 | my $patch_line = $_; | 424 | my $patch_line = $_; |
261 | if (m/^\+\+\+\s+(\S+)/) { | 425 | if (m/^\+\+\+\s+(\S+)/) { |
262 | my $filename = $1; | 426 | my $filename = $1; |
@@ -276,7 +440,8 @@ foreach my $file (@ARGV) { | |||
276 | } | 440 | } |
277 | } | 441 | } |
278 | } | 442 | } |
279 | close(PATCH); | 443 | close($patch); |
444 | |||
280 | if ($file_cnt == @files) { | 445 | if ($file_cnt == @files) { |
281 | warn "$P: file '${file}' doesn't appear to be a patch. " | 446 | warn "$P: file '${file}' doesn't appear to be a patch. " |
282 | . "Add -f to options?\n"; | 447 | . "Add -f to options?\n"; |
@@ -285,133 +450,247 @@ foreach my $file (@ARGV) { | |||
285 | } | 450 | } |
286 | } | 451 | } |
287 | 452 | ||
453 | @file_emails = uniq(@file_emails); | ||
454 | |||
455 | my %email_hash_name; | ||
456 | my %email_hash_address; | ||
288 | my @email_to = (); | 457 | my @email_to = (); |
458 | my %hash_list_to; | ||
289 | my @list_to = (); | 459 | my @list_to = (); |
290 | my @scm = (); | 460 | my @scm = (); |
291 | my @web = (); | 461 | my @web = (); |
292 | my @subsystem = (); | 462 | my @subsystem = (); |
293 | my @status = (); | 463 | my @status = (); |
464 | my %deduplicate_name_hash = (); | ||
465 | my %deduplicate_address_hash = (); | ||
466 | my $signature_pattern; | ||
294 | 467 | ||
295 | # Find responsible parties | 468 | my @maintainers = get_maintainers(); |
296 | 469 | ||
297 | foreach my $file (@files) { | 470 | if (@maintainers) { |
471 | @maintainers = merge_email(@maintainers); | ||
472 | output(@maintainers); | ||
473 | } | ||
298 | 474 | ||
299 | my %hash; | 475 | if ($scm) { |
300 | my $tvi = find_first_section(); | 476 | @scm = uniq(@scm); |
301 | while ($tvi < @typevalue) { | 477 | output(@scm); |
302 | my $start = find_starting_index($tvi); | 478 | } |
303 | my $end = find_ending_index($tvi); | 479 | |
304 | my $exclude = 0; | 480 | if ($status) { |
305 | my $i; | 481 | @status = uniq(@status); |
306 | 482 | output(@status); | |
307 | #Do not match excluded file patterns | 483 | } |
308 | 484 | ||
309 | for ($i = $start; $i < $end; $i++) { | 485 | if ($subsystem) { |
310 | my $line = $typevalue[$i]; | 486 | @subsystem = uniq(@subsystem); |
311 | if ($line =~ m/^(\C):\s*(.*)/) { | 487 | output(@subsystem); |
312 | my $type = $1; | 488 | } |
313 | my $value = $2; | 489 | |
314 | if ($type eq 'X') { | 490 | if ($web) { |
315 | if (file_match_pattern($file, $value)) { | 491 | @web = uniq(@web); |
316 | $exclude = 1; | 492 | output(@web); |
317 | } | 493 | } |
494 | |||
495 | exit($exit); | ||
496 | |||
497 | sub range_is_maintained { | ||
498 | my ($start, $end) = @_; | ||
499 | |||
500 | for (my $i = $start; $i < $end; $i++) { | ||
501 | my $line = $typevalue[$i]; | ||
502 | if ($line =~ m/^(\C):\s*(.*)/) { | ||
503 | my $type = $1; | ||
504 | my $value = $2; | ||
505 | if ($type eq 'S') { | ||
506 | if ($value =~ /(maintain|support)/i) { | ||
507 | return 1; | ||
318 | } | 508 | } |
319 | } | 509 | } |
320 | } | 510 | } |
511 | } | ||
512 | return 0; | ||
513 | } | ||
514 | |||
515 | sub range_has_maintainer { | ||
516 | my ($start, $end) = @_; | ||
517 | |||
518 | for (my $i = $start; $i < $end; $i++) { | ||
519 | my $line = $typevalue[$i]; | ||
520 | if ($line =~ m/^(\C):\s*(.*)/) { | ||
521 | my $type = $1; | ||
522 | my $value = $2; | ||
523 | if ($type eq 'M') { | ||
524 | return 1; | ||
525 | } | ||
526 | } | ||
527 | } | ||
528 | return 0; | ||
529 | } | ||
530 | |||
531 | sub get_maintainers { | ||
532 | %email_hash_name = (); | ||
533 | %email_hash_address = (); | ||
534 | %commit_author_hash = (); | ||
535 | %commit_signer_hash = (); | ||
536 | @email_to = (); | ||
537 | %hash_list_to = (); | ||
538 | @list_to = (); | ||
539 | @scm = (); | ||
540 | @web = (); | ||
541 | @subsystem = (); | ||
542 | @status = (); | ||
543 | %deduplicate_name_hash = (); | ||
544 | %deduplicate_address_hash = (); | ||
545 | if ($email_git_all_signature_types) { | ||
546 | $signature_pattern = "(.+?)[Bb][Yy]:"; | ||
547 | } else { | ||
548 | $signature_pattern = "\(" . join("|", @signature_tags) . "\)"; | ||
549 | } | ||
550 | |||
551 | # Find responsible parties | ||
552 | |||
553 | my %exact_pattern_match_hash = (); | ||
554 | |||
555 | foreach my $file (@files) { | ||
556 | |||
557 | my %hash; | ||
558 | my $tvi = find_first_section(); | ||
559 | while ($tvi < @typevalue) { | ||
560 | my $start = find_starting_index($tvi); | ||
561 | my $end = find_ending_index($tvi); | ||
562 | my $exclude = 0; | ||
563 | my $i; | ||
564 | |||
565 | #Do not match excluded file patterns | ||
321 | 566 | ||
322 | if (!$exclude) { | ||
323 | for ($i = $start; $i < $end; $i++) { | 567 | for ($i = $start; $i < $end; $i++) { |
324 | my $line = $typevalue[$i]; | 568 | my $line = $typevalue[$i]; |
325 | if ($line =~ m/^(\C):\s*(.*)/) { | 569 | if ($line =~ m/^(\C):\s*(.*)/) { |
326 | my $type = $1; | 570 | my $type = $1; |
327 | my $value = $2; | 571 | my $value = $2; |
328 | if ($type eq 'F') { | 572 | if ($type eq 'X') { |
329 | if (file_match_pattern($file, $value)) { | 573 | if (file_match_pattern($file, $value)) { |
330 | my $value_pd = ($value =~ tr@/@@); | 574 | $exclude = 1; |
331 | my $file_pd = ($file =~ tr@/@@); | 575 | last; |
332 | $value_pd++ if (substr($value,-1,1) ne "/"); | 576 | } |
333 | if ($pattern_depth == 0 || | 577 | } |
334 | (($file_pd - $value_pd) < $pattern_depth)) { | 578 | } |
335 | $hash{$tvi} = $value_pd; | 579 | } |
580 | |||
581 | if (!$exclude) { | ||
582 | for ($i = $start; $i < $end; $i++) { | ||
583 | my $line = $typevalue[$i]; | ||
584 | if ($line =~ m/^(\C):\s*(.*)/) { | ||
585 | my $type = $1; | ||
586 | my $value = $2; | ||
587 | if ($type eq 'F') { | ||
588 | if (file_match_pattern($file, $value)) { | ||
589 | my $value_pd = ($value =~ tr@/@@); | ||
590 | my $file_pd = ($file =~ tr@/@@); | ||
591 | $value_pd++ if (substr($value,-1,1) ne "/"); | ||
592 | $value_pd = -1 if ($value =~ /^\.\*/); | ||
593 | if ($value_pd >= $file_pd && | ||
594 | range_is_maintained($start, $end) && | ||
595 | range_has_maintainer($start, $end)) { | ||
596 | $exact_pattern_match_hash{$file} = 1; | ||
597 | } | ||
598 | if ($pattern_depth == 0 || | ||
599 | (($file_pd - $value_pd) < $pattern_depth)) { | ||
600 | $hash{$tvi} = $value_pd; | ||
601 | } | ||
336 | } | 602 | } |
337 | } | 603 | } |
338 | } | 604 | } |
339 | } | 605 | } |
340 | } | 606 | } |
607 | $tvi = $end + 1; | ||
341 | } | 608 | } |
342 | 609 | ||
343 | $tvi += ($end - $start); | 610 | foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { |
344 | 611 | add_categories($line); | |
612 | if ($sections) { | ||
613 | my $i; | ||
614 | my $start = find_starting_index($line); | ||
615 | my $end = find_ending_index($line); | ||
616 | for ($i = $start; $i < $end; $i++) { | ||
617 | my $line = $typevalue[$i]; | ||
618 | if ($line =~ /^[FX]:/) { ##Restore file patterns | ||
619 | $line =~ s/([^\\])\.([^\*])/$1\?$2/g; | ||
620 | $line =~ s/([^\\])\.$/$1\?/g; ##Convert . back to ? | ||
621 | $line =~ s/\\\./\./g; ##Convert \. to . | ||
622 | $line =~ s/\.\*/\*/g; ##Convert .* to * | ||
623 | } | ||
624 | $line =~ s/^([A-Z]):/$1:\t/g; | ||
625 | print("$line\n"); | ||
626 | } | ||
627 | print("\n"); | ||
628 | } | ||
629 | } | ||
345 | } | 630 | } |
346 | 631 | ||
347 | foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { | 632 | if ($keywords) { |
348 | add_categories($line); | 633 | @keyword_tvi = sort_and_uniq(@keyword_tvi); |
634 | foreach my $line (@keyword_tvi) { | ||
635 | add_categories($line); | ||
636 | } | ||
349 | } | 637 | } |
350 | 638 | ||
351 | if ($email && $email_git) { | 639 | foreach my $email (@email_to, @list_to) { |
352 | vcs_file_signoffs($file); | 640 | $email->[0] = deduplicate_email($email->[0]); |
353 | } | 641 | } |
354 | 642 | ||
355 | if ($email && $email_git_blame) { | 643 | foreach my $file (@files) { |
356 | vcs_file_blame($file); | 644 | if ($email && |
357 | } | 645 | ($email_git || ($email_git_fallback && |
358 | } | 646 | !$exact_pattern_match_hash{$file}))) { |
359 | 647 | vcs_file_signoffs($file); | |
360 | if ($keywords) { | 648 | } |
361 | @keyword_tvi = sort_and_uniq(@keyword_tvi); | 649 | if ($email && $email_git_blame) { |
362 | foreach my $line (@keyword_tvi) { | 650 | vcs_file_blame($file); |
363 | add_categories($line); | 651 | } |
364 | } | 652 | } |
365 | } | ||
366 | 653 | ||
367 | if ($email) { | 654 | if ($email) { |
368 | foreach my $chief (@penguin_chief) { | 655 | foreach my $chief (@penguin_chief) { |
369 | if ($chief =~ m/^(.*):(.*)/) { | 656 | if ($chief =~ m/^(.*):(.*)/) { |
370 | my $email_address; | 657 | my $email_address; |
371 | 658 | ||
372 | $email_address = format_email($1, $2, $email_usename); | 659 | $email_address = format_email($1, $2, $email_usename); |
373 | if ($email_git_penguin_chiefs) { | 660 | if ($email_git_penguin_chiefs) { |
374 | push(@email_to, [$email_address, 'chief penguin']); | 661 | push(@email_to, [$email_address, 'chief penguin']); |
375 | } else { | 662 | } else { |
376 | @email_to = grep($_->[0] !~ /${email_address}/, @email_to); | 663 | @email_to = grep($_->[0] !~ /${email_address}/, @email_to); |
664 | } | ||
377 | } | 665 | } |
378 | } | 666 | } |
667 | |||
668 | foreach my $email (@file_emails) { | ||
669 | my ($name, $address) = parse_email($email); | ||
670 | |||
671 | my $tmp_email = format_email($name, $address, $email_usename); | ||
672 | push_email_address($tmp_email, ''); | ||
673 | add_role($tmp_email, 'in file'); | ||
674 | } | ||
379 | } | 675 | } |
380 | } | ||
381 | 676 | ||
382 | if ($email || $email_list) { | ||
383 | my @to = (); | 677 | my @to = (); |
384 | if ($email) { | 678 | if ($email || $email_list) { |
385 | @to = (@to, @email_to); | 679 | if ($email) { |
386 | } | 680 | @to = (@to, @email_to); |
387 | if ($email_list) { | 681 | } |
388 | @to = (@to, @list_to); | 682 | if ($email_list) { |
683 | @to = (@to, @list_to); | ||
684 | } | ||
389 | } | 685 | } |
390 | output(merge_email(@to)); | ||
391 | } | ||
392 | |||
393 | if ($scm) { | ||
394 | @scm = uniq(@scm); | ||
395 | output(@scm); | ||
396 | } | ||
397 | 686 | ||
398 | if ($status) { | 687 | if ($interactive) { |
399 | @status = uniq(@status); | 688 | @to = interactive_get_maintainers(\@to); |
400 | output(@status); | 689 | } |
401 | } | ||
402 | |||
403 | if ($subsystem) { | ||
404 | @subsystem = uniq(@subsystem); | ||
405 | output(@subsystem); | ||
406 | } | ||
407 | 690 | ||
408 | if ($web) { | 691 | return @to; |
409 | @web = uniq(@web); | ||
410 | output(@web); | ||
411 | } | 692 | } |
412 | 693 | ||
413 | exit($exit); | ||
414 | |||
415 | sub file_match_pattern { | 694 | sub file_match_pattern { |
416 | my ($file, $pattern) = @_; | 695 | my ($file, $pattern) = @_; |
417 | if (substr($pattern, -1) eq "/") { | 696 | if (substr($pattern, -1) eq "/") { |
@@ -439,13 +718,17 @@ version: $V | |||
439 | MAINTAINER field selection options: | 718 | MAINTAINER field selection options: |
440 | --email => print email address(es) if any | 719 | --email => print email address(es) if any |
441 | --git => include recent git \*-by: signers | 720 | --git => include recent git \*-by: signers |
721 | --git-all-signature-types => include signers regardless of signature type | ||
722 | or use only ${signature_pattern} signers (default: $email_git_all_signature_types) | ||
723 | --git-fallback => use git when no exact MAINTAINERS pattern (default: $email_git_fallback) | ||
442 | --git-chief-penguins => include ${penguin_chiefs} | 724 | --git-chief-penguins => include ${penguin_chiefs} |
443 | --git-min-signatures => number of signatures required (default: 1) | 725 | --git-min-signatures => number of signatures required (default: $email_git_min_signatures) |
444 | --git-max-maintainers => maximum maintainers to add (default: 5) | 726 | --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers) |
445 | --git-min-percent => minimum percentage of commits required (default: 5) | 727 | --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent) |
446 | --git-blame => use git blame to find modified commits for patch or file | 728 | --git-blame => use git blame to find modified commits for patch or file |
447 | --git-since => git history to use (default: 1-year-ago) | 729 | --git-since => git history to use (default: $email_git_since) |
448 | --hg-since => hg history to use (default: -365) | 730 | --hg-since => hg history to use (default: $email_hg_since) |
731 | --interactive => display a menu (mostly useful if used with the --git option) | ||
449 | --m => include maintainer(s) if any | 732 | --m => include maintainer(s) if any |
450 | --n => include name 'Full Name <addr\@domain.tld>' | 733 | --n => include name 'Full Name <addr\@domain.tld>' |
451 | --l => include list(s) if any | 734 | --l => include list(s) if any |
@@ -453,6 +736,7 @@ MAINTAINER field selection options: | |||
453 | --remove-duplicates => minimize duplicate email names/addresses | 736 | --remove-duplicates => minimize duplicate email names/addresses |
454 | --roles => show roles (status:subsystem, git-signer, list, etc...) | 737 | --roles => show roles (status:subsystem, git-signer, list, etc...) |
455 | --rolestats => show roles and statistics (commits/total_commits, %) | 738 | --rolestats => show roles and statistics (commits/total_commits, %) |
739 | --file-emails => add email addresses found in -f file (default: 0 (off)) | ||
456 | --scm => print SCM tree(s) if any | 740 | --scm => print SCM tree(s) if any |
457 | --status => print status if any | 741 | --status => print status if any |
458 | --subsystem => print subsystem name if any | 742 | --subsystem => print subsystem name if any |
@@ -465,12 +749,15 @@ Output type options: | |||
465 | 749 | ||
466 | Other options: | 750 | Other options: |
467 | --pattern-depth => Number of pattern directory traversals (default: 0 (all)) | 751 | --pattern-depth => Number of pattern directory traversals (default: 0 (all)) |
468 | --keywords => scan patch for keywords (default: 1 (on)) | 752 | --keywords => scan patch for keywords (default: $keywords) |
753 | --sections => print all of the subsystem sections with pattern matches | ||
754 | --mailmap => use .mailmap file (default: $email_use_mailmap) | ||
469 | --version => show version | 755 | --version => show version |
470 | --help => show this help information | 756 | --help => show this help information |
471 | 757 | ||
472 | Default options: | 758 | Default options: |
473 | [--email --git --m --n --l --multiline --pattern-depth=0 --remove-duplicates] | 759 | [--email --nogit --git-fallback --m --n --l --multiline -pattern-depth=0 |
760 | --remove-duplicates --rolestats] | ||
474 | 761 | ||
475 | Notes: | 762 | Notes: |
476 | Using "-f directory" may give unexpected results: | 763 | Using "-f directory" may give unexpected results: |
@@ -496,34 +783,39 @@ Notes: | |||
496 | --git-min-signatures, --git-max-maintainers, --git-min-percent, and | 783 | --git-min-signatures, --git-max-maintainers, --git-min-percent, and |
497 | --git-blame | 784 | --git-blame |
498 | Use --hg-since not --git-since to control date selection | 785 | Use --hg-since not --git-since to control date selection |
786 | File ".get_maintainer.conf", if it exists in the linux kernel source root | ||
787 | directory, can change whatever get_maintainer defaults are desired. | ||
788 | Entries in this file can be any command line argument. | ||
789 | This file is prepended to any additional command line arguments. | ||
790 | Multiple lines and # comments are allowed. | ||
499 | EOT | 791 | EOT |
500 | } | 792 | } |
501 | 793 | ||
502 | sub top_of_kernel_tree { | 794 | sub top_of_kernel_tree { |
503 | my ($lk_path) = @_; | 795 | my ($lk_path) = @_; |
504 | 796 | ||
505 | if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") { | 797 | if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") { |
506 | $lk_path .= "/"; | 798 | $lk_path .= "/"; |
507 | } | 799 | } |
508 | if ( (-f "${lk_path}COPYING") | 800 | if ( (-f "${lk_path}COPYING") |
509 | && (-f "${lk_path}CREDITS") | 801 | && (-f "${lk_path}CREDITS") |
510 | && (-f "${lk_path}Kbuild") | 802 | && (-f "${lk_path}Kbuild") |
511 | && (-f "${lk_path}MAINTAINERS") | 803 | && (-f "${lk_path}MAINTAINERS") |
512 | && (-f "${lk_path}Makefile") | 804 | && (-f "${lk_path}Makefile") |
513 | && (-f "${lk_path}README") | 805 | && (-f "${lk_path}README") |
514 | && (-d "${lk_path}Documentation") | 806 | && (-d "${lk_path}Documentation") |
515 | && (-d "${lk_path}arch") | 807 | && (-d "${lk_path}arch") |
516 | && (-d "${lk_path}include") | 808 | && (-d "${lk_path}include") |
517 | && (-d "${lk_path}drivers") | 809 | && (-d "${lk_path}drivers") |
518 | && (-d "${lk_path}fs") | 810 | && (-d "${lk_path}fs") |
519 | && (-d "${lk_path}init") | 811 | && (-d "${lk_path}init") |
520 | && (-d "${lk_path}ipc") | 812 | && (-d "${lk_path}ipc") |
521 | && (-d "${lk_path}kernel") | 813 | && (-d "${lk_path}kernel") |
522 | && (-d "${lk_path}lib") | 814 | && (-d "${lk_path}lib") |
523 | && (-d "${lk_path}scripts")) { | 815 | && (-d "${lk_path}scripts")) { |
524 | return 1; | 816 | return 1; |
525 | } | 817 | } |
526 | return 0; | 818 | return 0; |
527 | } | 819 | } |
528 | 820 | ||
529 | sub parse_email { | 821 | sub parse_email { |
@@ -545,7 +837,7 @@ sub parse_email { | |||
545 | $name =~ s/^\"|\"$//g; | 837 | $name =~ s/^\"|\"$//g; |
546 | $address =~ s/^\s+|\s+$//g; | 838 | $address =~ s/^\s+|\s+$//g; |
547 | 839 | ||
548 | if ($name =~ /[^a-z0-9 \.\-]/i) { ##has "must quote" chars | 840 | if ($name =~ /[^\w \-]/i) { ##has "must quote" chars |
549 | $name =~ s/(?<!\\)"/\\"/g; ##escape quotes | 841 | $name =~ s/(?<!\\)"/\\"/g; ##escape quotes |
550 | $name = "\"$name\""; | 842 | $name = "\"$name\""; |
551 | } | 843 | } |
@@ -562,7 +854,7 @@ sub format_email { | |||
562 | $name =~ s/^\"|\"$//g; | 854 | $name =~ s/^\"|\"$//g; |
563 | $address =~ s/^\s+|\s+$//g; | 855 | $address =~ s/^\s+|\s+$//g; |
564 | 856 | ||
565 | if ($name =~ /[^a-z0-9 \.\-]/i) { ##has "must quote" chars | 857 | if ($name =~ /[^\w \-]/i) { ##has "must quote" chars |
566 | $name =~ s/(?<!\\)"/\\"/g; ##escape quotes | 858 | $name =~ s/(?<!\\)"/\\"/g; ##escape quotes |
567 | $name = "\"$name\""; | 859 | $name = "\"$name\""; |
568 | } | 860 | } |
@@ -715,11 +1007,19 @@ sub add_categories { | |||
715 | } | 1007 | } |
716 | if ($list_additional =~ m/subscribers-only/) { | 1008 | if ($list_additional =~ m/subscribers-only/) { |
717 | if ($email_subscriber_list) { | 1009 | if ($email_subscriber_list) { |
718 | push(@list_to, [$list_address, "subscriber list${list_role}"]); | 1010 | if (!$hash_list_to{lc($list_address)}) { |
1011 | $hash_list_to{lc($list_address)} = 1; | ||
1012 | push(@list_to, [$list_address, | ||
1013 | "subscriber list${list_role}"]); | ||
1014 | } | ||
719 | } | 1015 | } |
720 | } else { | 1016 | } else { |
721 | if ($email_list) { | 1017 | if ($email_list) { |
722 | push(@list_to, [$list_address, "open list${list_role}"]); | 1018 | if (!$hash_list_to{lc($list_address)}) { |
1019 | $hash_list_to{lc($list_address)} = 1; | ||
1020 | push(@list_to, [$list_address, | ||
1021 | "open list${list_role}"]); | ||
1022 | } | ||
723 | } | 1023 | } |
724 | } | 1024 | } |
725 | } elsif ($ptype eq "M") { | 1025 | } elsif ($ptype eq "M") { |
@@ -750,15 +1050,12 @@ sub add_categories { | |||
750 | } | 1050 | } |
751 | } | 1051 | } |
752 | 1052 | ||
753 | my %email_hash_name; | ||
754 | my %email_hash_address; | ||
755 | |||
756 | sub email_inuse { | 1053 | sub email_inuse { |
757 | my ($name, $address) = @_; | 1054 | my ($name, $address) = @_; |
758 | 1055 | ||
759 | return 1 if (($name eq "") && ($address eq "")); | 1056 | return 1 if (($name eq "") && ($address eq "")); |
760 | return 1 if (($name ne "") && exists($email_hash_name{$name})); | 1057 | return 1 if (($name ne "") && exists($email_hash_name{lc($name)})); |
761 | return 1 if (($address ne "") && exists($email_hash_address{$address})); | 1058 | return 1 if (($address ne "") && exists($email_hash_address{lc($address)})); |
762 | 1059 | ||
763 | return 0; | 1060 | return 0; |
764 | } | 1061 | } |
@@ -776,8 +1073,8 @@ sub push_email_address { | |||
776 | push(@email_to, [format_email($name, $address, $email_usename), $role]); | 1073 | push(@email_to, [format_email($name, $address, $email_usename), $role]); |
777 | } elsif (!email_inuse($name, $address)) { | 1074 | } elsif (!email_inuse($name, $address)) { |
778 | push(@email_to, [format_email($name, $address, $email_usename), $role]); | 1075 | push(@email_to, [format_email($name, $address, $email_usename), $role]); |
779 | $email_hash_name{$name}++; | 1076 | $email_hash_name{lc($name)}++ if ($name ne ""); |
780 | $email_hash_address{$address}++; | 1077 | $email_hash_address{lc($address)}++; |
781 | } | 1078 | } |
782 | 1079 | ||
783 | return 1; | 1080 | return 1; |
@@ -811,7 +1108,9 @@ sub add_role { | |||
811 | foreach my $entry (@email_to) { | 1108 | foreach my $entry (@email_to) { |
812 | if ($email_remove_duplicates) { | 1109 | if ($email_remove_duplicates) { |
813 | my ($entry_name, $entry_address) = parse_email($entry->[0]); | 1110 | my ($entry_name, $entry_address) = parse_email($entry->[0]); |
814 | if ($name eq $entry_name || $address eq $entry_address) { | 1111 | if (($name eq $entry_name || $address eq $entry_address) |
1112 | && ($role eq "" || !($entry->[1] =~ m/$role/)) | ||
1113 | ) { | ||
815 | if ($entry->[1] eq "") { | 1114 | if ($entry->[1] eq "") { |
816 | $entry->[1] = "$role"; | 1115 | $entry->[1] = "$role"; |
817 | } else { | 1116 | } else { |
@@ -819,7 +1118,9 @@ sub add_role { | |||
819 | } | 1118 | } |
820 | } | 1119 | } |
821 | } else { | 1120 | } else { |
822 | if ($email eq $entry->[0]) { | 1121 | if ($email eq $entry->[0] |
1122 | && ($role eq "" || !($entry->[1] =~ m/$role/)) | ||
1123 | ) { | ||
823 | if ($entry->[1] eq "") { | 1124 | if ($entry->[1] eq "") { |
824 | $entry->[1] = "$role"; | 1125 | $entry->[1] = "$role"; |
825 | } else { | 1126 | } else { |
@@ -842,30 +1143,69 @@ sub which { | |||
842 | return ""; | 1143 | return ""; |
843 | } | 1144 | } |
844 | 1145 | ||
845 | sub mailmap { | 1146 | sub which_conf { |
846 | my (@lines) = @_; | 1147 | my ($conf) = @_; |
847 | my %hash; | ||
848 | 1148 | ||
849 | foreach my $line (@lines) { | 1149 | foreach my $path (split(/:/, ".:$ENV{HOME}:.scripts")) { |
850 | my ($name, $address) = parse_email($line); | 1150 | if (-e "$path/$conf") { |
851 | if (!exists($hash{$name})) { | 1151 | return "$path/$conf"; |
852 | $hash{$name} = $address; | ||
853 | } elsif ($address ne $hash{$name}) { | ||
854 | $address = $hash{$name}; | ||
855 | $line = format_email($name, $address, $email_usename); | ||
856 | } | 1152 | } |
857 | if (exists($mailmap{$name})) { | 1153 | } |
858 | my $obj = $mailmap{$name}; | 1154 | |
859 | foreach my $map_address (@$obj) { | 1155 | return ""; |
860 | if (($map_address eq $address) && | 1156 | } |
861 | ($map_address ne $hash{$name})) { | 1157 | |
862 | $line = format_email($name, $hash{$name}, $email_usename); | 1158 | sub mailmap_email { |
863 | } | 1159 | my ($line) = @_; |
864 | } | 1160 | |
1161 | my ($name, $address) = parse_email($line); | ||
1162 | my $email = format_email($name, $address, 1); | ||
1163 | my $real_name = $name; | ||
1164 | my $real_address = $address; | ||
1165 | |||
1166 | if (exists $mailmap->{names}->{$email} || | ||
1167 | exists $mailmap->{addresses}->{$email}) { | ||
1168 | if (exists $mailmap->{names}->{$email}) { | ||
1169 | $real_name = $mailmap->{names}->{$email}; | ||
865 | } | 1170 | } |
1171 | if (exists $mailmap->{addresses}->{$email}) { | ||
1172 | $real_address = $mailmap->{addresses}->{$email}; | ||
1173 | } | ||
1174 | } else { | ||
1175 | if (exists $mailmap->{names}->{$address}) { | ||
1176 | $real_name = $mailmap->{names}->{$address}; | ||
1177 | } | ||
1178 | if (exists $mailmap->{addresses}->{$address}) { | ||
1179 | $real_address = $mailmap->{addresses}->{$address}; | ||
1180 | } | ||
1181 | } | ||
1182 | return format_email($real_name, $real_address, 1); | ||
1183 | } | ||
1184 | |||
1185 | sub mailmap { | ||
1186 | my (@addresses) = @_; | ||
1187 | |||
1188 | my @mapped_emails = (); | ||
1189 | foreach my $line (@addresses) { | ||
1190 | push(@mapped_emails, mailmap_email($line)); | ||
866 | } | 1191 | } |
1192 | merge_by_realname(@mapped_emails) if ($email_use_mailmap); | ||
1193 | return @mapped_emails; | ||
1194 | } | ||
867 | 1195 | ||
868 | return @lines; | 1196 | sub merge_by_realname { |
1197 | my %address_map; | ||
1198 | my (@emails) = @_; | ||
1199 | |||
1200 | foreach my $email (@emails) { | ||
1201 | my ($name, $address) = parse_email($email); | ||
1202 | if (exists $address_map{$name}) { | ||
1203 | $address = $address_map{$name}; | ||
1204 | $email = format_email($name, $address, 1); | ||
1205 | } else { | ||
1206 | $address_map{$name} = $address; | ||
1207 | } | ||
1208 | } | ||
869 | } | 1209 | } |
870 | 1210 | ||
871 | sub git_execute_cmd { | 1211 | sub git_execute_cmd { |
@@ -889,10 +1229,30 @@ sub hg_execute_cmd { | |||
889 | return @lines; | 1229 | return @lines; |
890 | } | 1230 | } |
891 | 1231 | ||
1232 | sub extract_formatted_signatures { | ||
1233 | my (@signature_lines) = @_; | ||
1234 | |||
1235 | my @type = @signature_lines; | ||
1236 | |||
1237 | s/\s*(.*):.*/$1/ for (@type); | ||
1238 | |||
1239 | # cut -f2- -d":" | ||
1240 | s/\s*.*:\s*(.+)\s*/$1/ for (@signature_lines); | ||
1241 | |||
1242 | ## Reformat email addresses (with names) to avoid badly written signatures | ||
1243 | |||
1244 | foreach my $signer (@signature_lines) { | ||
1245 | $signer = deduplicate_email($signer); | ||
1246 | } | ||
1247 | |||
1248 | return (\@type, \@signature_lines); | ||
1249 | } | ||
1250 | |||
892 | sub vcs_find_signers { | 1251 | sub vcs_find_signers { |
893 | my ($cmd) = @_; | 1252 | my ($cmd) = @_; |
894 | my @lines = (); | ||
895 | my $commits; | 1253 | my $commits; |
1254 | my @lines = (); | ||
1255 | my @signatures = (); | ||
896 | 1256 | ||
897 | @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); | 1257 | @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); |
898 | 1258 | ||
@@ -900,21 +1260,48 @@ sub vcs_find_signers { | |||
900 | 1260 | ||
901 | $commits = grep(/$pattern/, @lines); # of commits | 1261 | $commits = grep(/$pattern/, @lines); # of commits |
902 | 1262 | ||
903 | @lines = grep(/^[-_ a-z]+by:.*\@.*$/i, @lines); | 1263 | @signatures = grep(/^[ \t]*${signature_pattern}.*\@.*$/, @lines); |
1264 | |||
1265 | return (0, @signatures) if !@signatures; | ||
1266 | |||
1267 | save_commits_by_author(@lines) if ($interactive); | ||
1268 | save_commits_by_signer(@lines) if ($interactive); | ||
1269 | |||
1270 | if (!$email_git_penguin_chiefs) { | ||
1271 | @signatures = grep(!/${penguin_chiefs}/i, @signatures); | ||
1272 | } | ||
1273 | |||
1274 | my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); | ||
1275 | |||
1276 | return ($commits, @$signers_ref); | ||
1277 | } | ||
1278 | |||
1279 | sub vcs_find_author { | ||
1280 | my ($cmd) = @_; | ||
1281 | my @lines = (); | ||
1282 | |||
1283 | @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); | ||
1284 | |||
904 | if (!$email_git_penguin_chiefs) { | 1285 | if (!$email_git_penguin_chiefs) { |
905 | @lines = grep(!/${penguin_chiefs}/i, @lines); | 1286 | @lines = grep(!/${penguin_chiefs}/i, @lines); |
906 | } | 1287 | } |
907 | # cut -f2- -d":" | ||
908 | s/.*:\s*(.+)\s*/$1/ for (@lines); | ||
909 | 1288 | ||
910 | ## Reformat email addresses (with names) to avoid badly written signatures | 1289 | return @lines if !@lines; |
911 | 1290 | ||
1291 | my @authors = (); | ||
912 | foreach my $line (@lines) { | 1292 | foreach my $line (@lines) { |
913 | my ($name, $address) = parse_email($line); | 1293 | if ($line =~ m/$VCS_cmds{"author_pattern"}/) { |
914 | $line = format_email($name, $address, 1); | 1294 | my $author = $1; |
1295 | my ($name, $address) = parse_email($author); | ||
1296 | $author = format_email($name, $address, 1); | ||
1297 | push(@authors, $author); | ||
1298 | } | ||
915 | } | 1299 | } |
916 | 1300 | ||
917 | return ($commits, @lines); | 1301 | save_commits_by_author(@lines) if ($interactive); |
1302 | save_commits_by_signer(@lines) if ($interactive); | ||
1303 | |||
1304 | return @authors; | ||
918 | } | 1305 | } |
919 | 1306 | ||
920 | sub vcs_save_commits { | 1307 | sub vcs_save_commits { |
@@ -974,6 +1361,10 @@ sub vcs_blame { | |||
974 | @commits = vcs_save_commits($cmd); | 1361 | @commits = vcs_save_commits($cmd); |
975 | } | 1362 | } |
976 | 1363 | ||
1364 | foreach my $commit (@commits) { | ||
1365 | $commit =~ s/^\^//g; | ||
1366 | } | ||
1367 | |||
977 | return @commits; | 1368 | return @commits; |
978 | } | 1369 | } |
979 | 1370 | ||
@@ -982,7 +1373,7 @@ sub vcs_exists { | |||
982 | %VCS_cmds = %VCS_cmds_git; | 1373 | %VCS_cmds = %VCS_cmds_git; |
983 | return 1 if eval $VCS_cmds{"available"}; | 1374 | return 1 if eval $VCS_cmds{"available"}; |
984 | %VCS_cmds = %VCS_cmds_hg; | 1375 | %VCS_cmds = %VCS_cmds_hg; |
985 | return 1 if eval $VCS_cmds{"available"}; | 1376 | return 2 if eval $VCS_cmds{"available"}; |
986 | %VCS_cmds = (); | 1377 | %VCS_cmds = (); |
987 | if (!$printed_novcs) { | 1378 | if (!$printed_novcs) { |
988 | warn("$P: No supported VCS found. Add --nogit to options?\n"); | 1379 | warn("$P: No supported VCS found. Add --nogit to options?\n"); |
@@ -994,6 +1385,405 @@ sub vcs_exists { | |||
994 | return 0; | 1385 | return 0; |
995 | } | 1386 | } |
996 | 1387 | ||
1388 | sub vcs_is_git { | ||
1389 | vcs_exists(); | ||
1390 | return $vcs_used == 1; | ||
1391 | } | ||
1392 | |||
1393 | sub vcs_is_hg { | ||
1394 | return $vcs_used == 2; | ||
1395 | } | ||
1396 | |||
1397 | sub interactive_get_maintainers { | ||
1398 | my ($list_ref) = @_; | ||
1399 | my @list = @$list_ref; | ||
1400 | |||
1401 | vcs_exists(); | ||
1402 | |||
1403 | my %selected; | ||
1404 | my %authored; | ||
1405 | my %signed; | ||
1406 | my $count = 0; | ||
1407 | my $maintained = 0; | ||
1408 | foreach my $entry (@list) { | ||
1409 | $maintained = 1 if ($entry->[1] =~ /^(maintainer|supporter)/i); | ||
1410 | $selected{$count} = 1; | ||
1411 | $authored{$count} = 0; | ||
1412 | $signed{$count} = 0; | ||
1413 | $count++; | ||
1414 | } | ||
1415 | |||
1416 | #menu loop | ||
1417 | my $done = 0; | ||
1418 | my $print_options = 0; | ||
1419 | my $redraw = 1; | ||
1420 | while (!$done) { | ||
1421 | $count = 0; | ||
1422 | if ($redraw) { | ||
1423 | printf STDERR "\n%1s %2s %-65s", | ||
1424 | "*", "#", "email/list and role:stats"; | ||
1425 | if ($email_git || | ||
1426 | ($email_git_fallback && !$maintained) || | ||
1427 | $email_git_blame) { | ||
1428 | print STDERR "auth sign"; | ||
1429 | } | ||
1430 | print STDERR "\n"; | ||
1431 | foreach my $entry (@list) { | ||
1432 | my $email = $entry->[0]; | ||
1433 | my $role = $entry->[1]; | ||
1434 | my $sel = ""; | ||
1435 | $sel = "*" if ($selected{$count}); | ||
1436 | my $commit_author = $commit_author_hash{$email}; | ||
1437 | my $commit_signer = $commit_signer_hash{$email}; | ||
1438 | my $authored = 0; | ||
1439 | my $signed = 0; | ||
1440 | $authored++ for (@{$commit_author}); | ||
1441 | $signed++ for (@{$commit_signer}); | ||
1442 | printf STDERR "%1s %2d %-65s", $sel, $count + 1, $email; | ||
1443 | printf STDERR "%4d %4d", $authored, $signed | ||
1444 | if ($authored > 0 || $signed > 0); | ||
1445 | printf STDERR "\n %s\n", $role; | ||
1446 | if ($authored{$count}) { | ||
1447 | my $commit_author = $commit_author_hash{$email}; | ||
1448 | foreach my $ref (@{$commit_author}) { | ||
1449 | print STDERR " Author: @{$ref}[1]\n"; | ||
1450 | } | ||
1451 | } | ||
1452 | if ($signed{$count}) { | ||
1453 | my $commit_signer = $commit_signer_hash{$email}; | ||
1454 | foreach my $ref (@{$commit_signer}) { | ||
1455 | print STDERR " @{$ref}[2]: @{$ref}[1]\n"; | ||
1456 | } | ||
1457 | } | ||
1458 | |||
1459 | $count++; | ||
1460 | } | ||
1461 | } | ||
1462 | my $date_ref = \$email_git_since; | ||
1463 | $date_ref = \$email_hg_since if (vcs_is_hg()); | ||
1464 | if ($print_options) { | ||
1465 | $print_options = 0; | ||
1466 | if (vcs_exists()) { | ||
1467 | print STDERR <<EOT | ||
1468 | |||
1469 | Version Control options: | ||
1470 | g use git history [$email_git] | ||
1471 | gf use git-fallback [$email_git_fallback] | ||
1472 | b use git blame [$email_git_blame] | ||
1473 | bs use blame signatures [$email_git_blame_signatures] | ||
1474 | c# minimum commits [$email_git_min_signatures] | ||
1475 | %# min percent [$email_git_min_percent] | ||
1476 | d# history to use [$$date_ref] | ||
1477 | x# max maintainers [$email_git_max_maintainers] | ||
1478 | t all signature types [$email_git_all_signature_types] | ||
1479 | m use .mailmap [$email_use_mailmap] | ||
1480 | EOT | ||
1481 | } | ||
1482 | print STDERR <<EOT | ||
1483 | |||
1484 | Additional options: | ||
1485 | 0 toggle all | ||
1486 | tm toggle maintainers | ||
1487 | tg toggle git entries | ||
1488 | tl toggle open list entries | ||
1489 | ts toggle subscriber list entries | ||
1490 | f emails in file [$file_emails] | ||
1491 | k keywords in file [$keywords] | ||
1492 | r remove duplicates [$email_remove_duplicates] | ||
1493 | p# pattern match depth [$pattern_depth] | ||
1494 | EOT | ||
1495 | } | ||
1496 | print STDERR | ||
1497 | "\n#(toggle), A#(author), S#(signed) *(all), ^(none), O(options), Y(approve): "; | ||
1498 | |||
1499 | my $input = <STDIN>; | ||
1500 | chomp($input); | ||
1501 | |||
1502 | $redraw = 1; | ||
1503 | my $rerun = 0; | ||
1504 | my @wish = split(/[, ]+/, $input); | ||
1505 | foreach my $nr (@wish) { | ||
1506 | $nr = lc($nr); | ||
1507 | my $sel = substr($nr, 0, 1); | ||
1508 | my $str = substr($nr, 1); | ||
1509 | my $val = 0; | ||
1510 | $val = $1 if $str =~ /^(\d+)$/; | ||
1511 | |||
1512 | if ($sel eq "y") { | ||
1513 | $interactive = 0; | ||
1514 | $done = 1; | ||
1515 | $output_rolestats = 0; | ||
1516 | $output_roles = 0; | ||
1517 | last; | ||
1518 | } elsif ($nr =~ /^\d+$/ && $nr > 0 && $nr <= $count) { | ||
1519 | $selected{$nr - 1} = !$selected{$nr - 1}; | ||
1520 | } elsif ($sel eq "*" || $sel eq '^') { | ||
1521 | my $toggle = 0; | ||
1522 | $toggle = 1 if ($sel eq '*'); | ||
1523 | for (my $i = 0; $i < $count; $i++) { | ||
1524 | $selected{$i} = $toggle; | ||
1525 | } | ||
1526 | } elsif ($sel eq "0") { | ||
1527 | for (my $i = 0; $i < $count; $i++) { | ||
1528 | $selected{$i} = !$selected{$i}; | ||
1529 | } | ||
1530 | } elsif ($sel eq "t") { | ||
1531 | if (lc($str) eq "m") { | ||
1532 | for (my $i = 0; $i < $count; $i++) { | ||
1533 | $selected{$i} = !$selected{$i} | ||
1534 | if ($list[$i]->[1] =~ /^(maintainer|supporter)/i); | ||
1535 | } | ||
1536 | } elsif (lc($str) eq "g") { | ||
1537 | for (my $i = 0; $i < $count; $i++) { | ||
1538 | $selected{$i} = !$selected{$i} | ||
1539 | if ($list[$i]->[1] =~ /^(author|commit|signer)/i); | ||
1540 | } | ||
1541 | } elsif (lc($str) eq "l") { | ||
1542 | for (my $i = 0; $i < $count; $i++) { | ||
1543 | $selected{$i} = !$selected{$i} | ||
1544 | if ($list[$i]->[1] =~ /^(open list)/i); | ||
1545 | } | ||
1546 | } elsif (lc($str) eq "s") { | ||
1547 | for (my $i = 0; $i < $count; $i++) { | ||
1548 | $selected{$i} = !$selected{$i} | ||
1549 | if ($list[$i]->[1] =~ /^(subscriber list)/i); | ||
1550 | } | ||
1551 | } | ||
1552 | } elsif ($sel eq "a") { | ||
1553 | if ($val > 0 && $val <= $count) { | ||
1554 | $authored{$val - 1} = !$authored{$val - 1}; | ||
1555 | } elsif ($str eq '*' || $str eq '^') { | ||
1556 | my $toggle = 0; | ||
1557 | $toggle = 1 if ($str eq '*'); | ||
1558 | for (my $i = 0; $i < $count; $i++) { | ||
1559 | $authored{$i} = $toggle; | ||
1560 | } | ||
1561 | } | ||
1562 | } elsif ($sel eq "s") { | ||
1563 | if ($val > 0 && $val <= $count) { | ||
1564 | $signed{$val - 1} = !$signed{$val - 1}; | ||
1565 | } elsif ($str eq '*' || $str eq '^') { | ||
1566 | my $toggle = 0; | ||
1567 | $toggle = 1 if ($str eq '*'); | ||
1568 | for (my $i = 0; $i < $count; $i++) { | ||
1569 | $signed{$i} = $toggle; | ||
1570 | } | ||
1571 | } | ||
1572 | } elsif ($sel eq "o") { | ||
1573 | $print_options = 1; | ||
1574 | $redraw = 1; | ||
1575 | } elsif ($sel eq "g") { | ||
1576 | if ($str eq "f") { | ||
1577 | bool_invert(\$email_git_fallback); | ||
1578 | } else { | ||
1579 | bool_invert(\$email_git); | ||
1580 | } | ||
1581 | $rerun = 1; | ||
1582 | } elsif ($sel eq "b") { | ||
1583 | if ($str eq "s") { | ||
1584 | bool_invert(\$email_git_blame_signatures); | ||
1585 | } else { | ||
1586 | bool_invert(\$email_git_blame); | ||
1587 | } | ||
1588 | $rerun = 1; | ||
1589 | } elsif ($sel eq "c") { | ||
1590 | if ($val > 0) { | ||
1591 | $email_git_min_signatures = $val; | ||
1592 | $rerun = 1; | ||
1593 | } | ||
1594 | } elsif ($sel eq "x") { | ||
1595 | if ($val > 0) { | ||
1596 | $email_git_max_maintainers = $val; | ||
1597 | $rerun = 1; | ||
1598 | } | ||
1599 | } elsif ($sel eq "%") { | ||
1600 | if ($str ne "" && $val >= 0) { | ||
1601 | $email_git_min_percent = $val; | ||
1602 | $rerun = 1; | ||
1603 | } | ||
1604 | } elsif ($sel eq "d") { | ||
1605 | if (vcs_is_git()) { | ||
1606 | $email_git_since = $str; | ||
1607 | } elsif (vcs_is_hg()) { | ||
1608 | $email_hg_since = $str; | ||
1609 | } | ||
1610 | $rerun = 1; | ||
1611 | } elsif ($sel eq "t") { | ||
1612 | bool_invert(\$email_git_all_signature_types); | ||
1613 | $rerun = 1; | ||
1614 | } elsif ($sel eq "f") { | ||
1615 | bool_invert(\$file_emails); | ||
1616 | $rerun = 1; | ||
1617 | } elsif ($sel eq "r") { | ||
1618 | bool_invert(\$email_remove_duplicates); | ||
1619 | $rerun = 1; | ||
1620 | } elsif ($sel eq "m") { | ||
1621 | bool_invert(\$email_use_mailmap); | ||
1622 | read_mailmap(); | ||
1623 | $rerun = 1; | ||
1624 | } elsif ($sel eq "k") { | ||
1625 | bool_invert(\$keywords); | ||
1626 | $rerun = 1; | ||
1627 | } elsif ($sel eq "p") { | ||
1628 | if ($str ne "" && $val >= 0) { | ||
1629 | $pattern_depth = $val; | ||
1630 | $rerun = 1; | ||
1631 | } | ||
1632 | } elsif ($sel eq "h" || $sel eq "?") { | ||
1633 | print STDERR <<EOT | ||
1634 | |||
1635 | Interactive mode allows you to select the various maintainers, submitters, | ||
1636 | commit signers and mailing lists that could be CC'd on a patch. | ||
1637 | |||
1638 | Any *'d entry is selected. | ||
1639 | |||
1640 | If you have git or hg installed, you can choose to summarize the commit | ||
1641 | history of files in the patch. Also, each line of the current file can | ||
1642 | be matched to its commit author and that commits signers with blame. | ||
1643 | |||
1644 | Various knobs exist to control the length of time for active commit | ||
1645 | tracking, the maximum number of commit authors and signers to add, | ||
1646 | and such. | ||
1647 | |||
1648 | Enter selections at the prompt until you are satisfied that the selected | ||
1649 | maintainers are appropriate. You may enter multiple selections separated | ||
1650 | by either commas or spaces. | ||
1651 | |||
1652 | EOT | ||
1653 | } else { | ||
1654 | print STDERR "invalid option: '$nr'\n"; | ||
1655 | $redraw = 0; | ||
1656 | } | ||
1657 | } | ||
1658 | if ($rerun) { | ||
1659 | print STDERR "git-blame can be very slow, please have patience..." | ||
1660 | if ($email_git_blame); | ||
1661 | goto &get_maintainers; | ||
1662 | } | ||
1663 | } | ||
1664 | |||
1665 | #drop not selected entries | ||
1666 | $count = 0; | ||
1667 | my @new_emailto = (); | ||
1668 | foreach my $entry (@list) { | ||
1669 | if ($selected{$count}) { | ||
1670 | push(@new_emailto, $list[$count]); | ||
1671 | } | ||
1672 | $count++; | ||
1673 | } | ||
1674 | return @new_emailto; | ||
1675 | } | ||
1676 | |||
1677 | sub bool_invert { | ||
1678 | my ($bool_ref) = @_; | ||
1679 | |||
1680 | if ($$bool_ref) { | ||
1681 | $$bool_ref = 0; | ||
1682 | } else { | ||
1683 | $$bool_ref = 1; | ||
1684 | } | ||
1685 | } | ||
1686 | |||
1687 | sub deduplicate_email { | ||
1688 | my ($email) = @_; | ||
1689 | |||
1690 | my $matched = 0; | ||
1691 | my ($name, $address) = parse_email($email); | ||
1692 | $email = format_email($name, $address, 1); | ||
1693 | $email = mailmap_email($email); | ||
1694 | |||
1695 | return $email if (!$email_remove_duplicates); | ||
1696 | |||
1697 | ($name, $address) = parse_email($email); | ||
1698 | |||
1699 | if ($name ne "" && $deduplicate_name_hash{lc($name)}) { | ||
1700 | $name = $deduplicate_name_hash{lc($name)}->[0]; | ||
1701 | $address = $deduplicate_name_hash{lc($name)}->[1]; | ||
1702 | $matched = 1; | ||
1703 | } elsif ($deduplicate_address_hash{lc($address)}) { | ||
1704 | $name = $deduplicate_address_hash{lc($address)}->[0]; | ||
1705 | $address = $deduplicate_address_hash{lc($address)}->[1]; | ||
1706 | $matched = 1; | ||
1707 | } | ||
1708 | if (!$matched) { | ||
1709 | $deduplicate_name_hash{lc($name)} = [ $name, $address ]; | ||
1710 | $deduplicate_address_hash{lc($address)} = [ $name, $address ]; | ||
1711 | } | ||
1712 | $email = format_email($name, $address, 1); | ||
1713 | $email = mailmap_email($email); | ||
1714 | return $email; | ||
1715 | } | ||
1716 | |||
1717 | sub save_commits_by_author { | ||
1718 | my (@lines) = @_; | ||
1719 | |||
1720 | my @authors = (); | ||
1721 | my @commits = (); | ||
1722 | my @subjects = (); | ||
1723 | |||
1724 | foreach my $line (@lines) { | ||
1725 | if ($line =~ m/$VCS_cmds{"author_pattern"}/) { | ||
1726 | my $author = $1; | ||
1727 | $author = deduplicate_email($author); | ||
1728 | push(@authors, $author); | ||
1729 | } | ||
1730 | push(@commits, $1) if ($line =~ m/$VCS_cmds{"commit_pattern"}/); | ||
1731 | push(@subjects, $1) if ($line =~ m/$VCS_cmds{"subject_pattern"}/); | ||
1732 | } | ||
1733 | |||
1734 | for (my $i = 0; $i < @authors; $i++) { | ||
1735 | my $exists = 0; | ||
1736 | foreach my $ref(@{$commit_author_hash{$authors[$i]}}) { | ||
1737 | if (@{$ref}[0] eq $commits[$i] && | ||
1738 | @{$ref}[1] eq $subjects[$i]) { | ||
1739 | $exists = 1; | ||
1740 | last; | ||
1741 | } | ||
1742 | } | ||
1743 | if (!$exists) { | ||
1744 | push(@{$commit_author_hash{$authors[$i]}}, | ||
1745 | [ ($commits[$i], $subjects[$i]) ]); | ||
1746 | } | ||
1747 | } | ||
1748 | } | ||
1749 | |||
1750 | sub save_commits_by_signer { | ||
1751 | my (@lines) = @_; | ||
1752 | |||
1753 | my $commit = ""; | ||
1754 | my $subject = ""; | ||
1755 | |||
1756 | foreach my $line (@lines) { | ||
1757 | $commit = $1 if ($line =~ m/$VCS_cmds{"commit_pattern"}/); | ||
1758 | $subject = $1 if ($line =~ m/$VCS_cmds{"subject_pattern"}/); | ||
1759 | if ($line =~ /^[ \t]*${signature_pattern}.*\@.*$/) { | ||
1760 | my @signatures = ($line); | ||
1761 | my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); | ||
1762 | my @types = @$types_ref; | ||
1763 | my @signers = @$signers_ref; | ||
1764 | |||
1765 | my $type = $types[0]; | ||
1766 | my $signer = $signers[0]; | ||
1767 | |||
1768 | $signer = deduplicate_email($signer); | ||
1769 | |||
1770 | my $exists = 0; | ||
1771 | foreach my $ref(@{$commit_signer_hash{$signer}}) { | ||
1772 | if (@{$ref}[0] eq $commit && | ||
1773 | @{$ref}[1] eq $subject && | ||
1774 | @{$ref}[2] eq $type) { | ||
1775 | $exists = 1; | ||
1776 | last; | ||
1777 | } | ||
1778 | } | ||
1779 | if (!$exists) { | ||
1780 | push(@{$commit_signer_hash{$signer}}, | ||
1781 | [ ($commit, $subject, $type) ]); | ||
1782 | } | ||
1783 | } | ||
1784 | } | ||
1785 | } | ||
1786 | |||
997 | sub vcs_assign { | 1787 | sub vcs_assign { |
998 | my ($role, $divisor, @lines) = @_; | 1788 | my ($role, $divisor, @lines) = @_; |
999 | 1789 | ||
@@ -1007,9 +1797,9 @@ sub vcs_assign { | |||
1007 | $divisor = 1; | 1797 | $divisor = 1; |
1008 | } | 1798 | } |
1009 | 1799 | ||
1010 | if ($email_remove_duplicates) { | 1800 | @lines = mailmap(@lines); |
1011 | @lines = mailmap(@lines); | 1801 | |
1012 | } | 1802 | return if (@lines <= 0); |
1013 | 1803 | ||
1014 | @lines = sort(@lines); | 1804 | @lines = sort(@lines); |
1015 | 1805 | ||
@@ -1042,12 +1832,18 @@ sub vcs_file_signoffs { | |||
1042 | my @signers = (); | 1832 | my @signers = (); |
1043 | my $commits; | 1833 | my $commits; |
1044 | 1834 | ||
1045 | return if (!vcs_exists()); | 1835 | $vcs_used = vcs_exists(); |
1836 | return if (!$vcs_used); | ||
1046 | 1837 | ||
1047 | my $cmd = $VCS_cmds{"find_signers_cmd"}; | 1838 | my $cmd = $VCS_cmds{"find_signers_cmd"}; |
1048 | $cmd =~ s/(\$\w+)/$1/eeg; # interpolate $cmd | 1839 | $cmd =~ s/(\$\w+)/$1/eeg; # interpolate $cmd |
1049 | 1840 | ||
1050 | ($commits, @signers) = vcs_find_signers($cmd); | 1841 | ($commits, @signers) = vcs_find_signers($cmd); |
1842 | |||
1843 | foreach my $signer (@signers) { | ||
1844 | $signer = deduplicate_email($signer); | ||
1845 | } | ||
1846 | |||
1051 | vcs_assign("commit_signer", $commits, @signers); | 1847 | vcs_assign("commit_signer", $commits, @signers); |
1052 | } | 1848 | } |
1053 | 1849 | ||
@@ -1055,29 +1851,114 @@ sub vcs_file_blame { | |||
1055 | my ($file) = @_; | 1851 | my ($file) = @_; |
1056 | 1852 | ||
1057 | my @signers = (); | 1853 | my @signers = (); |
1854 | my @all_commits = (); | ||
1058 | my @commits = (); | 1855 | my @commits = (); |
1059 | my $total_commits; | 1856 | my $total_commits; |
1857 | my $total_lines; | ||
1060 | 1858 | ||
1061 | return if (!vcs_exists()); | 1859 | $vcs_used = vcs_exists(); |
1860 | return if (!$vcs_used); | ||
1062 | 1861 | ||
1063 | @commits = vcs_blame($file); | 1862 | @all_commits = vcs_blame($file); |
1064 | @commits = uniq(@commits); | 1863 | @commits = uniq(@all_commits); |
1065 | $total_commits = @commits; | 1864 | $total_commits = @commits; |
1865 | $total_lines = @all_commits; | ||
1066 | 1866 | ||
1067 | foreach my $commit (@commits) { | 1867 | if ($email_git_blame_signatures) { |
1068 | my $commit_count; | 1868 | if (vcs_is_hg()) { |
1069 | my @commit_signers = (); | 1869 | my $commit_count; |
1870 | my @commit_signers = (); | ||
1871 | my $commit = join(" -r ", @commits); | ||
1872 | my $cmd; | ||
1873 | |||
1874 | $cmd = $VCS_cmds{"find_commit_signers_cmd"}; | ||
1875 | $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd | ||
1876 | |||
1877 | ($commit_count, @commit_signers) = vcs_find_signers($cmd); | ||
1878 | |||
1879 | push(@signers, @commit_signers); | ||
1880 | } else { | ||
1881 | foreach my $commit (@commits) { | ||
1882 | my $commit_count; | ||
1883 | my @commit_signers = (); | ||
1884 | my $cmd; | ||
1885 | |||
1886 | $cmd = $VCS_cmds{"find_commit_signers_cmd"}; | ||
1887 | $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd | ||
1070 | 1888 | ||
1071 | my $cmd = $VCS_cmds{"find_commit_signers_cmd"}; | 1889 | ($commit_count, @commit_signers) = vcs_find_signers($cmd); |
1072 | $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd | ||
1073 | 1890 | ||
1074 | ($commit_count, @commit_signers) = vcs_find_signers($cmd); | 1891 | push(@signers, @commit_signers); |
1075 | push(@signers, @commit_signers); | 1892 | } |
1893 | } | ||
1076 | } | 1894 | } |
1077 | 1895 | ||
1078 | if ($from_filename) { | 1896 | if ($from_filename) { |
1897 | if ($output_rolestats) { | ||
1898 | my @blame_signers; | ||
1899 | if (vcs_is_hg()) {{ # Double brace for last exit | ||
1900 | my $commit_count; | ||
1901 | my @commit_signers = (); | ||
1902 | @commits = uniq(@commits); | ||
1903 | @commits = sort(@commits); | ||
1904 | my $commit = join(" -r ", @commits); | ||
1905 | my $cmd; | ||
1906 | |||
1907 | $cmd = $VCS_cmds{"find_commit_author_cmd"}; | ||
1908 | $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd | ||
1909 | |||
1910 | my @lines = (); | ||
1911 | |||
1912 | @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); | ||
1913 | |||
1914 | if (!$email_git_penguin_chiefs) { | ||
1915 | @lines = grep(!/${penguin_chiefs}/i, @lines); | ||
1916 | } | ||
1917 | |||
1918 | last if !@lines; | ||
1919 | |||
1920 | my @authors = (); | ||
1921 | foreach my $line (@lines) { | ||
1922 | if ($line =~ m/$VCS_cmds{"author_pattern"}/) { | ||
1923 | my $author = $1; | ||
1924 | $author = deduplicate_email($author); | ||
1925 | push(@authors, $author); | ||
1926 | } | ||
1927 | } | ||
1928 | |||
1929 | save_commits_by_author(@lines) if ($interactive); | ||
1930 | save_commits_by_signer(@lines) if ($interactive); | ||
1931 | |||
1932 | push(@signers, @authors); | ||
1933 | }} | ||
1934 | else { | ||
1935 | foreach my $commit (@commits) { | ||
1936 | my $i; | ||
1937 | my $cmd = $VCS_cmds{"find_commit_author_cmd"}; | ||
1938 | $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd | ||
1939 | my @author = vcs_find_author($cmd); | ||
1940 | next if !@author; | ||
1941 | |||
1942 | my $formatted_author = deduplicate_email($author[0]); | ||
1943 | |||
1944 | my $count = grep(/$commit/, @all_commits); | ||
1945 | for ($i = 0; $i < $count ; $i++) { | ||
1946 | push(@blame_signers, $formatted_author); | ||
1947 | } | ||
1948 | } | ||
1949 | } | ||
1950 | if (@blame_signers) { | ||
1951 | vcs_assign("authored lines", $total_lines, @blame_signers); | ||
1952 | } | ||
1953 | } | ||
1954 | foreach my $signer (@signers) { | ||
1955 | $signer = deduplicate_email($signer); | ||
1956 | } | ||
1079 | vcs_assign("commits", $total_commits, @signers); | 1957 | vcs_assign("commits", $total_commits, @signers); |
1080 | } else { | 1958 | } else { |
1959 | foreach my $signer (@signers) { | ||
1960 | $signer = deduplicate_email($signer); | ||
1961 | } | ||
1081 | vcs_assign("modified commits", $total_commits, @signers); | 1962 | vcs_assign("modified commits", $total_commits, @signers); |
1082 | } | 1963 | } |
1083 | } | 1964 | } |
@@ -1099,6 +1980,51 @@ sub sort_and_uniq { | |||
1099 | return @parms; | 1980 | return @parms; |
1100 | } | 1981 | } |
1101 | 1982 | ||
1983 | sub clean_file_emails { | ||
1984 | my (@file_emails) = @_; | ||
1985 | my @fmt_emails = (); | ||
1986 | |||
1987 | foreach my $email (@file_emails) { | ||
1988 | $email =~ s/[\(\<\{]{0,1}([A-Za-z0-9_\.\+-]+\@[A-Za-z0-9\.-]+)[\)\>\}]{0,1}/\<$1\>/g; | ||
1989 | my ($name, $address) = parse_email($email); | ||
1990 | if ($name eq '"[,\.]"') { | ||
1991 | $name = ""; | ||
1992 | } | ||
1993 | |||
1994 | my @nw = split(/[^A-Za-zÀ-ÿ\'\,\.\+-]/, $name); | ||
1995 | if (@nw > 2) { | ||
1996 | my $first = $nw[@nw - 3]; | ||
1997 | my $middle = $nw[@nw - 2]; | ||
1998 | my $last = $nw[@nw - 1]; | ||
1999 | |||
2000 | if (((length($first) == 1 && $first =~ m/[A-Za-z]/) || | ||
2001 | (length($first) == 2 && substr($first, -1) eq ".")) || | ||
2002 | (length($middle) == 1 || | ||
2003 | (length($middle) == 2 && substr($middle, -1) eq "."))) { | ||
2004 | $name = "$first $middle $last"; | ||
2005 | } else { | ||
2006 | $name = "$middle $last"; | ||
2007 | } | ||
2008 | } | ||
2009 | |||
2010 | if (substr($name, -1) =~ /[,\.]/) { | ||
2011 | $name = substr($name, 0, length($name) - 1); | ||
2012 | } elsif (substr($name, -2) =~ /[,\.]"/) { | ||
2013 | $name = substr($name, 0, length($name) - 2) . '"'; | ||
2014 | } | ||
2015 | |||
2016 | if (substr($name, 0, 1) =~ /[,\.]/) { | ||
2017 | $name = substr($name, 1, length($name) - 1); | ||
2018 | } elsif (substr($name, 0, 2) =~ /"[,\.]/) { | ||
2019 | $name = '"' . substr($name, 2, length($name) - 2); | ||
2020 | } | ||
2021 | |||
2022 | my $fmt_email = format_email($name, $address, $email_usename); | ||
2023 | push(@fmt_emails, $fmt_email); | ||
2024 | } | ||
2025 | return @fmt_emails; | ||
2026 | } | ||
2027 | |||
1102 | sub merge_email { | 2028 | sub merge_email { |
1103 | my @lines; | 2029 | my @lines; |
1104 | my %saw; | 2030 | my %saw; |
@@ -1183,7 +2109,7 @@ sub rfc822_strip_comments { | |||
1183 | 2109 | ||
1184 | # valid: returns true if the parameter is an RFC822 valid address | 2110 | # valid: returns true if the parameter is an RFC822 valid address |
1185 | # | 2111 | # |
1186 | sub rfc822_valid ($) { | 2112 | sub rfc822_valid { |
1187 | my $s = rfc822_strip_comments(shift); | 2113 | my $s = rfc822_strip_comments(shift); |
1188 | 2114 | ||
1189 | if (!$rfc822re) { | 2115 | if (!$rfc822re) { |
@@ -1203,7 +2129,7 @@ sub rfc822_valid ($) { | |||
1203 | # from success with no addresses found, because an empty string is | 2129 | # from success with no addresses found, because an empty string is |
1204 | # a valid list. | 2130 | # a valid list. |
1205 | 2131 | ||
1206 | sub rfc822_validlist ($) { | 2132 | sub rfc822_validlist { |
1207 | my $s = rfc822_strip_comments(shift); | 2133 | my $s = rfc822_strip_comments(shift); |
1208 | 2134 | ||
1209 | if (!$rfc822re) { | 2135 | if (!$rfc822re) { |
diff --git a/scripts/gfp-translate b/scripts/gfp-translate index 073cb6d152a..c9230e158a8 100644 --- a/scripts/gfp-translate +++ b/scripts/gfp-translate | |||
@@ -19,7 +19,7 @@ usage() { | |||
19 | exit 0 | 19 | exit 0 |
20 | } | 20 | } |
21 | 21 | ||
22 | # Parse command-line arguements | 22 | # Parse command-line arguments |
23 | while [ $# -gt 0 ]; do | 23 | while [ $# -gt 0 ]; do |
24 | case $1 in | 24 | case $1 in |
25 | --source) | 25 | --source) |
@@ -63,7 +63,12 @@ fi | |||
63 | 63 | ||
64 | # Extract GFP flags from the kernel source | 64 | # Extract GFP flags from the kernel source |
65 | TMPFILE=`mktemp -t gfptranslate-XXXXXX` || exit 1 | 65 | TMPFILE=`mktemp -t gfptranslate-XXXXXX` || exit 1 |
66 | grep "^#define __GFP" $SOURCE/include/linux/gfp.h | sed -e 's/(__force gfp_t)//' | sed -e 's/u)/)/' | grep -v GFP_BITS | sed -e 's/)\//) \//' > $TMPFILE | 66 | grep -q ___GFP $SOURCE/include/linux/gfp.h |
67 | if [ $? -eq 0 ]; then | ||
68 | grep "^#define ___GFP" $SOURCE/include/linux/gfp.h | sed -e 's/u$//' | grep -v GFP_BITS > $TMPFILE | ||
69 | else | ||
70 | grep "^#define __GFP" $SOURCE/include/linux/gfp.h | sed -e 's/(__force gfp_t)//' | sed -e 's/u)/)/' | grep -v GFP_BITS | sed -e 's/)\//) \//' > $TMPFILE | ||
71 | fi | ||
67 | 72 | ||
68 | # Parse the flags | 73 | # Parse the flags |
69 | IFS=" | 74 | IFS=" |
diff --git a/scripts/headers.sh b/scripts/headers.sh index 1ddcdd38d97..978b42b3acd 100755 --- a/scripts/headers.sh +++ b/scripts/headers.sh | |||
@@ -13,7 +13,7 @@ do_command() | |||
13 | fi | 13 | fi |
14 | } | 14 | } |
15 | 15 | ||
16 | archs=$(ls ${srctree}/arch) | 16 | archs=${HDR_ARCH_LIST:-$(ls ${srctree}/arch)} |
17 | 17 | ||
18 | for arch in ${archs}; do | 18 | for arch in ${archs}; do |
19 | case ${arch} in | 19 | case ${arch} in |
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl index 50d6cfd1fa7..7957e7a5166 100644 --- a/scripts/headers_check.pl +++ b/scripts/headers_check.pl | |||
@@ -64,10 +64,10 @@ sub check_include | |||
64 | 64 | ||
65 | sub check_declarations | 65 | sub check_declarations |
66 | { | 66 | { |
67 | if ($line =~m/^\s*extern\b/) { | 67 | if ($line =~m/^(\s*extern|unsigned|char|short|int|long|void)\b/) { |
68 | printf STDERR "$filename:$lineno: " . | 68 | printf STDERR "$filename:$lineno: " . |
69 | "userspace cannot call function or variable " . | 69 | "userspace cannot reference function or " . |
70 | "defined in the kernel\n"; | 70 | "variable defined in the kernel\n"; |
71 | } | 71 | } |
72 | } | 72 | } |
73 | 73 | ||
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl index 4ca3be3b2e5..efb3be10d42 100644 --- a/scripts/headers_install.pl +++ b/scripts/headers_install.pl | |||
@@ -45,6 +45,13 @@ foreach my $file (@files) { | |||
45 | close $in; | 45 | close $in; |
46 | 46 | ||
47 | system $unifdef . " $tmpfile > $installdir/$file"; | 47 | system $unifdef . " $tmpfile > $installdir/$file"; |
48 | # unifdef will exit 0 on success, and will exit 1 when the | ||
49 | # file was processed successfully but no changes were made, | ||
50 | # so abort only when it's higher than that. | ||
51 | my $e = $? >> 8; | ||
52 | if ($e > 1) { | ||
53 | die "$tmpfile: $!\n"; | ||
54 | } | ||
48 | unlink $tmpfile; | 55 | unlink $tmpfile; |
49 | } | 56 | } |
50 | exit 0; | 57 | exit 0; |
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index e3902fb39af..60dd3eb9366 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c | |||
@@ -107,12 +107,8 @@ static int read_symbol(FILE *in, struct sym_entry *s) | |||
107 | 107 | ||
108 | rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str); | 108 | rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str); |
109 | if (rc != 3) { | 109 | if (rc != 3) { |
110 | if (rc != EOF) { | 110 | if (rc != EOF && fgets(str, 500, in) == NULL) |
111 | /* skip line. sym is used as dummy to | 111 | fprintf(stderr, "Read error or end of file.\n"); |
112 | * shut of "warn_unused_result" warning. | ||
113 | */ | ||
114 | sym = fgets(str, 500, in); | ||
115 | } | ||
116 | return -1; | 112 | return -1; |
117 | } | 113 | } |
118 | 114 | ||
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore index 6a36a76e660..624f6502e03 100644 --- a/scripts/kconfig/.gitignore +++ b/scripts/kconfig/.gitignore | |||
@@ -17,6 +17,7 @@ gconf.glade.h | |||
17 | # | 17 | # |
18 | conf | 18 | conf |
19 | mconf | 19 | mconf |
20 | nconf | ||
20 | qconf | 21 | qconf |
21 | gconf | 22 | gconf |
22 | kxgettext | 23 | kxgettext |
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 75bdf5ae202..368ae306aee 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -8,7 +8,7 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-c | |||
8 | ifdef KBUILD_KCONFIG | 8 | ifdef KBUILD_KCONFIG |
9 | Kconfig := $(KBUILD_KCONFIG) | 9 | Kconfig := $(KBUILD_KCONFIG) |
10 | else | 10 | else |
11 | Kconfig := arch/$(SRCARCH)/Kconfig | 11 | Kconfig := Kconfig |
12 | endif | 12 | endif |
13 | 13 | ||
14 | xconfig: $(obj)/qconf | 14 | xconfig: $(obj)/qconf |
@@ -21,44 +21,54 @@ menuconfig: $(obj)/mconf | |||
21 | $< $(Kconfig) | 21 | $< $(Kconfig) |
22 | 22 | ||
23 | config: $(obj)/conf | 23 | config: $(obj)/conf |
24 | $< $(Kconfig) | 24 | $< --oldaskconfig $(Kconfig) |
25 | 25 | ||
26 | nconfig: $(obj)/nconf | 26 | nconfig: $(obj)/nconf |
27 | $< $(Kconfig) | 27 | $< $(Kconfig) |
28 | 28 | ||
29 | oldconfig: $(obj)/conf | 29 | oldconfig: $(obj)/conf |
30 | $< -o $(Kconfig) | 30 | $< --$@ $(Kconfig) |
31 | 31 | ||
32 | silentoldconfig: $(obj)/conf | 32 | silentoldconfig: $(obj)/conf |
33 | $(Q)mkdir -p include/generated | 33 | $(Q)mkdir -p include/generated |
34 | $< -s $(Kconfig) | 34 | $< --$@ $(Kconfig) |
35 | |||
36 | # if no path is given, then use src directory to find file | ||
37 | ifdef LSMOD | ||
38 | LSMOD_F := $(LSMOD) | ||
39 | ifeq ($(findstring /,$(LSMOD)),) | ||
40 | LSMOD_F := $(objtree)/$(LSMOD) | ||
41 | endif | ||
42 | endif | ||
35 | 43 | ||
36 | localmodconfig: $(obj)/streamline_config.pl $(obj)/conf | 44 | localmodconfig: $(obj)/streamline_config.pl $(obj)/conf |
37 | $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config | 45 | $(Q)mkdir -p include/generated |
38 | $(Q)if [ -f .config ]; then \ | 46 | $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config |
39 | cmp -s .tmp.config .config || \ | 47 | $(Q)if [ -f .config ]; then \ |
40 | (mv -f .config .config.old.1; \ | 48 | cmp -s .tmp.config .config || \ |
41 | mv -f .tmp.config .config; \ | 49 | (mv -f .config .config.old.1; \ |
42 | $(obj)/conf -s $(Kconfig); \ | 50 | mv -f .tmp.config .config; \ |
43 | mv -f .config.old.1 .config.old) \ | 51 | $(obj)/conf --silentoldconfig $(Kconfig); \ |
44 | else \ | 52 | mv -f .config.old.1 .config.old) \ |
45 | mv -f .tmp.config .config; \ | 53 | else \ |
46 | $(obj)/conf -s $(Kconfig); \ | 54 | mv -f .tmp.config .config; \ |
55 | $(obj)/conf --silentoldconfig $(Kconfig); \ | ||
47 | fi | 56 | fi |
48 | $(Q)rm -f .tmp.config | 57 | $(Q)rm -f .tmp.config |
49 | 58 | ||
50 | localyesconfig: $(obj)/streamline_config.pl $(obj)/conf | 59 | localyesconfig: $(obj)/streamline_config.pl $(obj)/conf |
51 | $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config | 60 | $(Q)mkdir -p include/generated |
61 | $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config | ||
52 | $(Q)sed -i s/=m/=y/ .tmp.config | 62 | $(Q)sed -i s/=m/=y/ .tmp.config |
53 | $(Q)if [ -f .config ]; then \ | 63 | $(Q)if [ -f .config ]; then \ |
54 | cmp -s .tmp.config .config || \ | 64 | cmp -s .tmp.config .config || \ |
55 | (mv -f .config .config.old.1; \ | 65 | (mv -f .config .config.old.1; \ |
56 | mv -f .tmp.config .config; \ | 66 | mv -f .tmp.config .config; \ |
57 | $(obj)/conf -s $(Kconfig); \ | 67 | $(obj)/conf --silentoldconfig $(Kconfig); \ |
58 | mv -f .config.old.1 .config.old) \ | 68 | mv -f .config.old.1 .config.old) \ |
59 | else \ | 69 | else \ |
60 | mv -f .tmp.config .config; \ | 70 | mv -f .tmp.config .config; \ |
61 | $(obj)/conf -s $(Kconfig); \ | 71 | $(obj)/conf --silentoldconfig $(Kconfig); \ |
62 | fi | 72 | fi |
63 | $(Q)rm -f .tmp.config | 73 | $(Q)rm -f .tmp.config |
64 | 74 | ||
@@ -85,30 +95,29 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h | |||
85 | $(Q)rm -f arch/um/Kconfig.arch | 95 | $(Q)rm -f arch/um/Kconfig.arch |
86 | $(Q)rm -f $(obj)/config.pot | 96 | $(Q)rm -f $(obj)/config.pot |
87 | 97 | ||
88 | PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig | 98 | PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig |
89 | 99 | ||
90 | randconfig: $(obj)/conf | 100 | allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf |
91 | $< -r $(Kconfig) | 101 | $< --$@ $(Kconfig) |
92 | 102 | ||
93 | allyesconfig: $(obj)/conf | 103 | PHONY += listnewconfig oldnoconfig savedefconfig defconfig |
94 | $< -y $(Kconfig) | ||
95 | 104 | ||
96 | allnoconfig: $(obj)/conf | 105 | listnewconfig oldnoconfig: $(obj)/conf |
97 | $< -n $(Kconfig) | 106 | $< --$@ $(Kconfig) |
98 | 107 | ||
99 | allmodconfig: $(obj)/conf | 108 | savedefconfig: $(obj)/conf |
100 | $< -m $(Kconfig) | 109 | $< --$@=defconfig $(Kconfig) |
101 | 110 | ||
102 | defconfig: $(obj)/conf | 111 | defconfig: $(obj)/conf |
103 | ifeq ($(KBUILD_DEFCONFIG),) | 112 | ifeq ($(KBUILD_DEFCONFIG),) |
104 | $< -d $(Kconfig) | 113 | $< --defconfig $(Kconfig) |
105 | else | 114 | else |
106 | @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" | 115 | @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" |
107 | $(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) | 116 | $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) |
108 | endif | 117 | endif |
109 | 118 | ||
110 | %_defconfig: $(obj)/conf | 119 | %_defconfig: $(obj)/conf |
111 | $(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig) | 120 | $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) |
112 | 121 | ||
113 | # Help text used by make help | 122 | # Help text used by make help |
114 | help: | 123 | help: |
@@ -121,22 +130,23 @@ help: | |||
121 | @echo ' localmodconfig - Update current config disabling modules not loaded' | 130 | @echo ' localmodconfig - Update current config disabling modules not loaded' |
122 | @echo ' localyesconfig - Update current config converting local mods to core' | 131 | @echo ' localyesconfig - Update current config converting local mods to core' |
123 | @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps' | 132 | @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps' |
124 | @echo ' randconfig - New config with random answer to all options' | 133 | @echo ' defconfig - New config with default from ARCH supplied defconfig' |
125 | @echo ' defconfig - New config with default answer to all options' | 134 | @echo ' savedefconfig - Save current config as ./defconfig (minimal config)' |
126 | @echo ' allmodconfig - New config selecting modules when possible' | ||
127 | @echo ' allyesconfig - New config where all options are accepted with yes' | ||
128 | @echo ' allnoconfig - New config where all options are answered with no' | 135 | @echo ' allnoconfig - New config where all options are answered with no' |
136 | @echo ' allyesconfig - New config where all options are accepted with yes' | ||
137 | @echo ' allmodconfig - New config selecting modules when possible' | ||
138 | @echo ' alldefconfig - New config with all symbols set to default' | ||
139 | @echo ' randconfig - New config with random answer to all options' | ||
140 | @echo ' listnewconfig - List new options' | ||
141 | @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)' | ||
129 | 142 | ||
130 | # lxdialog stuff | 143 | # lxdialog stuff |
131 | check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh | 144 | check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh |
132 | 145 | ||
133 | # Use recursively expanded variables so we do not call gcc unless | 146 | # Use recursively expanded variables so we do not call gcc unless |
134 | # we really need to do so. (Do not call gcc as part of make mrproper) | 147 | # we really need to do so. (Do not call gcc as part of make mrproper) |
135 | HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) | 148 | HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ |
136 | HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) | 149 | -DLOCALE |
137 | |||
138 | HOST_EXTRACFLAGS += -DLOCALE | ||
139 | |||
140 | 150 | ||
141 | # =========================================================================== | 151 | # =========================================================================== |
142 | # Shared Makefile for the various kconfig executables: | 152 | # Shared Makefile for the various kconfig executables: |
@@ -195,7 +205,7 @@ clean-files += config.pot linux.pot | |||
195 | PHONY += $(obj)/dochecklxdialog | 205 | PHONY += $(obj)/dochecklxdialog |
196 | $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog | 206 | $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog |
197 | $(obj)/dochecklxdialog: | 207 | $(obj)/dochecklxdialog: |
198 | $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) | 208 | $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf) |
199 | 209 | ||
200 | always := dochecklxdialog | 210 | always := dochecklxdialog |
201 | 211 | ||
@@ -209,10 +219,12 @@ HOSTCFLAGS_zconf.tab.o := -I$(src) | |||
209 | HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl | 219 | HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl |
210 | HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK | 220 | HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK |
211 | 221 | ||
212 | HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` | 222 | HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl |
213 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ | 223 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ |
214 | -D LKC_DIRECT_LINK | 224 | -D LKC_DIRECT_LINK |
215 | 225 | ||
226 | HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) | ||
227 | |||
216 | HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses | 228 | HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses |
217 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck | 229 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck |
218 | 230 | ||
@@ -223,40 +235,48 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile | |||
223 | # QT needs some extra effort... | 235 | # QT needs some extra effort... |
224 | $(obj)/.tmp_qtcheck: | 236 | $(obj)/.tmp_qtcheck: |
225 | @set -e; echo " CHECK qt"; dir=""; pkg=""; \ | 237 | @set -e; echo " CHECK qt"; dir=""; pkg=""; \ |
226 | pkg-config --exists qt 2> /dev/null && pkg=qt; \ | 238 | if ! pkg-config --exists QtCore 2> /dev/null; then \ |
227 | pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \ | 239 | echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \ |
228 | if [ -n "$$pkg" ]; then \ | 240 | pkg-config --exists qt 2> /dev/null && pkg=qt; \ |
229 | cflags="\$$(shell pkg-config $$pkg --cflags)"; \ | 241 | pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \ |
230 | libs="\$$(shell pkg-config $$pkg --libs)"; \ | 242 | if [ -n "$$pkg" ]; then \ |
231 | moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \ | 243 | cflags="\$$(shell pkg-config $$pkg --cflags)"; \ |
232 | dir="$$(pkg-config $$pkg --variable=prefix)"; \ | 244 | libs="\$$(shell pkg-config $$pkg --libs)"; \ |
245 | moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \ | ||
246 | dir="$$(pkg-config $$pkg --variable=prefix)"; \ | ||
247 | else \ | ||
248 | for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \ | ||
249 | if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \ | ||
250 | done; \ | ||
251 | if [ -z "$$dir" ]; then \ | ||
252 | echo "*"; \ | ||
253 | echo "* Unable to find any QT installation. Please make sure that"; \ | ||
254 | echo "* the QT4 or QT3 development package is correctly installed and"; \ | ||
255 | echo "* either qmake can be found or install pkg-config or set"; \ | ||
256 | echo "* the QTDIR environment variable to the correct location."; \ | ||
257 | echo "*"; \ | ||
258 | false; \ | ||
259 | fi; \ | ||
260 | libpath=$$dir/lib; lib=qt; osdir=""; \ | ||
261 | $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \ | ||
262 | osdir=x$$($(HOSTCXX) -print-multi-os-directory); \ | ||
263 | test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \ | ||
264 | test -f $$libpath/libqt-mt.so && lib=qt-mt; \ | ||
265 | cflags="-I$$dir/include"; \ | ||
266 | libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \ | ||
267 | moc="$$dir/bin/moc"; \ | ||
268 | fi; \ | ||
269 | if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \ | ||
270 | echo "*"; \ | ||
271 | echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \ | ||
272 | echo "*"; \ | ||
273 | moc="/usr/bin/moc"; \ | ||
274 | fi; \ | ||
233 | else \ | 275 | else \ |
234 | for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \ | 276 | cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \ |
235 | if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \ | 277 | libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \ |
236 | done; \ | 278 | binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \ |
237 | if [ -z "$$dir" ]; then \ | 279 | moc="$$binpath/bin/moc"; \ |
238 | echo "*"; \ | ||
239 | echo "* Unable to find the QT3 installation. Please make sure that"; \ | ||
240 | echo "* the QT3 development package is correctly installed and"; \ | ||
241 | echo "* either install pkg-config or set the QTDIR environment"; \ | ||
242 | echo "* variable to the correct location."; \ | ||
243 | echo "*"; \ | ||
244 | false; \ | ||
245 | fi; \ | ||
246 | libpath=$$dir/lib; lib=qt; osdir=""; \ | ||
247 | $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \ | ||
248 | osdir=x$$($(HOSTCXX) -print-multi-os-directory); \ | ||
249 | test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \ | ||
250 | test -f $$libpath/libqt-mt.so && lib=qt-mt; \ | ||
251 | cflags="-I$$dir/include"; \ | ||
252 | libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \ | ||
253 | moc="$$dir/bin/moc"; \ | ||
254 | fi; \ | ||
255 | if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \ | ||
256 | echo "*"; \ | ||
257 | echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \ | ||
258 | echo "*"; \ | ||
259 | moc="/usr/bin/moc"; \ | ||
260 | fi; \ | 280 | fi; \ |
261 | echo "KC_QT_CFLAGS=$$cflags" > $@; \ | 281 | echo "KC_QT_CFLAGS=$$cflags" > $@; \ |
262 | echo "KC_QT_LIBS=$$libs" >> $@; \ | 282 | echo "KC_QT_LIBS=$$libs" >> $@; \ |
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 9960d1c303f..659326c3e89 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <string.h> | 10 | #include <string.h> |
11 | #include <time.h> | 11 | #include <time.h> |
12 | #include <unistd.h> | 12 | #include <unistd.h> |
13 | #include <getopt.h> | ||
13 | #include <sys/stat.h> | 14 | #include <sys/stat.h> |
14 | #include <sys/time.h> | 15 | #include <sys/time.h> |
15 | 16 | ||
@@ -19,16 +20,21 @@ | |||
19 | static void conf(struct menu *menu); | 20 | static void conf(struct menu *menu); |
20 | static void check_conf(struct menu *menu); | 21 | static void check_conf(struct menu *menu); |
21 | 22 | ||
22 | enum { | 23 | enum input_mode { |
23 | ask_all, | 24 | oldaskconfig, |
24 | ask_new, | 25 | silentoldconfig, |
25 | ask_silent, | 26 | oldconfig, |
26 | set_default, | 27 | allnoconfig, |
27 | set_yes, | 28 | allyesconfig, |
28 | set_mod, | 29 | allmodconfig, |
29 | set_no, | 30 | alldefconfig, |
30 | set_random | 31 | randconfig, |
31 | } input_mode = ask_all; | 32 | defconfig, |
33 | savedefconfig, | ||
34 | listnewconfig, | ||
35 | oldnoconfig, | ||
36 | } input_mode = oldaskconfig; | ||
37 | |||
32 | char *defconfig_file; | 38 | char *defconfig_file; |
33 | 39 | ||
34 | static int indent = 1; | 40 | static int indent = 1; |
@@ -93,16 +99,16 @@ static int conf_askvalue(struct symbol *sym, const char *def) | |||
93 | } | 99 | } |
94 | 100 | ||
95 | switch (input_mode) { | 101 | switch (input_mode) { |
96 | case ask_new: | 102 | case oldconfig: |
97 | case ask_silent: | 103 | case silentoldconfig: |
98 | if (sym_has_value(sym)) { | 104 | if (sym_has_value(sym)) { |
99 | printf("%s\n", def); | 105 | printf("%s\n", def); |
100 | return 0; | 106 | return 0; |
101 | } | 107 | } |
102 | check_stdin(); | 108 | check_stdin(); |
103 | case ask_all: | 109 | case oldaskconfig: |
104 | fflush(stdout); | 110 | fflush(stdout); |
105 | fgets(line, 128, stdin); | 111 | xfgets(line, 128, stdin); |
106 | return 1; | 112 | return 1; |
107 | default: | 113 | default: |
108 | break; | 114 | break; |
@@ -156,14 +162,12 @@ static int conf_string(struct menu *menu) | |||
156 | static int conf_sym(struct menu *menu) | 162 | static int conf_sym(struct menu *menu) |
157 | { | 163 | { |
158 | struct symbol *sym = menu->sym; | 164 | struct symbol *sym = menu->sym; |
159 | int type; | ||
160 | tristate oldval, newval; | 165 | tristate oldval, newval; |
161 | 166 | ||
162 | while (1) { | 167 | while (1) { |
163 | printf("%*s%s ", indent - 1, "", _(menu->prompt->text)); | 168 | printf("%*s%s ", indent - 1, "", _(menu->prompt->text)); |
164 | if (sym->name) | 169 | if (sym->name) |
165 | printf("(%s) ", sym->name); | 170 | printf("(%s) ", sym->name); |
166 | type = sym_get_type(sym); | ||
167 | putchar('['); | 171 | putchar('['); |
168 | oldval = sym_get_tristate_value(sym); | 172 | oldval = sym_get_tristate_value(sym); |
169 | switch (oldval) { | 173 | switch (oldval) { |
@@ -228,11 +232,9 @@ static int conf_choice(struct menu *menu) | |||
228 | { | 232 | { |
229 | struct symbol *sym, *def_sym; | 233 | struct symbol *sym, *def_sym; |
230 | struct menu *child; | 234 | struct menu *child; |
231 | int type; | ||
232 | bool is_new; | 235 | bool is_new; |
233 | 236 | ||
234 | sym = menu->sym; | 237 | sym = menu->sym; |
235 | type = sym_get_type(sym); | ||
236 | is_new = !sym_has_value(sym); | 238 | is_new = !sym_has_value(sym); |
237 | if (sym_is_changable(sym)) { | 239 | if (sym_is_changable(sym)) { |
238 | conf_sym(menu); | 240 | conf_sym(menu); |
@@ -294,17 +296,17 @@ static int conf_choice(struct menu *menu) | |||
294 | printf("?"); | 296 | printf("?"); |
295 | printf("]: "); | 297 | printf("]: "); |
296 | switch (input_mode) { | 298 | switch (input_mode) { |
297 | case ask_new: | 299 | case oldconfig: |
298 | case ask_silent: | 300 | case silentoldconfig: |
299 | if (!is_new) { | 301 | if (!is_new) { |
300 | cnt = def; | 302 | cnt = def; |
301 | printf("%d\n", cnt); | 303 | printf("%d\n", cnt); |
302 | break; | 304 | break; |
303 | } | 305 | } |
304 | check_stdin(); | 306 | check_stdin(); |
305 | case ask_all: | 307 | case oldaskconfig: |
306 | fflush(stdout); | 308 | fflush(stdout); |
307 | fgets(line, 128, stdin); | 309 | xfgets(line, 128, stdin); |
308 | strip(line); | 310 | strip(line); |
309 | if (line[0] == '?') { | 311 | if (line[0] == '?') { |
310 | print_help(menu); | 312 | print_help(menu); |
@@ -360,7 +362,10 @@ static void conf(struct menu *menu) | |||
360 | 362 | ||
361 | switch (prop->type) { | 363 | switch (prop->type) { |
362 | case P_MENU: | 364 | case P_MENU: |
363 | if (input_mode == ask_silent && rootEntry != menu) { | 365 | if ((input_mode == silentoldconfig || |
366 | input_mode == listnewconfig || | ||
367 | input_mode == oldnoconfig) && | ||
368 | rootEntry != menu) { | ||
364 | check_conf(menu); | 369 | check_conf(menu); |
365 | return; | 370 | return; |
366 | } | 371 | } |
@@ -418,10 +423,16 @@ static void check_conf(struct menu *menu) | |||
418 | if (sym && !sym_has_value(sym)) { | 423 | if (sym && !sym_has_value(sym)) { |
419 | if (sym_is_changable(sym) || | 424 | if (sym_is_changable(sym) || |
420 | (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { | 425 | (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { |
421 | if (!conf_cnt++) | 426 | if (input_mode == listnewconfig) { |
422 | printf(_("*\n* Restart config...\n*\n")); | 427 | if (sym->name && !sym_is_choice_value(sym)) { |
423 | rootEntry = menu_get_parent_menu(menu); | 428 | printf("%s%s\n", CONFIG_, sym->name); |
424 | conf(rootEntry); | 429 | } |
430 | } else if (input_mode != oldnoconfig) { | ||
431 | if (!conf_cnt++) | ||
432 | printf(_("*\n* Restart config...\n*\n")); | ||
433 | rootEntry = menu_get_parent_menu(menu); | ||
434 | conf(rootEntry); | ||
435 | } | ||
425 | } | 436 | } |
426 | } | 437 | } |
427 | 438 | ||
@@ -429,6 +440,22 @@ static void check_conf(struct menu *menu) | |||
429 | check_conf(child); | 440 | check_conf(child); |
430 | } | 441 | } |
431 | 442 | ||
443 | static struct option long_opts[] = { | ||
444 | {"oldaskconfig", no_argument, NULL, oldaskconfig}, | ||
445 | {"oldconfig", no_argument, NULL, oldconfig}, | ||
446 | {"silentoldconfig", no_argument, NULL, silentoldconfig}, | ||
447 | {"defconfig", optional_argument, NULL, defconfig}, | ||
448 | {"savedefconfig", required_argument, NULL, savedefconfig}, | ||
449 | {"allnoconfig", no_argument, NULL, allnoconfig}, | ||
450 | {"allyesconfig", no_argument, NULL, allyesconfig}, | ||
451 | {"allmodconfig", no_argument, NULL, allmodconfig}, | ||
452 | {"alldefconfig", no_argument, NULL, alldefconfig}, | ||
453 | {"randconfig", no_argument, NULL, randconfig}, | ||
454 | {"listnewconfig", no_argument, NULL, listnewconfig}, | ||
455 | {"oldnoconfig", no_argument, NULL, oldnoconfig}, | ||
456 | {NULL, 0, NULL, 0} | ||
457 | }; | ||
458 | |||
432 | int main(int ac, char **av) | 459 | int main(int ac, char **av) |
433 | { | 460 | { |
434 | int opt; | 461 | int opt; |
@@ -439,32 +466,17 @@ int main(int ac, char **av) | |||
439 | bindtextdomain(PACKAGE, LOCALEDIR); | 466 | bindtextdomain(PACKAGE, LOCALEDIR); |
440 | textdomain(PACKAGE); | 467 | textdomain(PACKAGE); |
441 | 468 | ||
442 | while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) { | 469 | while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) { |
470 | input_mode = (enum input_mode)opt; | ||
443 | switch (opt) { | 471 | switch (opt) { |
444 | case 'o': | 472 | case silentoldconfig: |
445 | input_mode = ask_silent; | ||
446 | break; | ||
447 | case 's': | ||
448 | input_mode = ask_silent; | ||
449 | sync_kconfig = 1; | 473 | sync_kconfig = 1; |
450 | break; | 474 | break; |
451 | case 'd': | 475 | case defconfig: |
452 | input_mode = set_default; | 476 | case savedefconfig: |
453 | break; | ||
454 | case 'D': | ||
455 | input_mode = set_default; | ||
456 | defconfig_file = optarg; | 477 | defconfig_file = optarg; |
457 | break; | 478 | break; |
458 | case 'n': | 479 | case randconfig: |
459 | input_mode = set_no; | ||
460 | break; | ||
461 | case 'm': | ||
462 | input_mode = set_mod; | ||
463 | break; | ||
464 | case 'y': | ||
465 | input_mode = set_yes; | ||
466 | break; | ||
467 | case 'r': | ||
468 | { | 480 | { |
469 | struct timeval now; | 481 | struct timeval now; |
470 | unsigned int seed; | 482 | unsigned int seed; |
@@ -477,17 +489,12 @@ int main(int ac, char **av) | |||
477 | 489 | ||
478 | seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1)); | 490 | seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1)); |
479 | srand(seed); | 491 | srand(seed); |
480 | |||
481 | input_mode = set_random; | ||
482 | break; | 492 | break; |
483 | } | 493 | } |
484 | case 'h': | 494 | case '?': |
485 | printf(_("See README for usage info\n")); | ||
486 | exit(0); | ||
487 | break; | ||
488 | default: | ||
489 | fprintf(stderr, _("See README for usage info\n")); | 495 | fprintf(stderr, _("See README for usage info\n")); |
490 | exit(1); | 496 | exit(1); |
497 | break; | ||
491 | } | 498 | } |
492 | } | 499 | } |
493 | if (ac == optind) { | 500 | if (ac == optind) { |
@@ -501,8 +508,7 @@ int main(int ac, char **av) | |||
501 | name = conf_get_configname(); | 508 | name = conf_get_configname(); |
502 | if (stat(name, &tmpstat)) { | 509 | if (stat(name, &tmpstat)) { |
503 | fprintf(stderr, _("***\n" | 510 | fprintf(stderr, _("***\n" |
504 | "*** You have not yet configured your kernel!\n" | 511 | "*** Configuration file \"%s\" not found!\n" |
505 | "*** (missing kernel config file \"%s\")\n" | ||
506 | "***\n" | 512 | "***\n" |
507 | "*** Please run some configurator (e.g. \"make oldconfig\" or\n" | 513 | "*** Please run some configurator (e.g. \"make oldconfig\" or\n" |
508 | "*** \"make menuconfig\" or \"make xconfig\").\n" | 514 | "*** \"make menuconfig\" or \"make xconfig\").\n" |
@@ -512,7 +518,7 @@ int main(int ac, char **av) | |||
512 | } | 518 | } |
513 | 519 | ||
514 | switch (input_mode) { | 520 | switch (input_mode) { |
515 | case set_default: | 521 | case defconfig: |
516 | if (!defconfig_file) | 522 | if (!defconfig_file) |
517 | defconfig_file = conf_get_default_confname(); | 523 | defconfig_file = conf_get_default_confname(); |
518 | if (conf_read(defconfig_file)) { | 524 | if (conf_read(defconfig_file)) { |
@@ -522,25 +528,30 @@ int main(int ac, char **av) | |||
522 | exit(1); | 528 | exit(1); |
523 | } | 529 | } |
524 | break; | 530 | break; |
525 | case ask_silent: | 531 | case savedefconfig: |
526 | case ask_all: | 532 | case silentoldconfig: |
527 | case ask_new: | 533 | case oldaskconfig: |
534 | case oldconfig: | ||
535 | case listnewconfig: | ||
536 | case oldnoconfig: | ||
528 | conf_read(NULL); | 537 | conf_read(NULL); |
529 | break; | 538 | break; |
530 | case set_no: | 539 | case allnoconfig: |
531 | case set_mod: | 540 | case allyesconfig: |
532 | case set_yes: | 541 | case allmodconfig: |
533 | case set_random: | 542 | case alldefconfig: |
543 | case randconfig: | ||
534 | name = getenv("KCONFIG_ALLCONFIG"); | 544 | name = getenv("KCONFIG_ALLCONFIG"); |
535 | if (name && !stat(name, &tmpstat)) { | 545 | if (name && !stat(name, &tmpstat)) { |
536 | conf_read_simple(name, S_DEF_USER); | 546 | conf_read_simple(name, S_DEF_USER); |
537 | break; | 547 | break; |
538 | } | 548 | } |
539 | switch (input_mode) { | 549 | switch (input_mode) { |
540 | case set_no: name = "allno.config"; break; | 550 | case allnoconfig: name = "allno.config"; break; |
541 | case set_mod: name = "allmod.config"; break; | 551 | case allyesconfig: name = "allyes.config"; break; |
542 | case set_yes: name = "allyes.config"; break; | 552 | case allmodconfig: name = "allmod.config"; break; |
543 | case set_random: name = "allrandom.config"; break; | 553 | case alldefconfig: name = "alldef.config"; break; |
554 | case randconfig: name = "allrandom.config"; break; | ||
544 | default: break; | 555 | default: break; |
545 | } | 556 | } |
546 | if (!stat(name, &tmpstat)) | 557 | if (!stat(name, &tmpstat)) |
@@ -557,7 +568,7 @@ int main(int ac, char **av) | |||
557 | name = getenv("KCONFIG_NOSILENTUPDATE"); | 568 | name = getenv("KCONFIG_NOSILENTUPDATE"); |
558 | if (name && *name) { | 569 | if (name && *name) { |
559 | fprintf(stderr, | 570 | fprintf(stderr, |
560 | _("\n*** Kernel configuration requires explicit update.\n\n")); | 571 | _("\n*** The configuration requires explicit update.\n\n")); |
561 | return 1; | 572 | return 1; |
562 | } | 573 | } |
563 | } | 574 | } |
@@ -565,33 +576,42 @@ int main(int ac, char **av) | |||
565 | } | 576 | } |
566 | 577 | ||
567 | switch (input_mode) { | 578 | switch (input_mode) { |
568 | case set_no: | 579 | case allnoconfig: |
569 | conf_set_all_new_symbols(def_no); | 580 | conf_set_all_new_symbols(def_no); |
570 | break; | 581 | break; |
571 | case set_yes: | 582 | case allyesconfig: |
572 | conf_set_all_new_symbols(def_yes); | 583 | conf_set_all_new_symbols(def_yes); |
573 | break; | 584 | break; |
574 | case set_mod: | 585 | case allmodconfig: |
575 | conf_set_all_new_symbols(def_mod); | 586 | conf_set_all_new_symbols(def_mod); |
576 | break; | 587 | break; |
577 | case set_random: | 588 | case alldefconfig: |
589 | conf_set_all_new_symbols(def_default); | ||
590 | break; | ||
591 | case randconfig: | ||
578 | conf_set_all_new_symbols(def_random); | 592 | conf_set_all_new_symbols(def_random); |
579 | break; | 593 | break; |
580 | case set_default: | 594 | case defconfig: |
581 | conf_set_all_new_symbols(def_default); | 595 | conf_set_all_new_symbols(def_default); |
582 | break; | 596 | break; |
583 | case ask_new: | 597 | case savedefconfig: |
584 | case ask_all: | 598 | break; |
599 | case oldaskconfig: | ||
585 | rootEntry = &rootmenu; | 600 | rootEntry = &rootmenu; |
586 | conf(&rootmenu); | 601 | conf(&rootmenu); |
587 | input_mode = ask_silent; | 602 | input_mode = silentoldconfig; |
588 | /* fall through */ | 603 | /* fall through */ |
589 | case ask_silent: | 604 | case oldconfig: |
605 | case listnewconfig: | ||
606 | case oldnoconfig: | ||
607 | case silentoldconfig: | ||
590 | /* Update until a loop caused no more changes */ | 608 | /* Update until a loop caused no more changes */ |
591 | do { | 609 | do { |
592 | conf_cnt = 0; | 610 | conf_cnt = 0; |
593 | check_conf(&rootmenu); | 611 | check_conf(&rootmenu); |
594 | } while (conf_cnt); | 612 | } while (conf_cnt && |
613 | (input_mode != listnewconfig && | ||
614 | input_mode != oldnoconfig)); | ||
595 | break; | 615 | break; |
596 | } | 616 | } |
597 | 617 | ||
@@ -600,18 +620,35 @@ int main(int ac, char **av) | |||
600 | * All other commands are only used to generate a config. | 620 | * All other commands are only used to generate a config. |
601 | */ | 621 | */ |
602 | if (conf_get_changed() && conf_write(NULL)) { | 622 | if (conf_get_changed() && conf_write(NULL)) { |
603 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); | 623 | fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); |
604 | exit(1); | 624 | exit(1); |
605 | } | 625 | } |
606 | if (conf_write_autoconf()) { | 626 | if (conf_write_autoconf()) { |
607 | fprintf(stderr, _("\n*** Error during update of the kernel configuration.\n\n")); | 627 | fprintf(stderr, _("\n*** Error during update of the configuration.\n\n")); |
608 | return 1; | 628 | return 1; |
609 | } | 629 | } |
610 | } else { | 630 | } else if (input_mode == savedefconfig) { |
631 | if (conf_write_defconfig(defconfig_file)) { | ||
632 | fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), | ||
633 | defconfig_file); | ||
634 | return 1; | ||
635 | } | ||
636 | } else if (input_mode != listnewconfig) { | ||
611 | if (conf_write(NULL)) { | 637 | if (conf_write(NULL)) { |
612 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); | 638 | fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); |
613 | exit(1); | 639 | exit(1); |
614 | } | 640 | } |
615 | } | 641 | } |
616 | return 0; | 642 | return 0; |
617 | } | 643 | } |
644 | /* | ||
645 | * Helper function to facilitate fgets() by Jean Sacren. | ||
646 | */ | ||
647 | void xfgets(str, size, in) | ||
648 | char *str; | ||
649 | int size; | ||
650 | FILE *in; | ||
651 | { | ||
652 | if (fgets(str, size, in) == NULL) | ||
653 | fprintf(stderr, "\nError in reading or end of file.\n"); | ||
654 | } | ||
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index c4dec80cfd8..61c35bf2d9c 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
@@ -5,6 +5,7 @@ | |||
5 | 5 | ||
6 | #include <sys/stat.h> | 6 | #include <sys/stat.h> |
7 | #include <ctype.h> | 7 | #include <ctype.h> |
8 | #include <errno.h> | ||
8 | #include <fcntl.h> | 9 | #include <fcntl.h> |
9 | #include <stdio.h> | 10 | #include <stdio.h> |
10 | #include <stdlib.h> | 11 | #include <stdlib.h> |
@@ -18,6 +19,9 @@ | |||
18 | static void conf_warning(const char *fmt, ...) | 19 | static void conf_warning(const char *fmt, ...) |
19 | __attribute__ ((format (printf, 1, 2))); | 20 | __attribute__ ((format (printf, 1, 2))); |
20 | 21 | ||
22 | static void conf_message(const char *fmt, ...) | ||
23 | __attribute__ ((format (printf, 1, 2))); | ||
24 | |||
21 | static const char *conf_filename; | 25 | static const char *conf_filename; |
22 | static int conf_lineno, conf_warnings, conf_unsaved; | 26 | static int conf_lineno, conf_warnings, conf_unsaved; |
23 | 27 | ||
@@ -34,6 +38,29 @@ static void conf_warning(const char *fmt, ...) | |||
34 | conf_warnings++; | 38 | conf_warnings++; |
35 | } | 39 | } |
36 | 40 | ||
41 | static void conf_default_message_callback(const char *fmt, va_list ap) | ||
42 | { | ||
43 | printf("#\n# "); | ||
44 | vprintf(fmt, ap); | ||
45 | printf("\n#\n"); | ||
46 | } | ||
47 | |||
48 | static void (*conf_message_callback) (const char *fmt, va_list ap) = | ||
49 | conf_default_message_callback; | ||
50 | void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap)) | ||
51 | { | ||
52 | conf_message_callback = fn; | ||
53 | } | ||
54 | |||
55 | static void conf_message(const char *fmt, ...) | ||
56 | { | ||
57 | va_list ap; | ||
58 | |||
59 | va_start(ap, fmt); | ||
60 | if (conf_message_callback) | ||
61 | conf_message_callback(fmt, ap); | ||
62 | } | ||
63 | |||
37 | const char *conf_get_configname(void) | 64 | const char *conf_get_configname(void) |
38 | { | 65 | { |
39 | char *name = getenv("KCONFIG_CONFIG"); | 66 | char *name = getenv("KCONFIG_CONFIG"); |
@@ -170,8 +197,11 @@ int conf_read_simple(const char *name, int def) | |||
170 | if (in) | 197 | if (in) |
171 | goto load; | 198 | goto load; |
172 | sym_add_change_count(1); | 199 | sym_add_change_count(1); |
173 | if (!sym_defconfig_list) | 200 | if (!sym_defconfig_list) { |
201 | if (modules_sym) | ||
202 | sym_calc_value(modules_sym); | ||
174 | return 1; | 203 | return 1; |
204 | } | ||
175 | 205 | ||
176 | for_all_defaults(sym_defconfig_list, prop) { | 206 | for_all_defaults(sym_defconfig_list, prop) { |
177 | if (expr_calc_value(prop->visible.expr) == no || | 207 | if (expr_calc_value(prop->visible.expr) == no || |
@@ -180,9 +210,8 @@ int conf_read_simple(const char *name, int def) | |||
180 | name = conf_expand_value(prop->expr->left.sym->name); | 210 | name = conf_expand_value(prop->expr->left.sym->name); |
181 | in = zconf_fopen(name); | 211 | in = zconf_fopen(name); |
182 | if (in) { | 212 | if (in) { |
183 | printf(_("#\n" | 213 | conf_message(_("using defaults found in %s"), |
184 | "# using defaults found in %s\n" | 214 | name); |
185 | "#\n"), name); | ||
186 | goto load; | 215 | goto load; |
187 | } | 216 | } |
188 | } | 217 | } |
@@ -217,24 +246,23 @@ load: | |||
217 | while (fgets(line, sizeof(line), in)) { | 246 | while (fgets(line, sizeof(line), in)) { |
218 | conf_lineno++; | 247 | conf_lineno++; |
219 | sym = NULL; | 248 | sym = NULL; |
220 | switch (line[0]) { | 249 | if (line[0] == '#') { |
221 | case '#': | 250 | if (memcmp(line + 2, CONFIG_, strlen(CONFIG_))) |
222 | if (memcmp(line + 2, "CONFIG_", 7)) | ||
223 | continue; | 251 | continue; |
224 | p = strchr(line + 9, ' '); | 252 | p = strchr(line + 2 + strlen(CONFIG_), ' '); |
225 | if (!p) | 253 | if (!p) |
226 | continue; | 254 | continue; |
227 | *p++ = 0; | 255 | *p++ = 0; |
228 | if (strncmp(p, "is not set", 10)) | 256 | if (strncmp(p, "is not set", 10)) |
229 | continue; | 257 | continue; |
230 | if (def == S_DEF_USER) { | 258 | if (def == S_DEF_USER) { |
231 | sym = sym_find(line + 9); | 259 | sym = sym_find(line + 2 + strlen(CONFIG_)); |
232 | if (!sym) { | 260 | if (!sym) { |
233 | sym_add_change_count(1); | 261 | sym_add_change_count(1); |
234 | break; | 262 | goto setsym; |
235 | } | 263 | } |
236 | } else { | 264 | } else { |
237 | sym = sym_lookup(line + 9, 0); | 265 | sym = sym_lookup(line + 2 + strlen(CONFIG_), 0); |
238 | if (sym->type == S_UNKNOWN) | 266 | if (sym->type == S_UNKNOWN) |
239 | sym->type = S_BOOLEAN; | 267 | sym->type = S_BOOLEAN; |
240 | } | 268 | } |
@@ -250,13 +278,8 @@ load: | |||
250 | default: | 278 | default: |
251 | ; | 279 | ; |
252 | } | 280 | } |
253 | break; | 281 | } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) { |
254 | case 'C': | 282 | p = strchr(line + strlen(CONFIG_), '='); |
255 | if (memcmp(line, "CONFIG_", 7)) { | ||
256 | conf_warning("unexpected data"); | ||
257 | continue; | ||
258 | } | ||
259 | p = strchr(line + 7, '='); | ||
260 | if (!p) | 283 | if (!p) |
261 | continue; | 284 | continue; |
262 | *p++ = 0; | 285 | *p++ = 0; |
@@ -267,13 +290,13 @@ load: | |||
267 | *p2 = 0; | 290 | *p2 = 0; |
268 | } | 291 | } |
269 | if (def == S_DEF_USER) { | 292 | if (def == S_DEF_USER) { |
270 | sym = sym_find(line + 7); | 293 | sym = sym_find(line + strlen(CONFIG_)); |
271 | if (!sym) { | 294 | if (!sym) { |
272 | sym_add_change_count(1); | 295 | sym_add_change_count(1); |
273 | break; | 296 | goto setsym; |
274 | } | 297 | } |
275 | } else { | 298 | } else { |
276 | sym = sym_lookup(line + 7, 0); | 299 | sym = sym_lookup(line + strlen(CONFIG_), 0); |
277 | if (sym->type == S_UNKNOWN) | 300 | if (sym->type == S_UNKNOWN) |
278 | sym->type = S_OTHER; | 301 | sym->type = S_OTHER; |
279 | } | 302 | } |
@@ -282,14 +305,12 @@ load: | |||
282 | } | 305 | } |
283 | if (conf_set_sym_val(sym, def, def_flags, p)) | 306 | if (conf_set_sym_val(sym, def, def_flags, p)) |
284 | continue; | 307 | continue; |
285 | break; | 308 | } else { |
286 | case '\r': | 309 | if (line[0] != '\r' && line[0] != '\n') |
287 | case '\n': | 310 | conf_warning("unexpected data"); |
288 | break; | ||
289 | default: | ||
290 | conf_warning("unexpected data"); | ||
291 | continue; | 311 | continue; |
292 | } | 312 | } |
313 | setsym: | ||
293 | if (sym && sym_is_choice_value(sym)) { | 314 | if (sym && sym_is_choice_value(sym)) { |
294 | struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); | 315 | struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); |
295 | switch (sym->def[def].tri) { | 316 | switch (sym->def[def].tri) { |
@@ -396,15 +417,149 @@ int conf_read(const char *name) | |||
396 | return 0; | 417 | return 0; |
397 | } | 418 | } |
398 | 419 | ||
420 | /* Write a S_STRING */ | ||
421 | static void conf_write_string(bool headerfile, const char *name, | ||
422 | const char *str, FILE *out) | ||
423 | { | ||
424 | int l; | ||
425 | if (headerfile) | ||
426 | fprintf(out, "#define %s%s \"", CONFIG_, name); | ||
427 | else | ||
428 | fprintf(out, "%s%s=\"", CONFIG_, name); | ||
429 | |||
430 | while (1) { | ||
431 | l = strcspn(str, "\"\\"); | ||
432 | if (l) { | ||
433 | xfwrite(str, l, 1, out); | ||
434 | str += l; | ||
435 | } | ||
436 | if (!*str) | ||
437 | break; | ||
438 | fprintf(out, "\\%c", *str++); | ||
439 | } | ||
440 | fputs("\"\n", out); | ||
441 | } | ||
442 | |||
443 | static void conf_write_symbol(struct symbol *sym, FILE *out, bool write_no) | ||
444 | { | ||
445 | const char *str; | ||
446 | |||
447 | switch (sym->type) { | ||
448 | case S_BOOLEAN: | ||
449 | case S_TRISTATE: | ||
450 | switch (sym_get_tristate_value(sym)) { | ||
451 | case no: | ||
452 | if (write_no) | ||
453 | fprintf(out, "# %s%s is not set\n", | ||
454 | CONFIG_, sym->name); | ||
455 | break; | ||
456 | case mod: | ||
457 | fprintf(out, "%s%s=m\n", CONFIG_, sym->name); | ||
458 | break; | ||
459 | case yes: | ||
460 | fprintf(out, "%s%s=y\n", CONFIG_, sym->name); | ||
461 | break; | ||
462 | } | ||
463 | break; | ||
464 | case S_STRING: | ||
465 | conf_write_string(false, sym->name, sym_get_string_value(sym), out); | ||
466 | break; | ||
467 | case S_HEX: | ||
468 | case S_INT: | ||
469 | str = sym_get_string_value(sym); | ||
470 | fprintf(out, "%s%s=%s\n", CONFIG_, sym->name, str); | ||
471 | break; | ||
472 | case S_OTHER: | ||
473 | case S_UNKNOWN: | ||
474 | break; | ||
475 | } | ||
476 | } | ||
477 | |||
478 | /* | ||
479 | * Write out a minimal config. | ||
480 | * All values that has default values are skipped as this is redundant. | ||
481 | */ | ||
482 | int conf_write_defconfig(const char *filename) | ||
483 | { | ||
484 | struct symbol *sym; | ||
485 | struct menu *menu; | ||
486 | FILE *out; | ||
487 | |||
488 | out = fopen(filename, "w"); | ||
489 | if (!out) | ||
490 | return 1; | ||
491 | |||
492 | sym_clear_all_valid(); | ||
493 | |||
494 | /* Traverse all menus to find all relevant symbols */ | ||
495 | menu = rootmenu.list; | ||
496 | |||
497 | while (menu != NULL) | ||
498 | { | ||
499 | sym = menu->sym; | ||
500 | if (sym == NULL) { | ||
501 | if (!menu_is_visible(menu)) | ||
502 | goto next_menu; | ||
503 | } else if (!sym_is_choice(sym)) { | ||
504 | sym_calc_value(sym); | ||
505 | if (!(sym->flags & SYMBOL_WRITE)) | ||
506 | goto next_menu; | ||
507 | sym->flags &= ~SYMBOL_WRITE; | ||
508 | /* If we cannot change the symbol - skip */ | ||
509 | if (!sym_is_changable(sym)) | ||
510 | goto next_menu; | ||
511 | /* If symbol equals to default value - skip */ | ||
512 | if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0) | ||
513 | goto next_menu; | ||
514 | |||
515 | /* | ||
516 | * If symbol is a choice value and equals to the | ||
517 | * default for a choice - skip. | ||
518 | * But only if value is bool and equal to "y" and | ||
519 | * choice is not "optional". | ||
520 | * (If choice is "optional" then all values can be "n") | ||
521 | */ | ||
522 | if (sym_is_choice_value(sym)) { | ||
523 | struct symbol *cs; | ||
524 | struct symbol *ds; | ||
525 | |||
526 | cs = prop_get_symbol(sym_get_choice_prop(sym)); | ||
527 | ds = sym_choice_default(cs); | ||
528 | if (!sym_is_optional(cs) && sym == ds) { | ||
529 | if ((sym->type == S_BOOLEAN) && | ||
530 | sym_get_tristate_value(sym) == yes) | ||
531 | goto next_menu; | ||
532 | } | ||
533 | } | ||
534 | conf_write_symbol(sym, out, true); | ||
535 | } | ||
536 | next_menu: | ||
537 | if (menu->list != NULL) { | ||
538 | menu = menu->list; | ||
539 | } | ||
540 | else if (menu->next != NULL) { | ||
541 | menu = menu->next; | ||
542 | } else { | ||
543 | while ((menu = menu->parent)) { | ||
544 | if (menu->next != NULL) { | ||
545 | menu = menu->next; | ||
546 | break; | ||
547 | } | ||
548 | } | ||
549 | } | ||
550 | } | ||
551 | fclose(out); | ||
552 | return 0; | ||
553 | } | ||
554 | |||
399 | int conf_write(const char *name) | 555 | int conf_write(const char *name) |
400 | { | 556 | { |
401 | FILE *out; | 557 | FILE *out; |
402 | struct symbol *sym; | 558 | struct symbol *sym; |
403 | struct menu *menu; | 559 | struct menu *menu; |
404 | const char *basename; | 560 | const char *basename; |
405 | char dirname[128], tmpname[128], newname[128]; | ||
406 | int type, l; | ||
407 | const char *str; | 561 | const char *str; |
562 | char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; | ||
408 | time_t now; | 563 | time_t now; |
409 | int use_timestamp = 1; | 564 | int use_timestamp = 1; |
410 | char *env; | 565 | char *env; |
@@ -443,8 +598,6 @@ int conf_write(const char *name) | |||
443 | if (!out) | 598 | if (!out) |
444 | return 1; | 599 | return 1; |
445 | 600 | ||
446 | sym = sym_lookup("KERNELVERSION", 0); | ||
447 | sym_calc_value(sym); | ||
448 | time(&now); | 601 | time(&now); |
449 | env = getenv("KCONFIG_NOTIMESTAMP"); | 602 | env = getenv("KCONFIG_NOTIMESTAMP"); |
450 | if (env && *env) | 603 | if (env && *env) |
@@ -452,10 +605,10 @@ int conf_write(const char *name) | |||
452 | 605 | ||
453 | fprintf(out, _("#\n" | 606 | fprintf(out, _("#\n" |
454 | "# Automatically generated make config: don't edit\n" | 607 | "# Automatically generated make config: don't edit\n" |
455 | "# Linux kernel version: %s\n" | 608 | "# %s\n" |
456 | "%s%s" | 609 | "%s%s" |
457 | "#\n"), | 610 | "#\n"), |
458 | sym_get_string_value(sym), | 611 | rootmenu.prompt->text, |
459 | use_timestamp ? "# " : "", | 612 | use_timestamp ? "# " : "", |
460 | use_timestamp ? ctime(&now) : ""); | 613 | use_timestamp ? ctime(&now) : ""); |
461 | 614 | ||
@@ -478,56 +631,11 @@ int conf_write(const char *name) | |||
478 | if (!(sym->flags & SYMBOL_WRITE)) | 631 | if (!(sym->flags & SYMBOL_WRITE)) |
479 | goto next; | 632 | goto next; |
480 | sym->flags &= ~SYMBOL_WRITE; | 633 | sym->flags &= ~SYMBOL_WRITE; |
481 | type = sym->type; | 634 | /* Write config symbol to file */ |
482 | if (type == S_TRISTATE) { | 635 | conf_write_symbol(sym, out, true); |
483 | sym_calc_value(modules_sym); | ||
484 | if (modules_sym->curr.tri == no) | ||
485 | type = S_BOOLEAN; | ||
486 | } | ||
487 | switch (type) { | ||
488 | case S_BOOLEAN: | ||
489 | case S_TRISTATE: | ||
490 | switch (sym_get_tristate_value(sym)) { | ||
491 | case no: | ||
492 | fprintf(out, "# CONFIG_%s is not set\n", sym->name); | ||
493 | break; | ||
494 | case mod: | ||
495 | fprintf(out, "CONFIG_%s=m\n", sym->name); | ||
496 | break; | ||
497 | case yes: | ||
498 | fprintf(out, "CONFIG_%s=y\n", sym->name); | ||
499 | break; | ||
500 | } | ||
501 | break; | ||
502 | case S_STRING: | ||
503 | str = sym_get_string_value(sym); | ||
504 | fprintf(out, "CONFIG_%s=\"", sym->name); | ||
505 | while (1) { | ||
506 | l = strcspn(str, "\"\\"); | ||
507 | if (l) { | ||
508 | fwrite(str, l, 1, out); | ||
509 | str += l; | ||
510 | } | ||
511 | if (!*str) | ||
512 | break; | ||
513 | fprintf(out, "\\%c", *str++); | ||
514 | } | ||
515 | fputs("\"\n", out); | ||
516 | break; | ||
517 | case S_HEX: | ||
518 | str = sym_get_string_value(sym); | ||
519 | if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) { | ||
520 | fprintf(out, "CONFIG_%s=%s\n", sym->name, str); | ||
521 | break; | ||
522 | } | ||
523 | case S_INT: | ||
524 | str = sym_get_string_value(sym); | ||
525 | fprintf(out, "CONFIG_%s=%s\n", sym->name, str); | ||
526 | break; | ||
527 | } | ||
528 | } | 636 | } |
529 | 637 | ||
530 | next: | 638 | next: |
531 | if (menu->list) { | 639 | if (menu->list) { |
532 | menu = menu->list; | 640 | menu = menu->list; |
533 | continue; | 641 | continue; |
@@ -551,9 +659,7 @@ int conf_write(const char *name) | |||
551 | return 1; | 659 | return 1; |
552 | } | 660 | } |
553 | 661 | ||
554 | printf(_("#\n" | 662 | conf_message(_("configuration written to %s"), newname); |
555 | "# configuration written to %s\n" | ||
556 | "#\n"), newname); | ||
557 | 663 | ||
558 | sym_set_change_count(0); | 664 | sym_set_change_count(0); |
559 | 665 | ||
@@ -563,7 +669,7 @@ int conf_write(const char *name) | |||
563 | static int conf_split_config(void) | 669 | static int conf_split_config(void) |
564 | { | 670 | { |
565 | const char *name; | 671 | const char *name; |
566 | char path[128]; | 672 | char path[PATH_MAX+1]; |
567 | char *s, *d, c; | 673 | char *s, *d, c; |
568 | struct symbol *sym; | 674 | struct symbol *sym; |
569 | struct stat sb; | 675 | struct stat sb; |
@@ -679,7 +785,7 @@ int conf_write_autoconf(void) | |||
679 | const char *name; | 785 | const char *name; |
680 | FILE *out, *tristate, *out_h; | 786 | FILE *out, *tristate, *out_h; |
681 | time_t now; | 787 | time_t now; |
682 | int i, l; | 788 | int i; |
683 | 789 | ||
684 | sym_clear_all_valid(); | 790 | sym_clear_all_valid(); |
685 | 791 | ||
@@ -705,30 +811,32 @@ int conf_write_autoconf(void) | |||
705 | return 1; | 811 | return 1; |
706 | } | 812 | } |
707 | 813 | ||
708 | sym = sym_lookup("KERNELVERSION", 0); | ||
709 | sym_calc_value(sym); | ||
710 | time(&now); | 814 | time(&now); |
711 | fprintf(out, "#\n" | 815 | fprintf(out, "#\n" |
712 | "# Automatically generated make config: don't edit\n" | 816 | "# Automatically generated make config: don't edit\n" |
713 | "# Linux kernel version: %s\n" | 817 | "# %s\n" |
714 | "# %s" | 818 | "# %s" |
715 | "#\n", | 819 | "#\n", |
716 | sym_get_string_value(sym), ctime(&now)); | 820 | rootmenu.prompt->text, ctime(&now)); |
717 | fprintf(tristate, "#\n" | 821 | fprintf(tristate, "#\n" |
718 | "# Automatically generated - do not edit\n" | 822 | "# Automatically generated - do not edit\n" |
719 | "\n"); | 823 | "\n"); |
720 | fprintf(out_h, "/*\n" | 824 | fprintf(out_h, "/*\n" |
721 | " * Automatically generated C config: don't edit\n" | 825 | " * Automatically generated C config: don't edit\n" |
722 | " * Linux kernel version: %s\n" | 826 | " * %s\n" |
723 | " * %s" | 827 | " * %s" |
724 | " */\n" | 828 | " */\n", |
725 | "#define AUTOCONF_INCLUDED\n", | 829 | rootmenu.prompt->text, ctime(&now)); |
726 | sym_get_string_value(sym), ctime(&now)); | ||
727 | 830 | ||
728 | for_all_symbols(i, sym) { | 831 | for_all_symbols(i, sym) { |
729 | sym_calc_value(sym); | 832 | sym_calc_value(sym); |
730 | if (!(sym->flags & SYMBOL_WRITE) || !sym->name) | 833 | if (!(sym->flags & SYMBOL_WRITE) || !sym->name) |
731 | continue; | 834 | continue; |
835 | |||
836 | /* write symbol to config file */ | ||
837 | conf_write_symbol(sym, out, false); | ||
838 | |||
839 | /* update autoconf and tristate files */ | ||
732 | switch (sym->type) { | 840 | switch (sym->type) { |
733 | case S_BOOLEAN: | 841 | case S_BOOLEAN: |
734 | case S_TRISTATE: | 842 | case S_TRISTATE: |
@@ -736,50 +844,34 @@ int conf_write_autoconf(void) | |||
736 | case no: | 844 | case no: |
737 | break; | 845 | break; |
738 | case mod: | 846 | case mod: |
739 | fprintf(out, "CONFIG_%s=m\n", sym->name); | 847 | fprintf(tristate, "%s%s=M\n", |
740 | fprintf(tristate, "CONFIG_%s=M\n", sym->name); | 848 | CONFIG_, sym->name); |
741 | fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name); | 849 | fprintf(out_h, "#define %s%s_MODULE 1\n", |
850 | CONFIG_, sym->name); | ||
742 | break; | 851 | break; |
743 | case yes: | 852 | case yes: |
744 | fprintf(out, "CONFIG_%s=y\n", sym->name); | ||
745 | if (sym->type == S_TRISTATE) | 853 | if (sym->type == S_TRISTATE) |
746 | fprintf(tristate, "CONFIG_%s=Y\n", | 854 | fprintf(tristate,"%s%s=Y\n", |
747 | sym->name); | 855 | CONFIG_, sym->name); |
748 | fprintf(out_h, "#define CONFIG_%s 1\n", sym->name); | 856 | fprintf(out_h, "#define %s%s 1\n", |
857 | CONFIG_, sym->name); | ||
749 | break; | 858 | break; |
750 | } | 859 | } |
751 | break; | 860 | break; |
752 | case S_STRING: | 861 | case S_STRING: |
753 | str = sym_get_string_value(sym); | 862 | conf_write_string(true, sym->name, sym_get_string_value(sym), out_h); |
754 | fprintf(out, "CONFIG_%s=\"", sym->name); | ||
755 | fprintf(out_h, "#define CONFIG_%s \"", sym->name); | ||
756 | while (1) { | ||
757 | l = strcspn(str, "\"\\"); | ||
758 | if (l) { | ||
759 | fwrite(str, l, 1, out); | ||
760 | fwrite(str, l, 1, out_h); | ||
761 | str += l; | ||
762 | } | ||
763 | if (!*str) | ||
764 | break; | ||
765 | fprintf(out, "\\%c", *str); | ||
766 | fprintf(out_h, "\\%c", *str); | ||
767 | str++; | ||
768 | } | ||
769 | fputs("\"\n", out); | ||
770 | fputs("\"\n", out_h); | ||
771 | break; | 863 | break; |
772 | case S_HEX: | 864 | case S_HEX: |
773 | str = sym_get_string_value(sym); | 865 | str = sym_get_string_value(sym); |
774 | if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) { | 866 | if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) { |
775 | fprintf(out, "CONFIG_%s=%s\n", sym->name, str); | 867 | fprintf(out_h, "#define %s%s 0x%s\n", |
776 | fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str); | 868 | CONFIG_, sym->name, str); |
777 | break; | 869 | break; |
778 | } | 870 | } |
779 | case S_INT: | 871 | case S_INT: |
780 | str = sym_get_string_value(sym); | 872 | str = sym_get_string_value(sym); |
781 | fprintf(out, "CONFIG_%s=%s\n", sym->name, str); | 873 | fprintf(out_h, "#define %s%s %s\n", |
782 | fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str); | 874 | CONFIG_, sym->name, str); |
783 | break; | 875 | break; |
784 | default: | 876 | default: |
785 | break; | 877 | break; |
@@ -837,13 +929,73 @@ void conf_set_changed_callback(void (*fn)(void)) | |||
837 | conf_changed_callback = fn; | 929 | conf_changed_callback = fn; |
838 | } | 930 | } |
839 | 931 | ||
932 | static void randomize_choice_values(struct symbol *csym) | ||
933 | { | ||
934 | struct property *prop; | ||
935 | struct symbol *sym; | ||
936 | struct expr *e; | ||
937 | int cnt, def; | ||
938 | |||
939 | /* | ||
940 | * If choice is mod then we may have more items selected | ||
941 | * and if no then no-one. | ||
942 | * In both cases stop. | ||
943 | */ | ||
944 | if (csym->curr.tri != yes) | ||
945 | return; | ||
946 | |||
947 | prop = sym_get_choice_prop(csym); | ||
948 | |||
949 | /* count entries in choice block */ | ||
950 | cnt = 0; | ||
951 | expr_list_for_each_sym(prop->expr, e, sym) | ||
952 | cnt++; | ||
953 | |||
954 | /* | ||
955 | * find a random value and set it to yes, | ||
956 | * set the rest to no so we have only one set | ||
957 | */ | ||
958 | def = (rand() % cnt); | ||
959 | |||
960 | cnt = 0; | ||
961 | expr_list_for_each_sym(prop->expr, e, sym) { | ||
962 | if (def == cnt++) { | ||
963 | sym->def[S_DEF_USER].tri = yes; | ||
964 | csym->def[S_DEF_USER].val = sym; | ||
965 | } | ||
966 | else { | ||
967 | sym->def[S_DEF_USER].tri = no; | ||
968 | } | ||
969 | } | ||
970 | csym->flags |= SYMBOL_DEF_USER; | ||
971 | /* clear VALID to get value calculated */ | ||
972 | csym->flags &= ~(SYMBOL_VALID); | ||
973 | } | ||
974 | |||
975 | static void set_all_choice_values(struct symbol *csym) | ||
976 | { | ||
977 | struct property *prop; | ||
978 | struct symbol *sym; | ||
979 | struct expr *e; | ||
980 | |||
981 | prop = sym_get_choice_prop(csym); | ||
982 | |||
983 | /* | ||
984 | * Set all non-assinged choice values to no | ||
985 | */ | ||
986 | expr_list_for_each_sym(prop->expr, e, sym) { | ||
987 | if (!sym_has_value(sym)) | ||
988 | sym->def[S_DEF_USER].tri = no; | ||
989 | } | ||
990 | csym->flags |= SYMBOL_DEF_USER; | ||
991 | /* clear VALID to get value calculated */ | ||
992 | csym->flags &= ~(SYMBOL_VALID); | ||
993 | } | ||
840 | 994 | ||
841 | void conf_set_all_new_symbols(enum conf_def_mode mode) | 995 | void conf_set_all_new_symbols(enum conf_def_mode mode) |
842 | { | 996 | { |
843 | struct symbol *sym, *csym; | 997 | struct symbol *sym, *csym; |
844 | struct property *prop; | 998 | int i, cnt; |
845 | struct expr *e; | ||
846 | int i, cnt, def; | ||
847 | 999 | ||
848 | for_all_symbols(i, sym) { | 1000 | for_all_symbols(i, sym) { |
849 | if (sym_has_value(sym)) | 1001 | if (sym_has_value(sym)) |
@@ -862,7 +1014,8 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) | |||
862 | sym->def[S_DEF_USER].tri = no; | 1014 | sym->def[S_DEF_USER].tri = no; |
863 | break; | 1015 | break; |
864 | case def_random: | 1016 | case def_random: |
865 | sym->def[S_DEF_USER].tri = (tristate)(rand() % 3); | 1017 | cnt = sym_get_type(sym) == S_TRISTATE ? 3 : 2; |
1018 | sym->def[S_DEF_USER].tri = (tristate)(rand() % cnt); | ||
866 | break; | 1019 | break; |
867 | default: | 1020 | default: |
868 | continue; | 1021 | continue; |
@@ -878,14 +1031,12 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) | |||
878 | 1031 | ||
879 | sym_clear_all_valid(); | 1032 | sym_clear_all_valid(); |
880 | 1033 | ||
881 | if (mode != def_random) | ||
882 | return; | ||
883 | /* | 1034 | /* |
884 | * We have different type of choice blocks. | 1035 | * We have different type of choice blocks. |
885 | * If curr.tri equal to mod then we can select several | 1036 | * If curr.tri equals to mod then we can select several |
886 | * choice symbols in one block. | 1037 | * choice symbols in one block. |
887 | * In this case we do nothing. | 1038 | * In this case we do nothing. |
888 | * If curr.tri equal yes then only one symbol can be | 1039 | * If curr.tri equals yes then only one symbol can be |
889 | * selected in a choice block and we set it to yes, | 1040 | * selected in a choice block and we set it to yes, |
890 | * and the rest to no. | 1041 | * and the rest to no. |
891 | */ | 1042 | */ |
@@ -894,35 +1045,9 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) | |||
894 | continue; | 1045 | continue; |
895 | 1046 | ||
896 | sym_calc_value(csym); | 1047 | sym_calc_value(csym); |
897 | 1048 | if (mode == def_random) | |
898 | if (csym->curr.tri != yes) | 1049 | randomize_choice_values(csym); |
899 | continue; | 1050 | else |
900 | 1051 | set_all_choice_values(csym); | |
901 | prop = sym_get_choice_prop(csym); | ||
902 | |||
903 | /* count entries in choice block */ | ||
904 | cnt = 0; | ||
905 | expr_list_for_each_sym(prop->expr, e, sym) | ||
906 | cnt++; | ||
907 | |||
908 | /* | ||
909 | * find a random value and set it to yes, | ||
910 | * set the rest to no so we have only one set | ||
911 | */ | ||
912 | def = (rand() % cnt); | ||
913 | |||
914 | cnt = 0; | ||
915 | expr_list_for_each_sym(prop->expr, e, sym) { | ||
916 | if (def == cnt++) { | ||
917 | sym->def[S_DEF_USER].tri = yes; | ||
918 | csym->def[S_DEF_USER].val = sym; | ||
919 | } | ||
920 | else { | ||
921 | sym->def[S_DEF_USER].tri = no; | ||
922 | } | ||
923 | } | ||
924 | csym->flags |= SYMBOL_DEF_USER; | ||
925 | /* clear VALID to get value calculated */ | ||
926 | csym->flags &= ~(SYMBOL_VALID); | ||
927 | } | 1052 | } |
928 | } | 1053 | } |
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index d83f2322893..001003452f6 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c | |||
@@ -64,7 +64,7 @@ struct expr *expr_alloc_or(struct expr *e1, struct expr *e2) | |||
64 | return e2 ? expr_alloc_two(E_OR, e1, e2) : e1; | 64 | return e2 ? expr_alloc_two(E_OR, e1, e2) : e1; |
65 | } | 65 | } |
66 | 66 | ||
67 | struct expr *expr_copy(struct expr *org) | 67 | struct expr *expr_copy(const struct expr *org) |
68 | { | 68 | { |
69 | struct expr *e; | 69 | struct expr *e; |
70 | 70 | ||
@@ -1013,6 +1013,48 @@ int expr_compare_type(enum expr_type t1, enum expr_type t2) | |||
1013 | #endif | 1013 | #endif |
1014 | } | 1014 | } |
1015 | 1015 | ||
1016 | static inline struct expr * | ||
1017 | expr_get_leftmost_symbol(const struct expr *e) | ||
1018 | { | ||
1019 | |||
1020 | if (e == NULL) | ||
1021 | return NULL; | ||
1022 | |||
1023 | while (e->type != E_SYMBOL) | ||
1024 | e = e->left.expr; | ||
1025 | |||
1026 | return expr_copy(e); | ||
1027 | } | ||
1028 | |||
1029 | /* | ||
1030 | * Given expression `e1' and `e2', returns the leaf of the longest | ||
1031 | * sub-expression of `e1' not containing 'e2. | ||
1032 | */ | ||
1033 | struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2) | ||
1034 | { | ||
1035 | struct expr *ret; | ||
1036 | |||
1037 | switch (e1->type) { | ||
1038 | case E_OR: | ||
1039 | return expr_alloc_and( | ||
1040 | expr_simplify_unmet_dep(e1->left.expr, e2), | ||
1041 | expr_simplify_unmet_dep(e1->right.expr, e2)); | ||
1042 | case E_AND: { | ||
1043 | struct expr *e; | ||
1044 | e = expr_alloc_and(expr_copy(e1), expr_copy(e2)); | ||
1045 | e = expr_eliminate_dups(e); | ||
1046 | ret = (!expr_eq(e, e1)) ? e1 : NULL; | ||
1047 | expr_free(e); | ||
1048 | break; | ||
1049 | } | ||
1050 | default: | ||
1051 | ret = e1; | ||
1052 | break; | ||
1053 | } | ||
1054 | |||
1055 | return expr_get_leftmost_symbol(ret); | ||
1056 | } | ||
1057 | |||
1016 | void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken) | 1058 | void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken) |
1017 | { | 1059 | { |
1018 | if (!e) { | 1060 | if (!e) { |
@@ -1087,7 +1129,7 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char * | |||
1087 | 1129 | ||
1088 | static void expr_print_file_helper(void *data, struct symbol *sym, const char *str) | 1130 | static void expr_print_file_helper(void *data, struct symbol *sym, const char *str) |
1089 | { | 1131 | { |
1090 | fwrite(str, strlen(str), 1, data); | 1132 | xfwrite(str, strlen(str), 1, data); |
1091 | } | 1133 | } |
1092 | 1134 | ||
1093 | void expr_fprint(struct expr *e, FILE *out) | 1135 | void expr_fprint(struct expr *e, FILE *out) |
@@ -1121,7 +1163,7 @@ static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *s | |||
1121 | } | 1163 | } |
1122 | 1164 | ||
1123 | str_append(gs, str); | 1165 | str_append(gs, str); |
1124 | if (sym) | 1166 | if (sym && sym->type != S_UNKNOWN) |
1125 | str_printf(gs, " [=%s]", sym_str); | 1167 | str_printf(gs, " [=%s]", sym_str); |
1126 | } | 1168 | } |
1127 | 1169 | ||
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 891cd9ce9ba..3d238db4976 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h | |||
@@ -18,7 +18,7 @@ extern "C" { | |||
18 | struct file { | 18 | struct file { |
19 | struct file *next; | 19 | struct file *next; |
20 | struct file *parent; | 20 | struct file *parent; |
21 | char *name; | 21 | const char *name; |
22 | int lineno; | 22 | int lineno; |
23 | int flags; | 23 | int flags; |
24 | }; | 24 | }; |
@@ -83,6 +83,7 @@ struct symbol { | |||
83 | tristate visible; | 83 | tristate visible; |
84 | int flags; | 84 | int flags; |
85 | struct property *prop; | 85 | struct property *prop; |
86 | struct expr_value dir_dep; | ||
86 | struct expr_value rev_dep; | 87 | struct expr_value rev_dep; |
87 | }; | 88 | }; |
88 | 89 | ||
@@ -131,6 +132,7 @@ enum prop_type { | |||
131 | P_SELECT, /* select BAR */ | 132 | P_SELECT, /* select BAR */ |
132 | P_RANGE, /* range 7..100 (for a symbol) */ | 133 | P_RANGE, /* range 7..100 (for a symbol) */ |
133 | P_ENV, /* value from environment variable */ | 134 | P_ENV, /* value from environment variable */ |
135 | P_SYMBOL, /* where a symbol is defined */ | ||
134 | }; | 136 | }; |
135 | 137 | ||
136 | struct property { | 138 | struct property { |
@@ -162,6 +164,7 @@ struct menu { | |||
162 | struct menu *list; | 164 | struct menu *list; |
163 | struct symbol *sym; | 165 | struct symbol *sym; |
164 | struct property *prompt; | 166 | struct property *prompt; |
167 | struct expr *visibility; | ||
165 | struct expr *dep; | 168 | struct expr *dep; |
166 | unsigned int flags; | 169 | unsigned int flags; |
167 | char *help; | 170 | char *help; |
@@ -189,7 +192,7 @@ struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e | |||
189 | struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2); | 192 | struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2); |
190 | struct expr *expr_alloc_and(struct expr *e1, struct expr *e2); | 193 | struct expr *expr_alloc_and(struct expr *e1, struct expr *e2); |
191 | struct expr *expr_alloc_or(struct expr *e1, struct expr *e2); | 194 | struct expr *expr_alloc_or(struct expr *e1, struct expr *e2); |
192 | struct expr *expr_copy(struct expr *org); | 195 | struct expr *expr_copy(const struct expr *org); |
193 | void expr_free(struct expr *e); | 196 | void expr_free(struct expr *e); |
194 | int expr_eq(struct expr *e1, struct expr *e2); | 197 | int expr_eq(struct expr *e1, struct expr *e2); |
195 | void expr_eliminate_eq(struct expr **ep1, struct expr **ep2); | 198 | void expr_eliminate_eq(struct expr **ep1, struct expr **ep2); |
@@ -204,6 +207,7 @@ struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2); | |||
204 | struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2); | 207 | struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2); |
205 | void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2); | 208 | void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2); |
206 | struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym); | 209 | struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym); |
210 | struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2); | ||
207 | 211 | ||
208 | void expr_fprint(struct expr *e, FILE *out); | 212 | void expr_fprint(struct expr *e, FILE *out); |
209 | struct gstr; /* forward */ | 213 | struct gstr; /* forward */ |
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index bef10411837..455896164d7 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -133,7 +133,6 @@ void init_main_window(const gchar * glade_file) | |||
133 | GladeXML *xml; | 133 | GladeXML *xml; |
134 | GtkWidget *widget; | 134 | GtkWidget *widget; |
135 | GtkTextBuffer *txtbuf; | 135 | GtkTextBuffer *txtbuf; |
136 | char title[256]; | ||
137 | GtkStyle *style; | 136 | GtkStyle *style; |
138 | 137 | ||
139 | xml = glade_xml_new(glade_file, "window1", NULL); | 138 | xml = glade_xml_new(glade_file, "window1", NULL); |
@@ -210,9 +209,7 @@ void init_main_window(const gchar * glade_file) | |||
210 | /*"style", PANGO_STYLE_OBLIQUE, */ | 209 | /*"style", PANGO_STYLE_OBLIQUE, */ |
211 | NULL); | 210 | NULL); |
212 | 211 | ||
213 | sprintf(title, _("Linux Kernel v%s Configuration"), | 212 | gtk_window_set_title(GTK_WINDOW(main_wnd), rootmenu.prompt->text); |
214 | getenv("KERNELVERSION")); | ||
215 | gtk_window_set_title(GTK_WINDOW(main_wnd), title); | ||
216 | 213 | ||
217 | gtk_widget_show(main_wnd); | 214 | gtk_widget_show(main_wnd); |
218 | } | 215 | } |
@@ -671,8 +668,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) | |||
671 | { | 668 | { |
672 | GtkWidget *dialog; | 669 | GtkWidget *dialog; |
673 | const gchar *intro_text = _( | 670 | const gchar *intro_text = _( |
674 | "Welcome to gkc, the GTK+ graphical kernel configuration tool\n" | 671 | "Welcome to gkc, the GTK+ graphical configuration tool\n" |
675 | "for Linux.\n" | ||
676 | "For each option, a blank box indicates the feature is disabled, a\n" | 672 | "For each option, a blank box indicates the feature is disabled, a\n" |
677 | "check indicates it is enabled, and a dot indicates that it is to\n" | 673 | "check indicates it is enabled, and a dot indicates that it is to\n" |
678 | "be compiled as a module. Clicking on the box will cycle through the three states.\n" | 674 | "be compiled as a module. Clicking on the box will cycle through the three states.\n" |
@@ -1114,7 +1110,7 @@ static gchar **fill_row(struct menu *menu) | |||
1114 | 1110 | ||
1115 | row[COL_OPTION] = | 1111 | row[COL_OPTION] = |
1116 | g_strdup_printf("%s %s", _(menu_get_prompt(menu)), | 1112 | g_strdup_printf("%s %s", _(menu_get_prompt(menu)), |
1117 | sym && sym_has_value(sym) ? "(NEW)" : ""); | 1113 | sym && !sym_has_value(sym) ? "(NEW)" : ""); |
1118 | 1114 | ||
1119 | if (opt_mode == OPT_ALL && !menu_is_visible(menu)) | 1115 | if (opt_mode == OPT_ALL && !menu_is_visible(menu)) |
1120 | row[COL_COLOR] = g_strdup("DarkGray"); | 1116 | row[COL_COLOR] = g_strdup("DarkGray"); |
@@ -1343,7 +1339,8 @@ static void update_tree(struct menu *src, GtkTreeIter * dst) | |||
1343 | #endif | 1339 | #endif |
1344 | 1340 | ||
1345 | if ((opt_mode == OPT_NORMAL && !menu_is_visible(child1)) || | 1341 | if ((opt_mode == OPT_NORMAL && !menu_is_visible(child1)) || |
1346 | (opt_mode == OPT_PROMPT && !menu_has_prompt(child1))) { | 1342 | (opt_mode == OPT_PROMPT && !menu_has_prompt(child1)) || |
1343 | (opt_mode == OPT_ALL && !menu_get_prompt(child1))) { | ||
1347 | 1344 | ||
1348 | /* remove node */ | 1345 | /* remove node */ |
1349 | if (gtktree_iter_find_node(dst, menu1) != NULL) { | 1346 | if (gtktree_iter_find_node(dst, menu1) != NULL) { |
@@ -1425,7 +1422,7 @@ static void display_tree(struct menu *menu) | |||
1425 | 1422 | ||
1426 | if ((opt_mode == OPT_NORMAL && menu_is_visible(child)) || | 1423 | if ((opt_mode == OPT_NORMAL && menu_is_visible(child)) || |
1427 | (opt_mode == OPT_PROMPT && menu_has_prompt(child)) || | 1424 | (opt_mode == OPT_PROMPT && menu_has_prompt(child)) || |
1428 | (opt_mode == OPT_ALL)) | 1425 | (opt_mode == OPT_ALL && menu_get_prompt(child))) |
1429 | place_node(child, fill_row(child)); | 1426 | place_node(child, fill_row(child)); |
1430 | #ifdef DEBUG | 1427 | #ifdef DEBUG |
1431 | printf("%*c%s: ", indent, ' ', menu_get_prompt(child)); | 1428 | printf("%*c%s: ", indent, ' ', menu_get_prompt(child)); |
@@ -1530,12 +1527,6 @@ int main(int ac, char *av[]) | |||
1530 | else | 1527 | else |
1531 | glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); | 1528 | glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); |
1532 | 1529 | ||
1533 | /* Load the interface and connect signals */ | ||
1534 | init_main_window(glade_file); | ||
1535 | init_tree_model(); | ||
1536 | init_left_tree(); | ||
1537 | init_right_tree(); | ||
1538 | |||
1539 | /* Conf stuffs */ | 1530 | /* Conf stuffs */ |
1540 | if (ac > 1 && av[1][0] == '-') { | 1531 | if (ac > 1 && av[1][0] == '-') { |
1541 | switch (av[1][1]) { | 1532 | switch (av[1][1]) { |
@@ -1555,6 +1546,12 @@ int main(int ac, char *av[]) | |||
1555 | fixup_rootmenu(&rootmenu); | 1546 | fixup_rootmenu(&rootmenu); |
1556 | conf_read(NULL); | 1547 | conf_read(NULL); |
1557 | 1548 | ||
1549 | /* Load the interface and connect signals */ | ||
1550 | init_main_window(glade_file); | ||
1551 | init_tree_model(); | ||
1552 | init_left_tree(); | ||
1553 | init_right_tree(); | ||
1554 | |||
1558 | switch (view_mode) { | 1555 | switch (view_mode) { |
1559 | case SINGLE_VIEW: | 1556 | case SINGLE_VIEW: |
1560 | display_tree_part(); | 1557 | display_tree_part(); |
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade index d52b0a75d82..aa483cb3275 100644 --- a/scripts/kconfig/gconf.glade +++ b/scripts/kconfig/gconf.glade | |||
@@ -1,5 +1,4 @@ | |||
1 | <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> | 1 | <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> |
2 | <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> | ||
3 | 2 | ||
4 | <glade-interface> | 3 | <glade-interface> |
5 | 4 | ||
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c index dcc3fcc0cc9..e9d8e791bf0 100644 --- a/scripts/kconfig/kxgettext.c +++ b/scripts/kconfig/kxgettext.c | |||
@@ -63,11 +63,11 @@ next: | |||
63 | 63 | ||
64 | struct file_line { | 64 | struct file_line { |
65 | struct file_line *next; | 65 | struct file_line *next; |
66 | char* file; | 66 | const char *file; |
67 | int lineno; | 67 | int lineno; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | static struct file_line *file_line__new(char *file, int lineno) | 70 | static struct file_line *file_line__new(const char *file, int lineno) |
71 | { | 71 | { |
72 | struct file_line *self = malloc(sizeof(*self)); | 72 | struct file_line *self = malloc(sizeof(*self)); |
73 | 73 | ||
@@ -90,7 +90,8 @@ struct message { | |||
90 | 90 | ||
91 | static struct message *message__list; | 91 | static struct message *message__list; |
92 | 92 | ||
93 | static struct message *message__new(const char *msg, char *option, char *file, int lineno) | 93 | static struct message *message__new(const char *msg, char *option, |
94 | const char *file, int lineno) | ||
94 | { | 95 | { |
95 | struct message *self = malloc(sizeof(*self)); | 96 | struct message *self = malloc(sizeof(*self)); |
96 | 97 | ||
@@ -130,7 +131,8 @@ static struct message *mesage__find(const char *msg) | |||
130 | return m; | 131 | return m; |
131 | } | 132 | } |
132 | 133 | ||
133 | static int message__add_file_line(struct message *self, char *file, int lineno) | 134 | static int message__add_file_line(struct message *self, const char *file, |
135 | int lineno) | ||
134 | { | 136 | { |
135 | int rc = -1; | 137 | int rc = -1; |
136 | struct file_line *fl = file_line__new(file, lineno); | 138 | struct file_line *fl = file_line__new(file, lineno); |
@@ -145,7 +147,8 @@ out: | |||
145 | return rc; | 147 | return rc; |
146 | } | 148 | } |
147 | 149 | ||
148 | static int message__add(const char *msg, char *option, char *file, int lineno) | 150 | static int message__add(const char *msg, char *option, const char *file, |
151 | int lineno) | ||
149 | { | 152 | { |
150 | int rc = 0; | 153 | int rc = 0; |
151 | char bf[16384]; | 154 | char bf[16384]; |
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped index fdc7113b08d..6eb03971825 100644 --- a/scripts/kconfig/lex.zconf.c_shipped +++ b/scripts/kconfig/lex.zconf.c_shipped | |||
@@ -2373,9 +2373,10 @@ void zconf_nextfile(const char *name) | |||
2373 | memset(buf, 0, sizeof(*buf)); | 2373 | memset(buf, 0, sizeof(*buf)); |
2374 | 2374 | ||
2375 | current_buf->state = YY_CURRENT_BUFFER; | 2375 | current_buf->state = YY_CURRENT_BUFFER; |
2376 | zconfin = zconf_fopen(name); | 2376 | zconfin = zconf_fopen(file->name); |
2377 | if (!zconfin) { | 2377 | if (!zconfin) { |
2378 | printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name); | 2378 | printf("%s:%d: can't open file \"%s\"\n", |
2379 | zconf_curname(), zconf_lineno(), file->name); | ||
2379 | exit(1); | 2380 | exit(1); |
2380 | } | 2381 | } |
2381 | zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE)); | 2382 | zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE)); |
@@ -2422,7 +2423,7 @@ int zconf_lineno(void) | |||
2422 | return current_pos.lineno; | 2423 | return current_pos.lineno; |
2423 | } | 2424 | } |
2424 | 2425 | ||
2425 | char *zconf_curname(void) | 2426 | const char *zconf_curname(void) |
2426 | { | 2427 | { |
2427 | return current_pos.file ? current_pos.file->name : "<none>"; | 2428 | return current_pos.file ? current_pos.file->name : "<none>"; |
2428 | } | 2429 | } |
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index ce6549cdacc..febf0c94d55 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h | |||
@@ -14,6 +14,7 @@ | |||
14 | static inline const char *gettext(const char *txt) { return txt; } | 14 | static inline const char *gettext(const char *txt) { return txt; } |
15 | static inline void textdomain(const char *domainname) {} | 15 | static inline void textdomain(const char *domainname) {} |
16 | static inline void bindtextdomain(const char *name, const char *dir) {} | 16 | static inline void bindtextdomain(const char *name, const char *dir) {} |
17 | static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; } | ||
17 | #endif | 18 | #endif |
18 | 19 | ||
19 | #ifdef __cplusplus | 20 | #ifdef __cplusplus |
@@ -31,12 +32,18 @@ extern "C" { | |||
31 | 32 | ||
32 | #define SRCTREE "srctree" | 33 | #define SRCTREE "srctree" |
33 | 34 | ||
35 | #ifndef PACKAGE | ||
34 | #define PACKAGE "linux" | 36 | #define PACKAGE "linux" |
37 | #endif | ||
38 | |||
35 | #define LOCALEDIR "/usr/share/locale" | 39 | #define LOCALEDIR "/usr/share/locale" |
36 | 40 | ||
37 | #define _(text) gettext(text) | 41 | #define _(text) gettext(text) |
38 | #define N_(text) (text) | 42 | #define N_(text) (text) |
39 | 43 | ||
44 | #ifndef CONFIG_ | ||
45 | #define CONFIG_ "CONFIG_" | ||
46 | #endif | ||
40 | 47 | ||
41 | #define TF_COMMAND 0x0001 | 48 | #define TF_COMMAND 0x0001 |
42 | #define TF_PARAM 0x0002 | 49 | #define TF_PARAM 0x0002 |
@@ -61,16 +68,21 @@ struct kconf_id { | |||
61 | enum symbol_type stype; | 68 | enum symbol_type stype; |
62 | }; | 69 | }; |
63 | 70 | ||
71 | #ifdef YYDEBUG | ||
72 | extern int zconfdebug; | ||
73 | #endif | ||
74 | |||
64 | int zconfparse(void); | 75 | int zconfparse(void); |
65 | void zconfdump(FILE *out); | 76 | void zconfdump(FILE *out); |
66 | |||
67 | extern int zconfdebug; | ||
68 | void zconf_starthelp(void); | 77 | void zconf_starthelp(void); |
69 | FILE *zconf_fopen(const char *name); | 78 | FILE *zconf_fopen(const char *name); |
70 | void zconf_initscan(const char *name); | 79 | void zconf_initscan(const char *name); |
71 | void zconf_nextfile(const char *name); | 80 | void zconf_nextfile(const char *name); |
72 | int zconf_lineno(void); | 81 | int zconf_lineno(void); |
73 | char *zconf_curname(void); | 82 | const char *zconf_curname(void); |
83 | |||
84 | /* conf.c */ | ||
85 | void xfgets(char *str, int size, FILE *in); | ||
74 | 86 | ||
75 | /* confdata.c */ | 87 | /* confdata.c */ |
76 | const char *conf_get_configname(void); | 88 | const char *conf_get_configname(void); |
@@ -80,6 +92,13 @@ void sym_set_change_count(int count); | |||
80 | void sym_add_change_count(int count); | 92 | void sym_add_change_count(int count); |
81 | void conf_set_all_new_symbols(enum conf_def_mode mode); | 93 | void conf_set_all_new_symbols(enum conf_def_mode mode); |
82 | 94 | ||
95 | /* confdata.c and expr.c */ | ||
96 | static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out) | ||
97 | { | ||
98 | if (fwrite(str, len, count, out) < count) | ||
99 | fprintf(stderr, "\nError in writing or end of file.\n"); | ||
100 | } | ||
101 | |||
83 | /* kconfig_load.c */ | 102 | /* kconfig_load.c */ |
84 | void kconfig_load(void); | 103 | void kconfig_load(void); |
85 | 104 | ||
@@ -91,6 +110,7 @@ void menu_end_menu(void); | |||
91 | void menu_add_entry(struct symbol *sym); | 110 | void menu_add_entry(struct symbol *sym); |
92 | void menu_end_entry(void); | 111 | void menu_end_entry(void); |
93 | void menu_add_dep(struct expr *dep); | 112 | void menu_add_dep(struct expr *dep); |
113 | void menu_add_visibility(struct expr *dep); | ||
94 | struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep); | 114 | struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep); |
95 | struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep); | 115 | struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep); |
96 | void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep); | 116 | void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep); |
@@ -126,6 +146,8 @@ void sym_init(void); | |||
126 | void sym_clear_all_valid(void); | 146 | void sym_clear_all_valid(void); |
127 | void sym_set_all_changed(void); | 147 | void sym_set_all_changed(void); |
128 | void sym_set_changed(struct symbol *sym); | 148 | void sym_set_changed(struct symbol *sym); |
149 | struct symbol *sym_choice_default(struct symbol *sym); | ||
150 | const char *sym_get_string_default(struct symbol *sym); | ||
129 | struct symbol *sym_check_deps(struct symbol *sym); | 151 | struct symbol *sym_check_deps(struct symbol *sym); |
130 | struct property *prop_alloc(enum prop_type type, struct symbol *sym); | 152 | struct property *prop_alloc(enum prop_type type, struct symbol *sym); |
131 | struct symbol *prop_get_symbol(struct property *prop); | 153 | struct symbol *prop_get_symbol(struct property *prop); |
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index 7cadcad8233..17342fef38b 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h | |||
@@ -1,12 +1,15 @@ | |||
1 | #include <stdarg.h> | ||
1 | 2 | ||
2 | /* confdata.c */ | 3 | /* confdata.c */ |
3 | P(conf_parse,void,(const char *name)); | 4 | P(conf_parse,void,(const char *name)); |
4 | P(conf_read,int,(const char *name)); | 5 | P(conf_read,int,(const char *name)); |
5 | P(conf_read_simple,int,(const char *name, int)); | 6 | P(conf_read_simple,int,(const char *name, int)); |
7 | P(conf_write_defconfig,int,(const char *name)); | ||
6 | P(conf_write,int,(const char *name)); | 8 | P(conf_write,int,(const char *name)); |
7 | P(conf_write_autoconf,int,(void)); | 9 | P(conf_write_autoconf,int,(void)); |
8 | P(conf_get_changed,bool,(void)); | 10 | P(conf_get_changed,bool,(void)); |
9 | P(conf_set_changed_callback, void,(void (*fn)(void))); | 11 | P(conf_set_changed_callback, void,(void (*fn)(void))); |
12 | P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap))); | ||
10 | 13 | ||
11 | /* menu.c */ | 14 | /* menu.c */ |
12 | P(rootmenu,struct menu,); | 15 | P(rootmenu,struct menu,); |
@@ -27,6 +30,7 @@ P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]); | |||
27 | 30 | ||
28 | P(sym_lookup,struct symbol *,(const char *name, int flags)); | 31 | P(sym_lookup,struct symbol *,(const char *name, int flags)); |
29 | P(sym_find,struct symbol *,(const char *name)); | 32 | P(sym_find,struct symbol *,(const char *name)); |
33 | P(sym_expand_string_value,const char *,(const char *in)); | ||
30 | P(sym_re_search,struct symbol **,(const char *pattern)); | 34 | P(sym_re_search,struct symbol **,(const char *pattern)); |
31 | P(sym_type_name,const char *,(enum symbol_type type)); | 35 | P(sym_type_name,const char *,(enum symbol_type type)); |
32 | P(sym_calc_value,void,(struct symbol *sym)); | 36 | P(sym_calc_value,void,(struct symbol *sym)); |
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh index fcef0f59d55..82cc3a85e7f 100644 --- a/scripts/kconfig/lxdialog/check-lxdialog.sh +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh | |||
@@ -23,6 +23,8 @@ ccflags() | |||
23 | echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"' | 23 | echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"' |
24 | elif [ -f /usr/include/ncurses/curses.h ]; then | 24 | elif [ -f /usr/include/ncurses/curses.h ]; then |
25 | echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"' | 25 | echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"' |
26 | elif [ -f /usr/include/ncursesw/curses.h ]; then | ||
27 | echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"' | ||
26 | elif [ -f /usr/include/ncurses.h ]; then | 28 | elif [ -f /usr/include/ncurses.h ]; then |
27 | echo '-DCURSES_LOC="<ncurses.h>"' | 29 | echo '-DCURSES_LOC="<ncurses.h>"' |
28 | else | 30 | else |
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c index bcc6f19c3a3..a2eb80fbc89 100644 --- a/scripts/kconfig/lxdialog/checklist.c +++ b/scripts/kconfig/lxdialog/checklist.c | |||
@@ -31,6 +31,10 @@ static int list_width, check_x, item_x; | |||
31 | static void print_item(WINDOW * win, int choice, int selected) | 31 | static void print_item(WINDOW * win, int choice, int selected) |
32 | { | 32 | { |
33 | int i; | 33 | int i; |
34 | char *list_item = malloc(list_width + 1); | ||
35 | |||
36 | strncpy(list_item, item_str(), list_width - item_x); | ||
37 | list_item[list_width - item_x] = '\0'; | ||
34 | 38 | ||
35 | /* Clear 'residue' of last item */ | 39 | /* Clear 'residue' of last item */ |
36 | wattrset(win, dlg.menubox.atr); | 40 | wattrset(win, dlg.menubox.atr); |
@@ -45,13 +49,14 @@ static void print_item(WINDOW * win, int choice, int selected) | |||
45 | wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' '); | 49 | wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' '); |
46 | 50 | ||
47 | wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr); | 51 | wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr); |
48 | mvwaddch(win, choice, item_x, item_str()[0]); | 52 | mvwaddch(win, choice, item_x, list_item[0]); |
49 | wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr); | 53 | wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr); |
50 | waddstr(win, (char *)item_str() + 1); | 54 | waddstr(win, list_item + 1); |
51 | if (selected) { | 55 | if (selected) { |
52 | wmove(win, choice, check_x + 1); | 56 | wmove(win, choice, check_x + 1); |
53 | wrefresh(win); | 57 | wrefresh(win); |
54 | } | 58 | } |
59 | free(list_item); | ||
55 | } | 60 | } |
56 | 61 | ||
57 | /* | 62 | /* |
@@ -175,6 +180,7 @@ do_resize: | |||
175 | check_x = 0; | 180 | check_x = 0; |
176 | item_foreach() | 181 | item_foreach() |
177 | check_x = MAX(check_x, strlen(item_str()) + 4); | 182 | check_x = MAX(check_x, strlen(item_str()) + 4); |
183 | check_x = MIN(check_x, list_width); | ||
178 | 184 | ||
179 | check_x = (list_width - check_x) / 2; | 185 | check_x = (list_width - check_x) / 2; |
180 | item_x = check_x + 4; | 186 | item_x = check_x + 4; |
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 2c83d3234d3..d433c7a2474 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -25,11 +25,9 @@ | |||
25 | static const char mconf_readme[] = N_( | 25 | static const char mconf_readme[] = N_( |
26 | "Overview\n" | 26 | "Overview\n" |
27 | "--------\n" | 27 | "--------\n" |
28 | "Some kernel features may be built directly into the kernel.\n" | 28 | "This interface let you select features and parameters for the build.\n" |
29 | "Some may be made into loadable runtime modules. Some features\n" | 29 | "Features can either be built-in, modularized, or ignored. Parameters\n" |
30 | "may be completely removed altogether. There are also certain\n" | 30 | "must be entered in as decimal or hexadecimal numbers or text.\n" |
31 | "kernel parameters which are not really features, but must be\n" | ||
32 | "entered in as decimal or hexadecimal numbers or possibly text.\n" | ||
33 | "\n" | 31 | "\n" |
34 | "Menu items beginning with following braces represent features that\n" | 32 | "Menu items beginning with following braces represent features that\n" |
35 | " [ ] can be built in or removed\n" | 33 | " [ ] can be built in or removed\n" |
@@ -74,7 +72,7 @@ static const char mconf_readme[] = N_( | |||
74 | "\n" | 72 | "\n" |
75 | " Shortcut: Press <H> or <?>.\n" | 73 | " Shortcut: Press <H> or <?>.\n" |
76 | "\n" | 74 | "\n" |
77 | "o To show hidden options, press <Z>.\n" | 75 | "o To toggle the display of hidden options, press <Z>.\n" |
78 | "\n" | 76 | "\n" |
79 | "\n" | 77 | "\n" |
80 | "Radiolists (Choice lists)\n" | 78 | "Radiolists (Choice lists)\n" |
@@ -117,7 +115,7 @@ static const char mconf_readme[] = N_( | |||
117 | "-----------------------------\n" | 115 | "-----------------------------\n" |
118 | "Menuconfig supports the use of alternate configuration files for\n" | 116 | "Menuconfig supports the use of alternate configuration files for\n" |
119 | "those who, for various reasons, find it necessary to switch\n" | 117 | "those who, for various reasons, find it necessary to switch\n" |
120 | "between different kernel configurations.\n" | 118 | "between different configurations.\n" |
121 | "\n" | 119 | "\n" |
122 | "At the end of the main menu you will find two options. One is\n" | 120 | "At the end of the main menu you will find two options. One is\n" |
123 | "for saving the current configuration to a file of your choosing.\n" | 121 | "for saving the current configuration to a file of your choosing.\n" |
@@ -150,9 +148,9 @@ static const char mconf_readme[] = N_( | |||
150 | "\n" | 148 | "\n" |
151 | "Optional personality available\n" | 149 | "Optional personality available\n" |
152 | "------------------------------\n" | 150 | "------------------------------\n" |
153 | "If you prefer to have all of the kernel options listed in a single\n" | 151 | "If you prefer to have all of the options listed in a single menu, rather\n" |
154 | "menu, rather than the default multimenu hierarchy, run the menuconfig\n" | 152 | "than the default multimenu hierarchy, run the menuconfig with\n" |
155 | "with MENUCONFIG_MODE environment variable set to single_menu. Example:\n" | 153 | "MENUCONFIG_MODE environment variable set to single_menu. Example:\n" |
156 | "\n" | 154 | "\n" |
157 | "make MENUCONFIG_MODE=single_menu menuconfig\n" | 155 | "make MENUCONFIG_MODE=single_menu menuconfig\n" |
158 | "\n" | 156 | "\n" |
@@ -207,12 +205,12 @@ load_config_text[] = N_( | |||
207 | "last retrieved. Leave blank to abort."), | 205 | "last retrieved. Leave blank to abort."), |
208 | load_config_help[] = N_( | 206 | load_config_help[] = N_( |
209 | "\n" | 207 | "\n" |
210 | "For various reasons, one may wish to keep several different kernel\n" | 208 | "For various reasons, one may wish to keep several different\n" |
211 | "configurations available on a single machine.\n" | 209 | "configurations available on a single machine.\n" |
212 | "\n" | 210 | "\n" |
213 | "If you have saved a previous configuration in a file other than the\n" | 211 | "If you have saved a previous configuration in a file other than the\n" |
214 | "kernel's default, entering the name of the file here will allow you\n" | 212 | "default one, entering its name here will allow you to modify that\n" |
215 | "to modify that configuration.\n" | 213 | "configuration.\n" |
216 | "\n" | 214 | "\n" |
217 | "If you are uncertain, then you have probably never used alternate\n" | 215 | "If you are uncertain, then you have probably never used alternate\n" |
218 | "configuration files. You should therefore leave this blank to abort.\n"), | 216 | "configuration files. You should therefore leave this blank to abort.\n"), |
@@ -221,8 +219,8 @@ save_config_text[] = N_( | |||
221 | "as an alternate. Leave blank to abort."), | 219 | "as an alternate. Leave blank to abort."), |
222 | save_config_help[] = N_( | 220 | save_config_help[] = N_( |
223 | "\n" | 221 | "\n" |
224 | "For various reasons, one may wish to keep different kernel\n" | 222 | "For various reasons, one may wish to keep different configurations\n" |
225 | "configurations available on a single machine.\n" | 223 | "available on a single machine.\n" |
226 | "\n" | 224 | "\n" |
227 | "Entering a file name here will allow you to later retrieve, modify\n" | 225 | "Entering a file name here will allow you to later retrieve, modify\n" |
228 | "and use the current configuration as an alternate to whatever\n" | 226 | "and use the current configuration as an alternate to whatever\n" |
@@ -232,7 +230,7 @@ save_config_help[] = N_( | |||
232 | "leave this blank.\n"), | 230 | "leave this blank.\n"), |
233 | search_help[] = N_( | 231 | search_help[] = N_( |
234 | "\n" | 232 | "\n" |
235 | "Search for CONFIG_ symbols and display their relations.\n" | 233 | "Search for symbols and display their relations.\n" |
236 | "Regular expressions are allowed.\n" | 234 | "Regular expressions are allowed.\n" |
237 | "Example: search for \"^FOO\"\n" | 235 | "Example: search for \"^FOO\"\n" |
238 | "Result:\n" | 236 | "Result:\n" |
@@ -249,7 +247,7 @@ search_help[] = N_( | |||
249 | "Selected by: BAR\n" | 247 | "Selected by: BAR\n" |
250 | "-----------------------------------------------------------------\n" | 248 | "-----------------------------------------------------------------\n" |
251 | "o The line 'Prompt:' shows the text used in the menu structure for\n" | 249 | "o The line 'Prompt:' shows the text used in the menu structure for\n" |
252 | " this CONFIG_ symbol\n" | 250 | " this symbol\n" |
253 | "o The 'Defined at' line tell at what file / line number the symbol\n" | 251 | "o The 'Defined at' line tell at what file / line number the symbol\n" |
254 | " is defined\n" | 252 | " is defined\n" |
255 | "o The 'Depends on:' line tell what symbols needs to be defined for\n" | 253 | "o The 'Depends on:' line tell what symbols needs to be defined for\n" |
@@ -265,9 +263,9 @@ search_help[] = N_( | |||
265 | "Only relevant lines are shown.\n" | 263 | "Only relevant lines are shown.\n" |
266 | "\n\n" | 264 | "\n\n" |
267 | "Search examples:\n" | 265 | "Search examples:\n" |
268 | "Examples: USB => find all CONFIG_ symbols containing USB\n" | 266 | "Examples: USB => find all symbols containing USB\n" |
269 | " ^USB => find all CONFIG_ symbols starting with USB\n" | 267 | " ^USB => find all symbols starting with USB\n" |
270 | " USB$ => find all CONFIG_ symbols ending with USB\n" | 268 | " USB$ => find all symbols ending with USB\n" |
271 | "\n"); | 269 | "\n"); |
272 | 270 | ||
273 | static int indent; | 271 | static int indent; |
@@ -290,13 +288,9 @@ static void set_config_filename(const char *config_filename) | |||
290 | { | 288 | { |
291 | static char menu_backtitle[PATH_MAX+128]; | 289 | static char menu_backtitle[PATH_MAX+128]; |
292 | int size; | 290 | int size; |
293 | struct symbol *sym; | ||
294 | 291 | ||
295 | sym = sym_lookup("KERNELVERSION", 0); | ||
296 | sym_calc_value(sym); | ||
297 | size = snprintf(menu_backtitle, sizeof(menu_backtitle), | 292 | size = snprintf(menu_backtitle, sizeof(menu_backtitle), |
298 | _("%s - Linux Kernel v%s Configuration"), | 293 | "%s - %s", config_filename, rootmenu.prompt->text); |
299 | config_filename, sym_get_string_value(sym)); | ||
300 | if (size >= sizeof(menu_backtitle)) | 294 | if (size >= sizeof(menu_backtitle)) |
301 | menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; | 295 | menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; |
302 | set_dialog_backtitle(menu_backtitle); | 296 | set_dialog_backtitle(menu_backtitle); |
@@ -316,8 +310,8 @@ static void search_conf(void) | |||
316 | again: | 310 | again: |
317 | dialog_clear(); | 311 | dialog_clear(); |
318 | dres = dialog_inputbox(_("Search Configuration Parameter"), | 312 | dres = dialog_inputbox(_("Search Configuration Parameter"), |
319 | _("Enter CONFIG_ (sub)string to search for " | 313 | _("Enter " CONFIG_ " (sub)string to search for " |
320 | "(with or without \"CONFIG\")"), | 314 | "(with or without \"" CONFIG_ "\")"), |
321 | 10, 75, ""); | 315 | 10, 75, ""); |
322 | switch (dres) { | 316 | switch (dres) { |
323 | case 0: | 317 | case 0: |
@@ -329,10 +323,10 @@ again: | |||
329 | return; | 323 | return; |
330 | } | 324 | } |
331 | 325 | ||
332 | /* strip CONFIG_ if necessary */ | 326 | /* strip the prefix if necessary */ |
333 | dialog_input = dialog_input_result; | 327 | dialog_input = dialog_input_result; |
334 | if (strncasecmp(dialog_input_result, "CONFIG_", 7) == 0) | 328 | if (strncasecmp(dialog_input_result, CONFIG_, strlen(CONFIG_)) == 0) |
335 | dialog_input += 7; | 329 | dialog_input += strlen(CONFIG_); |
336 | 330 | ||
337 | sym_arr = sym_re_search(dialog_input); | 331 | sym_arr = sym_re_search(dialog_input); |
338 | res = get_relations_str(sym_arr); | 332 | res = get_relations_str(sym_arr); |
@@ -834,7 +828,7 @@ int main(int ac, char **av) | |||
834 | if (conf_get_changed()) | 828 | if (conf_get_changed()) |
835 | res = dialog_yesno(NULL, | 829 | res = dialog_yesno(NULL, |
836 | _("Do you wish to save your " | 830 | _("Do you wish to save your " |
837 | "new kernel configuration?\n" | 831 | "new configuration?\n" |
838 | "<ESC><ESC> to continue."), | 832 | "<ESC><ESC> to continue."), |
839 | 6, 60); | 833 | 6, 60); |
840 | else | 834 | else |
@@ -846,20 +840,20 @@ int main(int ac, char **av) | |||
846 | case 0: | 840 | case 0: |
847 | if (conf_write(filename)) { | 841 | if (conf_write(filename)) { |
848 | fprintf(stderr, _("\n\n" | 842 | fprintf(stderr, _("\n\n" |
849 | "Error during writing of the kernel configuration.\n" | 843 | "Error while writing of the configuration.\n" |
850 | "Your kernel configuration changes were NOT saved." | 844 | "Your configuration changes were NOT saved." |
851 | "\n\n")); | 845 | "\n\n")); |
852 | return 1; | 846 | return 1; |
853 | } | 847 | } |
854 | case -1: | 848 | case -1: |
855 | printf(_("\n\n" | 849 | printf(_("\n\n" |
856 | "*** End of Linux kernel configuration.\n" | 850 | "*** End of the configuration.\n" |
857 | "*** Execute 'make' to build the kernel or try 'make help'." | 851 | "*** Execute 'make' to start the build or try 'make help'." |
858 | "\n\n")); | 852 | "\n\n")); |
859 | break; | 853 | break; |
860 | default: | 854 | default: |
861 | fprintf(stderr, _("\n\n" | 855 | fprintf(stderr, _("\n\n" |
862 | "Your kernel configuration changes were NOT saved." | 856 | "Your configuration changes were NOT saved." |
863 | "\n\n")); | 857 | "\n\n")); |
864 | } | 858 | } |
865 | 859 | ||
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 203632cc30b..5fdf10dc1d8 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include "lkc.h" | 10 | #include "lkc.h" |
11 | 11 | ||
12 | static const char nohelp_text[] = N_( | 12 | static const char nohelp_text[] = N_( |
13 | "There is no help available for this kernel option.\n"); | 13 | "There is no help available for this option.\n"); |
14 | 14 | ||
15 | struct menu rootmenu; | 15 | struct menu rootmenu; |
16 | static struct menu **last_entry_ptr; | 16 | static struct menu **last_entry_ptr; |
@@ -58,6 +58,8 @@ void menu_add_entry(struct symbol *sym) | |||
58 | *last_entry_ptr = menu; | 58 | *last_entry_ptr = menu; |
59 | last_entry_ptr = &menu->next; | 59 | last_entry_ptr = &menu->next; |
60 | current_entry = menu; | 60 | current_entry = menu; |
61 | if (sym) | ||
62 | menu_add_symbol(P_SYMBOL, sym, NULL); | ||
61 | } | 63 | } |
62 | 64 | ||
63 | void menu_end_entry(void) | 65 | void menu_end_entry(void) |
@@ -136,8 +138,22 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e | |||
136 | while (isspace(*prompt)) | 138 | while (isspace(*prompt)) |
137 | prompt++; | 139 | prompt++; |
138 | } | 140 | } |
139 | if (current_entry->prompt) | 141 | if (current_entry->prompt && current_entry != &rootmenu) |
140 | prop_warn(prop, "prompt redefined"); | 142 | prop_warn(prop, "prompt redefined"); |
143 | |||
144 | /* Apply all upper menus' visibilities to actual prompts. */ | ||
145 | if(type == P_PROMPT) { | ||
146 | struct menu *menu = current_entry; | ||
147 | |||
148 | while ((menu = menu->parent) != NULL) { | ||
149 | if (!menu->visibility) | ||
150 | continue; | ||
151 | prop->visible.expr | ||
152 | = expr_alloc_and(prop->visible.expr, | ||
153 | menu->visibility); | ||
154 | } | ||
155 | } | ||
156 | |||
141 | current_entry->prompt = prop; | 157 | current_entry->prompt = prop; |
142 | } | 158 | } |
143 | prop->text = prompt; | 159 | prop->text = prompt; |
@@ -150,6 +166,12 @@ struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr | |||
150 | return menu_add_prop(type, prompt, NULL, dep); | 166 | return menu_add_prop(type, prompt, NULL, dep); |
151 | } | 167 | } |
152 | 168 | ||
169 | void menu_add_visibility(struct expr *expr) | ||
170 | { | ||
171 | current_entry->visibility = expr_alloc_and(current_entry->visibility, | ||
172 | expr); | ||
173 | } | ||
174 | |||
153 | void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep) | 175 | void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep) |
154 | { | 176 | { |
155 | menu_add_prop(type, NULL, expr, dep); | 177 | menu_add_prop(type, NULL, expr, dep); |
@@ -181,7 +203,7 @@ void menu_add_option(int token, char *arg) | |||
181 | } | 203 | } |
182 | } | 204 | } |
183 | 205 | ||
184 | static int menu_range_valid_sym(struct symbol *sym, struct symbol *sym2) | 206 | static int menu_validate_number(struct symbol *sym, struct symbol *sym2) |
185 | { | 207 | { |
186 | return sym2->type == S_INT || sym2->type == S_HEX || | 208 | return sym2->type == S_INT || sym2->type == S_HEX || |
187 | (sym2->type == S_UNKNOWN && sym_string_valid(sym, sym2->name)); | 209 | (sym2->type == S_UNKNOWN && sym_string_valid(sym, sym2->name)); |
@@ -199,6 +221,15 @@ static void sym_check_prop(struct symbol *sym) | |||
199 | prop_warn(prop, | 221 | prop_warn(prop, |
200 | "default for config symbol '%s'" | 222 | "default for config symbol '%s'" |
201 | " must be a single symbol", sym->name); | 223 | " must be a single symbol", sym->name); |
224 | if (prop->expr->type != E_SYMBOL) | ||
225 | break; | ||
226 | sym2 = prop_get_symbol(prop); | ||
227 | if (sym->type == S_HEX || sym->type == S_INT) { | ||
228 | if (!menu_validate_number(sym, sym2)) | ||
229 | prop_warn(prop, | ||
230 | "'%s': number is invalid", | ||
231 | sym->name); | ||
232 | } | ||
202 | break; | 233 | break; |
203 | case P_SELECT: | 234 | case P_SELECT: |
204 | sym2 = prop_get_symbol(prop); | 235 | sym2 = prop_get_symbol(prop); |
@@ -218,8 +249,8 @@ static void sym_check_prop(struct symbol *sym) | |||
218 | if (sym->type != S_INT && sym->type != S_HEX) | 249 | if (sym->type != S_INT && sym->type != S_HEX) |
219 | prop_warn(prop, "range is only allowed " | 250 | prop_warn(prop, "range is only allowed " |
220 | "for int or hex symbols"); | 251 | "for int or hex symbols"); |
221 | if (!menu_range_valid_sym(sym, prop->expr->left.sym) || | 252 | if (!menu_validate_number(sym, prop->expr->left.sym) || |
222 | !menu_range_valid_sym(sym, prop->expr->right.sym)) | 253 | !menu_validate_number(sym, prop->expr->right.sym)) |
223 | prop_warn(prop, "range is invalid"); | 254 | prop_warn(prop, "range is invalid"); |
224 | break; | 255 | break; |
225 | default: | 256 | default: |
@@ -318,6 +349,8 @@ void menu_finalize(struct menu *parent) | |||
318 | parent->next = last_menu->next; | 349 | parent->next = last_menu->next; |
319 | last_menu->next = NULL; | 350 | last_menu->next = NULL; |
320 | } | 351 | } |
352 | |||
353 | sym->dir_dep.expr = parent->dep; | ||
321 | } | 354 | } |
322 | for (menu = parent->list; menu; menu = menu->next) { | 355 | for (menu = parent->list; menu; menu = menu->next) { |
323 | if (sym && sym_is_choice(sym) && | 356 | if (sym && sym_is_choice(sym) && |
@@ -406,6 +439,11 @@ bool menu_is_visible(struct menu *menu) | |||
406 | if (!menu->prompt) | 439 | if (!menu->prompt) |
407 | return false; | 440 | return false; |
408 | 441 | ||
442 | if (menu->visibility) { | ||
443 | if (expr_calc_value(menu->visibility) == no) | ||
444 | return no; | ||
445 | } | ||
446 | |||
409 | sym = menu->sym; | 447 | sym = menu->sym; |
410 | if (sym) { | 448 | if (sym) { |
411 | sym_calc_value(sym); | 449 | sym_calc_value(sym); |
@@ -419,9 +457,13 @@ bool menu_is_visible(struct menu *menu) | |||
419 | if (!sym || sym_get_tristate_value(menu->sym) == no) | 457 | if (!sym || sym_get_tristate_value(menu->sym) == no) |
420 | return false; | 458 | return false; |
421 | 459 | ||
422 | for (child = menu->list; child; child = child->next) | 460 | for (child = menu->list; child; child = child->next) { |
423 | if (menu_is_visible(child)) | 461 | if (menu_is_visible(child)) { |
462 | if (sym) | ||
463 | sym->flags |= SYMBOL_DEF_USER; | ||
424 | return true; | 464 | return true; |
465 | } | ||
466 | } | ||
425 | 467 | ||
426 | return false; | 468 | return false; |
427 | } | 469 | } |
@@ -501,9 +543,19 @@ void get_symbol_str(struct gstr *r, struct symbol *sym) | |||
501 | bool hit; | 543 | bool hit; |
502 | struct property *prop; | 544 | struct property *prop; |
503 | 545 | ||
504 | if (sym && sym->name) | 546 | if (sym && sym->name) { |
505 | str_printf(r, "Symbol: %s [=%s]\n", sym->name, | 547 | str_printf(r, "Symbol: %s [=%s]\n", sym->name, |
506 | sym_get_string_value(sym)); | 548 | sym_get_string_value(sym)); |
549 | str_printf(r, "Type : %s\n", sym_type_name(sym->type)); | ||
550 | if (sym->type == S_INT || sym->type == S_HEX) { | ||
551 | prop = sym_get_range_prop(sym); | ||
552 | if (prop) { | ||
553 | str_printf(r, "Range : "); | ||
554 | expr_gstr_print(prop->expr, r); | ||
555 | str_append(r, "\n"); | ||
556 | } | ||
557 | } | ||
558 | } | ||
507 | for_all_prompts(sym, prop) | 559 | for_all_prompts(sym, prop) |
508 | get_prompt_str(r, prop); | 560 | get_prompt_str(r, prop); |
509 | hit = false; | 561 | hit = false; |
@@ -545,7 +597,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) | |||
545 | 597 | ||
546 | if (menu_has_help(menu)) { | 598 | if (menu_has_help(menu)) { |
547 | if (sym->name) { | 599 | if (sym->name) { |
548 | str_printf(help, "CONFIG_%s:\n\n", sym->name); | 600 | str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); |
549 | str_append(help, _(menu_get_help(menu))); | 601 | str_append(help, _(menu_get_help(menu))); |
550 | str_append(help, "\n"); | 602 | str_append(help, "\n"); |
551 | } | 603 | } |
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index 762caf80ce3..db56377393d 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c | |||
@@ -5,25 +5,26 @@ | |||
5 | * Derived from menuconfig. | 5 | * Derived from menuconfig. |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | #define _GNU_SOURCE | ||
9 | #include <string.h> | ||
8 | #define LKC_DIRECT_LINK | 10 | #define LKC_DIRECT_LINK |
9 | #include "lkc.h" | 11 | #include "lkc.h" |
10 | #include "nconf.h" | 12 | #include "nconf.h" |
13 | #include <ctype.h> | ||
11 | 14 | ||
12 | static const char nconf_readme[] = N_( | 15 | static const char nconf_readme[] = N_( |
13 | "Overview\n" | 16 | "Overview\n" |
14 | "--------\n" | 17 | "--------\n" |
15 | "Some kernel features may be built directly into the kernel.\n" | 18 | "This interface let you select features and parameters for the build.\n" |
16 | "Some may be made into loadable runtime modules. Some features\n" | 19 | "Features can either be built-in, modularized, or ignored. Parameters\n" |
17 | "may be completely removed altogether. There are also certain\n" | 20 | "must be entered in as decimal or hexadecimal numbers or text.\n" |
18 | "kernel parameters which are not really features, but must be\n" | ||
19 | "entered in as decimal or hexadecimal numbers or possibly text.\n" | ||
20 | "\n" | 21 | "\n" |
21 | "Menu items beginning with following braces represent features that\n" | 22 | "Menu items beginning with following braces represent features that\n" |
22 | " [ ] can be built in or removed\n" | 23 | " [ ] can be built in or removed\n" |
23 | " < > can be built in, modularized or removed\n" | 24 | " < > can be built in, modularized or removed\n" |
24 | " { } can be built in or modularized (selected by other feature)\n" | 25 | " { } can be built in or modularized (selected by other feature)\n" |
25 | " - - are selected by other feature,\n" | 26 | " - - are selected by other feature,\n" |
26 | " XXX cannot be selected. use Symbol Info to find out why,\n" | 27 | " XXX cannot be selected. Use Symbol Info to find out why,\n" |
27 | "while *, M or whitespace inside braces means to build in, build as\n" | 28 | "while *, M or whitespace inside braces means to build in, build as\n" |
28 | "a module or to exclude the feature respectively.\n" | 29 | "a module or to exclude the feature respectively.\n" |
29 | "\n" | 30 | "\n" |
@@ -41,9 +42,13 @@ static const char nconf_readme[] = N_( | |||
41 | " pressing <Enter> of <right-arrow>. Use <Esc> or <left-arrow> to go back.\n" | 42 | " pressing <Enter> of <right-arrow>. Use <Esc> or <left-arrow> to go back.\n" |
42 | " Submenus are designated by \"--->\".\n" | 43 | " Submenus are designated by \"--->\".\n" |
43 | "\n" | 44 | "\n" |
44 | " Shortcut: Press the option's highlighted letter (hotkey).\n" | 45 | " Searching: pressing '/' triggers interactive search mode.\n" |
45 | " Pressing a hotkey more than once will sequence\n" | 46 | " nconfig performs a case insensitive search for the string\n" |
46 | " through all visible items which use that hotkey.\n" | 47 | " in the menu prompts (no regex support).\n" |
48 | " Pressing the up/down keys highlights the previous/next\n" | ||
49 | " matching item. Backspace removes one character from the\n" | ||
50 | " match string. Pressing either '/' again or ESC exits\n" | ||
51 | " search mode. All other keys behave normally.\n" | ||
47 | "\n" | 52 | "\n" |
48 | " You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n" | 53 | " You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n" |
49 | " unseen options into view.\n" | 54 | " unseen options into view.\n" |
@@ -88,7 +93,7 @@ static const char nconf_readme[] = N_( | |||
88 | "-----------------------------\n" | 93 | "-----------------------------\n" |
89 | "nconfig supports the use of alternate configuration files for\n" | 94 | "nconfig supports the use of alternate configuration files for\n" |
90 | "those who, for various reasons, find it necessary to switch\n" | 95 | "those who, for various reasons, find it necessary to switch\n" |
91 | "between different kernel configurations.\n" | 96 | "between different configurations.\n" |
92 | "\n" | 97 | "\n" |
93 | "At the end of the main menu you will find two options. One is\n" | 98 | "At the end of the main menu you will find two options. One is\n" |
94 | "for saving the current configuration to a file of your choosing.\n" | 99 | "for saving the current configuration to a file of your choosing.\n" |
@@ -121,9 +126,9 @@ static const char nconf_readme[] = N_( | |||
121 | "\n" | 126 | "\n" |
122 | "Optional personality available\n" | 127 | "Optional personality available\n" |
123 | "------------------------------\n" | 128 | "------------------------------\n" |
124 | "If you prefer to have all of the kernel options listed in a single\n" | 129 | "If you prefer to have all of the options listed in a single menu, rather\n" |
125 | "menu, rather than the default multimenu hierarchy, run the nconfig\n" | 130 | "than the default multimenu hierarchy, run the nconfig with NCONFIG_MODE\n" |
126 | "with NCONFIG_MODE environment variable set to single_menu. Example:\n" | 131 | "environment variable set to single_menu. Example:\n" |
127 | "\n" | 132 | "\n" |
128 | "make NCONFIG_MODE=single_menu nconfig\n" | 133 | "make NCONFIG_MODE=single_menu nconfig\n" |
129 | "\n" | 134 | "\n" |
@@ -141,21 +146,21 @@ menu_no_f_instructions[] = N_( | |||
141 | " <Enter> or <right-arrow> selects submenus --->.\n" | 146 | " <Enter> or <right-arrow> selects submenus --->.\n" |
142 | " Capital Letters are hotkeys.\n" | 147 | " Capital Letters are hotkeys.\n" |
143 | " Pressing <Y> includes, <N> excludes, <M> modularizes features.\n" | 148 | " Pressing <Y> includes, <N> excludes, <M> modularizes features.\n" |
144 | " Pressing SpaceBar toggles between the above options\n" | 149 | " Pressing SpaceBar toggles between the above options.\n" |
145 | " Press <Esc> or <left-arrow> to go back one menu, \n" | 150 | " Press <Esc> or <left-arrow> to go back one menu,\n" |
146 | " <?> or <h> for Help, </> for Search.\n" | 151 | " <?> or <h> for Help, </> for Search.\n" |
147 | " <1> is interchangable with <F1>, <2> with <F2>, etc.\n" | 152 | " <1> is interchangeable with <F1>, <2> with <F2>, etc.\n" |
148 | " Legend: [*] built-in [ ] excluded <M> module < > module capable.\n" | 153 | " Legend: [*] built-in [ ] excluded <M> module < > module capable.\n" |
149 | " <Esc> always leaves the current window\n"), | 154 | " <Esc> always leaves the current window.\n"), |
150 | menu_instructions[] = N_( | 155 | menu_instructions[] = N_( |
151 | " Arrow keys navigate the menu.\n" | 156 | " Arrow keys navigate the menu.\n" |
152 | " <Enter> or <right-arrow> selects submenus --->.\n" | 157 | " <Enter> or <right-arrow> selects submenus --->.\n" |
153 | " Capital Letters are hotkeys.\n" | 158 | " Capital Letters are hotkeys.\n" |
154 | " Pressing <Y> includes, <N> excludes, <M> modularizes features.\n" | 159 | " Pressing <Y> includes, <N> excludes, <M> modularizes features.\n" |
155 | " Pressing SpaceBar toggles between the above options\n" | 160 | " Pressing SpaceBar toggles between the above options\n" |
156 | " Press <Esc>, <F3> or <left-arrow> to go back one menu, \n" | 161 | " Press <Esc>, <F5> or <left-arrow> to go back one menu,\n" |
157 | " <?>, <F1> or <h> for Help, </> for Search.\n" | 162 | " <?>, <F1> or <h> for Help, </> for Search.\n" |
158 | " <1> is interchangable with <F1>, <2> with <F2>, etc.\n" | 163 | " <1> is interchangeable with <F1>, <2> with <F2>, etc.\n" |
159 | " Legend: [*] built-in [ ] excluded <M> module < > module capable.\n" | 164 | " Legend: [*] built-in [ ] excluded <M> module < > module capable.\n" |
160 | " <Esc> always leaves the current window\n"), | 165 | " <Esc> always leaves the current window\n"), |
161 | radiolist_instructions[] = N_( | 166 | radiolist_instructions[] = N_( |
@@ -178,19 +183,19 @@ setmod_text[] = N_( | |||
178 | "has been configured as a module.\n" | 183 | "has been configured as a module.\n" |
179 | "As a result, this feature will be built as a module."), | 184 | "As a result, this feature will be built as a module."), |
180 | nohelp_text[] = N_( | 185 | nohelp_text[] = N_( |
181 | "There is no help available for this kernel option.\n"), | 186 | "There is no help available for this option.\n"), |
182 | load_config_text[] = N_( | 187 | load_config_text[] = N_( |
183 | "Enter the name of the configuration file you wish to load.\n" | 188 | "Enter the name of the configuration file you wish to load.\n" |
184 | "Accept the name shown to restore the configuration you\n" | 189 | "Accept the name shown to restore the configuration you\n" |
185 | "last retrieved. Leave blank to abort."), | 190 | "last retrieved. Leave blank to abort."), |
186 | load_config_help[] = N_( | 191 | load_config_help[] = N_( |
187 | "\n" | 192 | "\n" |
188 | "For various reasons, one may wish to keep several different kernel\n" | 193 | "For various reasons, one may wish to keep several different\n" |
189 | "configurations available on a single machine.\n" | 194 | "configurations available on a single machine.\n" |
190 | "\n" | 195 | "\n" |
191 | "If you have saved a previous configuration in a file other than the\n" | 196 | "If you have saved a previous configuration in a file other than the\n" |
192 | "kernel's default, entering the name of the file here will allow you\n" | 197 | "default one, entering its name here will allow you to modify that\n" |
193 | "to modify that configuration.\n" | 198 | "configuration.\n" |
194 | "\n" | 199 | "\n" |
195 | "If you are uncertain, then you have probably never used alternate\n" | 200 | "If you are uncertain, then you have probably never used alternate\n" |
196 | "configuration files. You should therefor leave this blank to abort.\n"), | 201 | "configuration files. You should therefor leave this blank to abort.\n"), |
@@ -199,8 +204,8 @@ save_config_text[] = N_( | |||
199 | "as an alternate. Leave blank to abort."), | 204 | "as an alternate. Leave blank to abort."), |
200 | save_config_help[] = N_( | 205 | save_config_help[] = N_( |
201 | "\n" | 206 | "\n" |
202 | "For various reasons, one may wish to keep different kernel\n" | 207 | "For various reasons, one may wish to keep different configurations\n" |
203 | "configurations available on a single machine.\n" | 208 | "available on a single machine.\n" |
204 | "\n" | 209 | "\n" |
205 | "Entering a file name here will allow you to later retrieve, modify\n" | 210 | "Entering a file name here will allow you to later retrieve, modify\n" |
206 | "and use the current configuration as an alternate to whatever\n" | 211 | "and use the current configuration as an alternate to whatever\n" |
@@ -210,8 +215,8 @@ save_config_help[] = N_( | |||
210 | "leave this blank.\n"), | 215 | "leave this blank.\n"), |
211 | search_help[] = N_( | 216 | search_help[] = N_( |
212 | "\n" | 217 | "\n" |
213 | "Search for CONFIG_ symbols and display their relations.\n" | 218 | "Search for symbols and display their relations. Regular expressions\n" |
214 | "Regular expressions are allowed.\n" | 219 | "are allowed.\n" |
215 | "Example: search for \"^FOO\"\n" | 220 | "Example: search for \"^FOO\"\n" |
216 | "Result:\n" | 221 | "Result:\n" |
217 | "-----------------------------------------------------------------\n" | 222 | "-----------------------------------------------------------------\n" |
@@ -227,7 +232,7 @@ search_help[] = N_( | |||
227 | "Selected by: BAR\n" | 232 | "Selected by: BAR\n" |
228 | "-----------------------------------------------------------------\n" | 233 | "-----------------------------------------------------------------\n" |
229 | "o The line 'Prompt:' shows the text used in the menu structure for\n" | 234 | "o The line 'Prompt:' shows the text used in the menu structure for\n" |
230 | " this CONFIG_ symbol\n" | 235 | " this symbol\n" |
231 | "o The 'Defined at' line tell at what file / line number the symbol\n" | 236 | "o The 'Defined at' line tell at what file / line number the symbol\n" |
232 | " is defined\n" | 237 | " is defined\n" |
233 | "o The 'Depends on:' line tell what symbols needs to be defined for\n" | 238 | "o The 'Depends on:' line tell what symbols needs to be defined for\n" |
@@ -243,16 +248,15 @@ search_help[] = N_( | |||
243 | "Only relevant lines are shown.\n" | 248 | "Only relevant lines are shown.\n" |
244 | "\n\n" | 249 | "\n\n" |
245 | "Search examples:\n" | 250 | "Search examples:\n" |
246 | "Examples: USB = > find all CONFIG_ symbols containing USB\n" | 251 | "Examples: USB => find all symbols containing USB\n" |
247 | " ^USB => find all CONFIG_ symbols starting with USB\n" | 252 | " ^USB => find all symbols starting with USB\n" |
248 | " USB$ => find all CONFIG_ symbols ending with USB\n" | 253 | " USB$ => find all symbols ending with USB\n" |
249 | "\n"); | 254 | "\n"); |
250 | 255 | ||
251 | struct mitem { | 256 | struct mitem { |
252 | char str[256]; | 257 | char str[256]; |
253 | char tag; | 258 | char tag; |
254 | void *usrptr; | 259 | void *usrptr; |
255 | int is_hot; | ||
256 | int is_visible; | 260 | int is_visible; |
257 | }; | 261 | }; |
258 | 262 | ||
@@ -275,14 +279,6 @@ static int items_num; | |||
275 | static int global_exit; | 279 | static int global_exit; |
276 | /* the currently selected button */ | 280 | /* the currently selected button */ |
277 | const char *current_instructions = menu_instructions; | 281 | const char *current_instructions = menu_instructions; |
278 | /* this array is used to implement hot keys. it is updated in item_make and | ||
279 | * resetted in clean_items. It would be better to use a hash, but lets keep it | ||
280 | * simple... */ | ||
281 | #define MAX_SAME_KEY MAX_MENU_ITEMS | ||
282 | struct { | ||
283 | int count; | ||
284 | int ptrs[MAX_MENU_ITEMS]; | ||
285 | } hotkeys[1<<(sizeof(char)*8)]; | ||
286 | 282 | ||
287 | static void conf(struct menu *menu); | 283 | static void conf(struct menu *menu); |
288 | static void conf_choice(struct menu *menu); | 284 | static void conf_choice(struct menu *menu); |
@@ -292,6 +288,7 @@ static void conf_save(void); | |||
292 | static void show_help(struct menu *menu); | 288 | static void show_help(struct menu *menu); |
293 | static int do_exit(void); | 289 | static int do_exit(void); |
294 | static void setup_windows(void); | 290 | static void setup_windows(void); |
291 | static void search_conf(void); | ||
295 | 292 | ||
296 | typedef void (*function_key_handler_t)(int *key, struct menu *menu); | 293 | typedef void (*function_key_handler_t)(int *key, struct menu *menu); |
297 | static void handle_f1(int *key, struct menu *current_item); | 294 | static void handle_f1(int *key, struct menu *current_item); |
@@ -302,6 +299,7 @@ static void handle_f5(int *key, struct menu *current_item); | |||
302 | static void handle_f6(int *key, struct menu *current_item); | 299 | static void handle_f6(int *key, struct menu *current_item); |
303 | static void handle_f7(int *key, struct menu *current_item); | 300 | static void handle_f7(int *key, struct menu *current_item); |
304 | static void handle_f8(int *key, struct menu *current_item); | 301 | static void handle_f8(int *key, struct menu *current_item); |
302 | static void handle_f9(int *key, struct menu *current_item); | ||
305 | 303 | ||
306 | struct function_keys { | 304 | struct function_keys { |
307 | const char *key_str; | 305 | const char *key_str; |
@@ -310,7 +308,7 @@ struct function_keys { | |||
310 | function_key_handler_t handler; | 308 | function_key_handler_t handler; |
311 | }; | 309 | }; |
312 | 310 | ||
313 | static const int function_keys_num = 8; | 311 | static const int function_keys_num = 9; |
314 | struct function_keys function_keys[] = { | 312 | struct function_keys function_keys[] = { |
315 | { | 313 | { |
316 | .key_str = "F1", | 314 | .key_str = "F1", |
@@ -320,13 +318,13 @@ struct function_keys function_keys[] = { | |||
320 | }, | 318 | }, |
321 | { | 319 | { |
322 | .key_str = "F2", | 320 | .key_str = "F2", |
323 | .func = "Symbol Info", | 321 | .func = "Sym Info", |
324 | .key = F_SYMBOL, | 322 | .key = F_SYMBOL, |
325 | .handler = handle_f2, | 323 | .handler = handle_f2, |
326 | }, | 324 | }, |
327 | { | 325 | { |
328 | .key_str = "F3", | 326 | .key_str = "F3", |
329 | .func = "Instructions", | 327 | .func = "Insts", |
330 | .key = F_INSTS, | 328 | .key = F_INSTS, |
331 | .handler = handle_f3, | 329 | .handler = handle_f3, |
332 | }, | 330 | }, |
@@ -356,9 +354,15 @@ struct function_keys function_keys[] = { | |||
356 | }, | 354 | }, |
357 | { | 355 | { |
358 | .key_str = "F8", | 356 | .key_str = "F8", |
357 | .func = "Sym Search", | ||
358 | .key = F_SEARCH, | ||
359 | .handler = handle_f8, | ||
360 | }, | ||
361 | { | ||
362 | .key_str = "F9", | ||
359 | .func = "Exit", | 363 | .func = "Exit", |
360 | .key = F_EXIT, | 364 | .key = F_EXIT, |
361 | .handler = handle_f8, | 365 | .handler = handle_f9, |
362 | }, | 366 | }, |
363 | }; | 367 | }; |
364 | 368 | ||
@@ -444,9 +448,16 @@ static void handle_f7(int *key, struct menu *current_item) | |||
444 | return; | 448 | return; |
445 | } | 449 | } |
446 | 450 | ||
447 | /* exit */ | 451 | /* search */ |
448 | static void handle_f8(int *key, struct menu *current_item) | 452 | static void handle_f8(int *key, struct menu *current_item) |
449 | { | 453 | { |
454 | search_conf(); | ||
455 | return; | ||
456 | } | ||
457 | |||
458 | /* exit */ | ||
459 | static void handle_f9(int *key, struct menu *current_item) | ||
460 | { | ||
450 | do_exit(); | 461 | do_exit(); |
451 | return; | 462 | return; |
452 | } | 463 | } |
@@ -479,110 +490,44 @@ static void clean_items(void) | |||
479 | free_item(curses_menu_items[i]); | 490 | free_item(curses_menu_items[i]); |
480 | bzero(curses_menu_items, sizeof(curses_menu_items)); | 491 | bzero(curses_menu_items, sizeof(curses_menu_items)); |
481 | bzero(k_menu_items, sizeof(k_menu_items)); | 492 | bzero(k_menu_items, sizeof(k_menu_items)); |
482 | bzero(hotkeys, sizeof(hotkeys)); | ||
483 | items_num = 0; | 493 | items_num = 0; |
484 | } | 494 | } |
485 | 495 | ||
486 | /* return the index of the next hot item, or -1 if no such item exists */ | 496 | typedef enum {MATCH_TINKER_PATTERN_UP, MATCH_TINKER_PATTERN_DOWN, |
487 | static int get_next_hot(int c) | 497 | FIND_NEXT_MATCH_DOWN, FIND_NEXT_MATCH_UP} match_f; |
488 | { | ||
489 | static int hot_index; | ||
490 | static int hot_char; | ||
491 | |||
492 | if (c < 0 || c > 255 || hotkeys[c].count <= 0) | ||
493 | return -1; | ||
494 | |||
495 | if (hot_char == c) { | ||
496 | hot_index = (hot_index+1)%hotkeys[c].count; | ||
497 | return hotkeys[c].ptrs[hot_index]; | ||
498 | } else { | ||
499 | hot_char = c; | ||
500 | hot_index = 0; | ||
501 | return hotkeys[c].ptrs[0]; | ||
502 | } | ||
503 | } | ||
504 | |||
505 | /* can the char c be a hot key? no, if c is a common shortcut used elsewhere */ | ||
506 | static int canbhot(char c) | ||
507 | { | ||
508 | c = tolower(c); | ||
509 | return isalnum(c) && c != 'y' && c != 'm' && c != 'h' && | ||
510 | c != 'n' && c != '?'; | ||
511 | } | ||
512 | |||
513 | /* check if str already contains a hot key. */ | ||
514 | static int is_hot(int index) | ||
515 | { | ||
516 | return k_menu_items[index].is_hot; | ||
517 | } | ||
518 | 498 | ||
519 | /* find the first possible hot key, and mark it. | 499 | /* return the index of the matched item, or -1 if no such item exists */ |
520 | * index is the index of the item in the menu | 500 | static int get_mext_match(const char *match_str, match_f flag) |
521 | * return 0 on success*/ | ||
522 | static int make_hot(char *dest, int len, const char *org, int index) | ||
523 | { | 501 | { |
524 | int position = -1; | 502 | int match_start = item_index(current_item(curses_menu)); |
525 | int i; | 503 | int index; |
526 | int tmp; | 504 | |
527 | int c; | 505 | if (flag == FIND_NEXT_MATCH_DOWN) |
528 | int org_len = strlen(org); | 506 | ++match_start; |
529 | 507 | else if (flag == FIND_NEXT_MATCH_UP) | |
530 | if (org == NULL || is_hot(index)) | 508 | --match_start; |
531 | return 1; | 509 | |
532 | 510 | index = match_start; | |
533 | /* make sure not to make hot keys out of markers. | 511 | index = (index + items_num) % items_num; |
534 | * find where to start looking for a hot key | 512 | while (true) { |
535 | */ | 513 | char *str = k_menu_items[index].str; |
536 | i = 0; | 514 | if (strcasestr(str, match_str) != 0) |
537 | /* skip white space */ | 515 | return index; |
538 | while (i < org_len && org[i] == ' ') | 516 | if (flag == FIND_NEXT_MATCH_UP || |
539 | i++; | 517 | flag == MATCH_TINKER_PATTERN_UP) |
540 | if (i == org_len) | 518 | --index; |
541 | return -1; | 519 | else |
542 | /* if encountering '(' or '<' or '[', find the match and look from there | 520 | ++index; |
543 | **/ | 521 | index = (index + items_num) % items_num; |
544 | if (org[i] == '[' || org[i] == '<' || org[i] == '(') { | 522 | if (index == match_start) |
545 | i++; | 523 | return -1; |
546 | for (; i < org_len; i++) | ||
547 | if (org[i] == ']' || org[i] == '>' || org[i] == ')') | ||
548 | break; | ||
549 | } | ||
550 | if (i == org_len) | ||
551 | return -1; | ||
552 | for (; i < org_len; i++) { | ||
553 | if (canbhot(org[i]) && org[i-1] != '<' && org[i-1] != '(') { | ||
554 | position = i; | ||
555 | break; | ||
556 | } | ||
557 | } | 524 | } |
558 | if (position == -1) | ||
559 | return 1; | ||
560 | |||
561 | /* ok, char at org[position] should be a hot key to this item */ | ||
562 | c = tolower(org[position]); | ||
563 | tmp = hotkeys[c].count; | ||
564 | hotkeys[c].ptrs[tmp] = index; | ||
565 | hotkeys[c].count++; | ||
566 | /* | ||
567 | snprintf(dest, len, "%.*s(%c)%s", position, org, org[position], | ||
568 | &org[position+1]); | ||
569 | */ | ||
570 | /* make org[position] uppercase, and all leading letter small case */ | ||
571 | strncpy(dest, org, len); | ||
572 | for (i = 0; i < position; i++) | ||
573 | dest[i] = tolower(dest[i]); | ||
574 | dest[position] = toupper(dest[position]); | ||
575 | k_menu_items[index].is_hot = 1; | ||
576 | return 0; | ||
577 | } | 525 | } |
578 | 526 | ||
579 | /* Make a new item. Add a hotkey mark in the first possible letter. | 527 | /* Make a new item. */ |
580 | * As ncurses does not allow any attributes inside menue item, we mark the | ||
581 | * hot key as the first capitalized letter in the string */ | ||
582 | static void item_make(struct menu *menu, char tag, const char *fmt, ...) | 528 | static void item_make(struct menu *menu, char tag, const char *fmt, ...) |
583 | { | 529 | { |
584 | va_list ap; | 530 | va_list ap; |
585 | char tmp_str[256]; | ||
586 | 531 | ||
587 | if (items_num > MAX_MENU_ITEMS-1) | 532 | if (items_num > MAX_MENU_ITEMS-1) |
588 | return; | 533 | return; |
@@ -597,16 +542,13 @@ static void item_make(struct menu *menu, char tag, const char *fmt, ...) | |||
597 | k_menu_items[items_num].is_visible = 1; | 542 | k_menu_items[items_num].is_visible = 1; |
598 | 543 | ||
599 | va_start(ap, fmt); | 544 | va_start(ap, fmt); |
600 | vsnprintf(tmp_str, sizeof(tmp_str), fmt, ap); | 545 | vsnprintf(k_menu_items[items_num].str, |
601 | if (!k_menu_items[items_num].is_visible) | 546 | sizeof(k_menu_items[items_num].str), |
602 | memcpy(tmp_str, "XXX", 3); | 547 | fmt, ap); |
603 | va_end(ap); | 548 | va_end(ap); |
604 | if (make_hot( | 549 | |
605 | k_menu_items[items_num].str, | 550 | if (!k_menu_items[items_num].is_visible) |
606 | sizeof(k_menu_items[items_num].str), tmp_str, items_num) != 0) | 551 | memcpy(k_menu_items[items_num].str, "XXX", 3); |
607 | strncpy(k_menu_items[items_num].str, | ||
608 | tmp_str, | ||
609 | sizeof(k_menu_items[items_num].str)); | ||
610 | 552 | ||
611 | curses_menu_items[items_num] = new_item( | 553 | curses_menu_items[items_num] = new_item( |
612 | k_menu_items[items_num].str, | 554 | k_menu_items[items_num].str, |
@@ -638,11 +580,9 @@ static void item_add_str(const char *fmt, ...) | |||
638 | va_end(ap); | 580 | va_end(ap); |
639 | snprintf(tmp_str, sizeof(tmp_str), "%s%s", | 581 | snprintf(tmp_str, sizeof(tmp_str), "%s%s", |
640 | k_menu_items[index].str, new_str); | 582 | k_menu_items[index].str, new_str); |
641 | if (make_hot(k_menu_items[index].str, | 583 | strncpy(k_menu_items[index].str, |
642 | sizeof(k_menu_items[index].str), tmp_str, index) != 0) | 584 | tmp_str, |
643 | strncpy(k_menu_items[index].str, | 585 | sizeof(k_menu_items[index].str)); |
644 | tmp_str, | ||
645 | sizeof(k_menu_items[index].str)); | ||
646 | 586 | ||
647 | free_item(curses_menu_items[index]); | 587 | free_item(curses_menu_items[index]); |
648 | curses_menu_items[index] = new_item( | 588 | curses_menu_items[index] = new_item( |
@@ -676,6 +616,8 @@ static void *item_data(void) | |||
676 | struct mitem *mcur; | 616 | struct mitem *mcur; |
677 | 617 | ||
678 | cur = current_item(curses_menu); | 618 | cur = current_item(curses_menu); |
619 | if (!cur) | ||
620 | return NULL; | ||
679 | mcur = (struct mitem *) item_userptr(cur); | 621 | mcur = (struct mitem *) item_userptr(cur); |
680 | return mcur->usrptr; | 622 | return mcur->usrptr; |
681 | 623 | ||
@@ -691,13 +633,9 @@ static char menu_backtitle[PATH_MAX+128]; | |||
691 | static const char *set_config_filename(const char *config_filename) | 633 | static const char *set_config_filename(const char *config_filename) |
692 | { | 634 | { |
693 | int size; | 635 | int size; |
694 | struct symbol *sym; | ||
695 | 636 | ||
696 | sym = sym_lookup("KERNELVERSION", 0); | ||
697 | sym_calc_value(sym); | ||
698 | size = snprintf(menu_backtitle, sizeof(menu_backtitle), | 637 | size = snprintf(menu_backtitle, sizeof(menu_backtitle), |
699 | _("%s - Linux Kernel v%s Configuration"), | 638 | "%s - %s", config_filename, rootmenu.prompt->text); |
700 | config_filename, sym_get_string_value(sym)); | ||
701 | if (size >= sizeof(menu_backtitle)) | 639 | if (size >= sizeof(menu_backtitle)) |
702 | menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; | 640 | menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; |
703 | 641 | ||
@@ -707,25 +645,6 @@ static const char *set_config_filename(const char *config_filename) | |||
707 | return menu_backtitle; | 645 | return menu_backtitle; |
708 | } | 646 | } |
709 | 647 | ||
710 | /* command = 0 is supress, 1 is restore */ | ||
711 | static void supress_stdout(int command) | ||
712 | { | ||
713 | static FILE *org_stdout; | ||
714 | static FILE *org_stderr; | ||
715 | |||
716 | if (command == 0) { | ||
717 | org_stdout = stdout; | ||
718 | org_stderr = stderr; | ||
719 | stdout = fopen("/dev/null", "a"); | ||
720 | stderr = fopen("/dev/null", "a"); | ||
721 | } else { | ||
722 | fclose(stdout); | ||
723 | fclose(stderr); | ||
724 | stdout = org_stdout; | ||
725 | stderr = org_stderr; | ||
726 | } | ||
727 | } | ||
728 | |||
729 | /* return = 0 means we are successful. | 648 | /* return = 0 means we are successful. |
730 | * -1 means go on doing what you were doing | 649 | * -1 means go on doing what you were doing |
731 | */ | 650 | */ |
@@ -737,8 +656,7 @@ static int do_exit(void) | |||
737 | return 0; | 656 | return 0; |
738 | } | 657 | } |
739 | res = btn_dialog(main_window, | 658 | res = btn_dialog(main_window, |
740 | _("Do you wish to save your " | 659 | _("Do you wish to save your new configuration?\n" |
741 | "new kernel configuration?\n" | ||
742 | "<ESC> to cancel and resume nconfig."), | 660 | "<ESC> to cancel and resume nconfig."), |
743 | 2, | 661 | 2, |
744 | " <save> ", | 662 | " <save> ", |
@@ -751,36 +669,19 @@ static int do_exit(void) | |||
751 | /* if we got here, the user really wants to exit */ | 669 | /* if we got here, the user really wants to exit */ |
752 | switch (res) { | 670 | switch (res) { |
753 | case 0: | 671 | case 0: |
754 | supress_stdout(0); | ||
755 | res = conf_write(filename); | 672 | res = conf_write(filename); |
756 | supress_stdout(1); | ||
757 | if (res) | 673 | if (res) |
758 | btn_dialog( | 674 | btn_dialog( |
759 | main_window, | 675 | main_window, |
760 | _("Error during writing of the kernel " | 676 | _("Error during writing of configuration.\n" |
761 | "configuration.\n" | 677 | "Your configuration changes were NOT saved."), |
762 | "Your kernel configuration " | ||
763 | "changes were NOT saved."), | ||
764 | 1, | 678 | 1, |
765 | "<OK>"); | 679 | "<OK>"); |
766 | else { | ||
767 | char buf[1024]; | ||
768 | snprintf(buf, 1024, | ||
769 | _("Configuration written to %s\n" | ||
770 | "End of Linux kernel configuration.\n" | ||
771 | "Execute 'make' to build the kernel or try" | ||
772 | " 'make help'."), filename); | ||
773 | btn_dialog( | ||
774 | main_window, | ||
775 | buf, | ||
776 | 1, | ||
777 | "<OK>"); | ||
778 | } | ||
779 | break; | 680 | break; |
780 | default: | 681 | default: |
781 | btn_dialog( | 682 | btn_dialog( |
782 | main_window, | 683 | main_window, |
783 | _("Your kernel configuration changes were NOT saved."), | 684 | _("Your configuration changes were NOT saved."), |
784 | 1, | 685 | 1, |
785 | "<OK>"); | 686 | "<OK>"); |
786 | break; | 687 | break; |
@@ -800,8 +701,8 @@ static void search_conf(void) | |||
800 | again: | 701 | again: |
801 | dres = dialog_inputbox(main_window, | 702 | dres = dialog_inputbox(main_window, |
802 | _("Search Configuration Parameter"), | 703 | _("Search Configuration Parameter"), |
803 | _("Enter CONFIG_ (sub)string to search for " | 704 | _("Enter " CONFIG_ " (sub)string to search for " |
804 | "(with or without \"CONFIG\")"), | 705 | "(with or without \"" CONFIG_ "\")"), |
805 | "", dialog_input_result, 99); | 706 | "", dialog_input_result, 99); |
806 | switch (dres) { | 707 | switch (dres) { |
807 | case 0: | 708 | case 0: |
@@ -814,10 +715,10 @@ again: | |||
814 | return; | 715 | return; |
815 | } | 716 | } |
816 | 717 | ||
817 | /* strip CONFIG_ if necessary */ | 718 | /* strip the prefix if necessary */ |
818 | dialog_input = dialog_input_result; | 719 | dialog_input = dialog_input_result; |
819 | if (strncasecmp(dialog_input_result, "CONFIG_", 7) == 0) | 720 | if (strncasecmp(dialog_input_result, CONFIG_, strlen(CONFIG_)) == 0) |
820 | dialog_input += 7; | 721 | dialog_input += strlen(CONFIG_); |
821 | 722 | ||
822 | sym_arr = sym_re_search(dialog_input); | 723 | sym_arr = sym_re_search(dialog_input); |
823 | res = get_relations_str(sym_arr); | 724 | res = get_relations_str(sym_arr); |
@@ -1025,23 +926,18 @@ static void reset_menu(void) | |||
1025 | static void center_item(int selected_index, int *last_top_row) | 926 | static void center_item(int selected_index, int *last_top_row) |
1026 | { | 927 | { |
1027 | int toprow; | 928 | int toprow; |
1028 | int maxy, maxx; | ||
1029 | 929 | ||
1030 | scale_menu(curses_menu, &maxy, &maxx); | ||
1031 | set_top_row(curses_menu, *last_top_row); | 930 | set_top_row(curses_menu, *last_top_row); |
1032 | toprow = top_row(curses_menu); | 931 | toprow = top_row(curses_menu); |
1033 | if (selected_index >= toprow && selected_index < toprow+maxy) { | 932 | if (selected_index < toprow || |
1034 | /* we can only move the selected item. no need to scroll */ | 933 | selected_index >= toprow+mwin_max_lines) { |
1035 | set_current_item(curses_menu, | 934 | toprow = max(selected_index-mwin_max_lines/2, 0); |
1036 | curses_menu_items[selected_index]); | 935 | if (toprow >= item_count(curses_menu)-mwin_max_lines) |
1037 | } else { | ||
1038 | toprow = max(selected_index-maxy/2, 0); | ||
1039 | if (toprow >= item_count(curses_menu)-maxy) | ||
1040 | toprow = item_count(curses_menu)-mwin_max_lines; | 936 | toprow = item_count(curses_menu)-mwin_max_lines; |
1041 | set_top_row(curses_menu, toprow); | 937 | set_top_row(curses_menu, toprow); |
1042 | set_current_item(curses_menu, | ||
1043 | curses_menu_items[selected_index]); | ||
1044 | } | 938 | } |
939 | set_current_item(curses_menu, | ||
940 | curses_menu_items[selected_index]); | ||
1045 | *last_top_row = toprow; | 941 | *last_top_row = toprow; |
1046 | post_menu(curses_menu); | 942 | post_menu(curses_menu); |
1047 | refresh_all_windows(main_window); | 943 | refresh_all_windows(main_window); |
@@ -1073,7 +969,7 @@ static void show_menu(const char *prompt, const char *instructions, | |||
1073 | /* position the menu at the middle of the screen */ | 969 | /* position the menu at the middle of the screen */ |
1074 | scale_menu(curses_menu, &maxy, &maxx); | 970 | scale_menu(curses_menu, &maxy, &maxx); |
1075 | maxx = min(maxx, mwin_max_cols-2); | 971 | maxx = min(maxx, mwin_max_cols-2); |
1076 | maxy = mwin_max_lines-2; | 972 | maxy = mwin_max_lines; |
1077 | menu_window = derwin(main_window, | 973 | menu_window = derwin(main_window, |
1078 | maxy, | 974 | maxy, |
1079 | maxx, | 975 | maxx, |
@@ -1097,10 +993,77 @@ static void show_menu(const char *prompt, const char *instructions, | |||
1097 | refresh_all_windows(main_window); | 993 | refresh_all_windows(main_window); |
1098 | } | 994 | } |
1099 | 995 | ||
996 | static void adj_match_dir(match_f *match_direction) | ||
997 | { | ||
998 | if (*match_direction == FIND_NEXT_MATCH_DOWN) | ||
999 | *match_direction = | ||
1000 | MATCH_TINKER_PATTERN_DOWN; | ||
1001 | else if (*match_direction == FIND_NEXT_MATCH_UP) | ||
1002 | *match_direction = | ||
1003 | MATCH_TINKER_PATTERN_UP; | ||
1004 | /* else, do no change.. */ | ||
1005 | } | ||
1100 | 1006 | ||
1101 | static void conf(struct menu *menu) | 1007 | struct match_state |
1102 | { | 1008 | { |
1009 | int in_search; | ||
1010 | match_f match_direction; | ||
1103 | char pattern[256]; | 1011 | char pattern[256]; |
1012 | }; | ||
1013 | |||
1014 | /* Return 0 means I have handled the key. In such a case, ans should hold the | ||
1015 | * item to center, or -1 otherwise. | ||
1016 | * Else return -1 . | ||
1017 | */ | ||
1018 | static int do_match(int key, struct match_state *state, int *ans) | ||
1019 | { | ||
1020 | char c = (char) key; | ||
1021 | int terminate_search = 0; | ||
1022 | *ans = -1; | ||
1023 | if (key == '/' || (state->in_search && key == 27)) { | ||
1024 | move(0, 0); | ||
1025 | refresh(); | ||
1026 | clrtoeol(); | ||
1027 | state->in_search = 1-state->in_search; | ||
1028 | bzero(state->pattern, sizeof(state->pattern)); | ||
1029 | state->match_direction = MATCH_TINKER_PATTERN_DOWN; | ||
1030 | return 0; | ||
1031 | } else if (!state->in_search) | ||
1032 | return 1; | ||
1033 | |||
1034 | if (isalnum(c) || isgraph(c) || c == ' ') { | ||
1035 | state->pattern[strlen(state->pattern)] = c; | ||
1036 | state->pattern[strlen(state->pattern)] = '\0'; | ||
1037 | adj_match_dir(&state->match_direction); | ||
1038 | *ans = get_mext_match(state->pattern, | ||
1039 | state->match_direction); | ||
1040 | } else if (key == KEY_DOWN) { | ||
1041 | state->match_direction = FIND_NEXT_MATCH_DOWN; | ||
1042 | *ans = get_mext_match(state->pattern, | ||
1043 | state->match_direction); | ||
1044 | } else if (key == KEY_UP) { | ||
1045 | state->match_direction = FIND_NEXT_MATCH_UP; | ||
1046 | *ans = get_mext_match(state->pattern, | ||
1047 | state->match_direction); | ||
1048 | } else if (key == KEY_BACKSPACE || key == 127) { | ||
1049 | state->pattern[strlen(state->pattern)-1] = '\0'; | ||
1050 | adj_match_dir(&state->match_direction); | ||
1051 | } else | ||
1052 | terminate_search = 1; | ||
1053 | |||
1054 | if (terminate_search) { | ||
1055 | state->in_search = 0; | ||
1056 | bzero(state->pattern, sizeof(state->pattern)); | ||
1057 | move(0, 0); | ||
1058 | refresh(); | ||
1059 | clrtoeol(); | ||
1060 | return -1; | ||
1061 | } | ||
1062 | return 0; | ||
1063 | } | ||
1064 | |||
1065 | static void conf(struct menu *menu) | ||
1066 | { | ||
1104 | struct menu *submenu = 0; | 1067 | struct menu *submenu = 0; |
1105 | const char *prompt = menu_get_prompt(menu); | 1068 | const char *prompt = menu_get_prompt(menu); |
1106 | struct symbol *sym; | 1069 | struct symbol *sym; |
@@ -1108,8 +1071,11 @@ static void conf(struct menu *menu) | |||
1108 | int res; | 1071 | int res; |
1109 | int current_index = 0; | 1072 | int current_index = 0; |
1110 | int last_top_row = 0; | 1073 | int last_top_row = 0; |
1111 | 1074 | struct match_state match_state = { | |
1112 | bzero(pattern, sizeof(pattern)); | 1075 | .in_search = 0, |
1076 | .match_direction = MATCH_TINKER_PATTERN_DOWN, | ||
1077 | .pattern = "", | ||
1078 | }; | ||
1113 | 1079 | ||
1114 | while (!global_exit) { | 1080 | while (!global_exit) { |
1115 | reset_menu(); | 1081 | reset_menu(); |
@@ -1122,7 +1088,22 @@ static void conf(struct menu *menu) | |||
1122 | _(menu_instructions), | 1088 | _(menu_instructions), |
1123 | current_index, &last_top_row); | 1089 | current_index, &last_top_row); |
1124 | keypad((menu_win(curses_menu)), TRUE); | 1090 | keypad((menu_win(curses_menu)), TRUE); |
1125 | while (!global_exit && (res = wgetch(menu_win(curses_menu)))) { | 1091 | while (!global_exit) { |
1092 | if (match_state.in_search) { | ||
1093 | mvprintw(0, 0, | ||
1094 | "searching: %s", match_state.pattern); | ||
1095 | clrtoeol(); | ||
1096 | } | ||
1097 | refresh_all_windows(main_window); | ||
1098 | res = wgetch(menu_win(curses_menu)); | ||
1099 | if (!res) | ||
1100 | break; | ||
1101 | if (do_match(res, &match_state, ¤t_index) == 0) { | ||
1102 | if (current_index != -1) | ||
1103 | center_item(current_index, | ||
1104 | &last_top_row); | ||
1105 | continue; | ||
1106 | } | ||
1126 | if (process_special_keys(&res, | 1107 | if (process_special_keys(&res, |
1127 | (struct menu *) item_data())) | 1108 | (struct menu *) item_data())) |
1128 | break; | 1109 | break; |
@@ -1153,19 +1134,13 @@ static void conf(struct menu *menu) | |||
1153 | if (res == 10 || res == 27 || | 1134 | if (res == 10 || res == 27 || |
1154 | res == 32 || res == 'n' || res == 'y' || | 1135 | res == 32 || res == 'n' || res == 'y' || |
1155 | res == KEY_LEFT || res == KEY_RIGHT || | 1136 | res == KEY_LEFT || res == KEY_RIGHT || |
1156 | res == 'm' || res == '/') | 1137 | res == 'm') |
1157 | break; | 1138 | break; |
1158 | else if (canbhot(res)) { | ||
1159 | /* check for hot keys: */ | ||
1160 | int tmp = get_next_hot(res); | ||
1161 | if (tmp != -1) | ||
1162 | center_item(tmp, &last_top_row); | ||
1163 | } | ||
1164 | refresh_all_windows(main_window); | 1139 | refresh_all_windows(main_window); |
1165 | } | 1140 | } |
1166 | 1141 | ||
1167 | refresh_all_windows(main_window); | 1142 | refresh_all_windows(main_window); |
1168 | /* if ESC or left*/ | 1143 | /* if ESC or left*/ |
1169 | if (res == 27 || (menu != &rootmenu && res == KEY_LEFT)) | 1144 | if (res == 27 || (menu != &rootmenu && res == KEY_LEFT)) |
1170 | break; | 1145 | break; |
1171 | 1146 | ||
@@ -1233,23 +1208,30 @@ static void conf(struct menu *menu) | |||
1233 | if (item_is_tag('t')) | 1208 | if (item_is_tag('t')) |
1234 | sym_set_tristate_value(sym, mod); | 1209 | sym_set_tristate_value(sym, mod); |
1235 | break; | 1210 | break; |
1236 | case '/': | ||
1237 | search_conf(); | ||
1238 | break; | ||
1239 | } | 1211 | } |
1240 | } | 1212 | } |
1241 | } | 1213 | } |
1242 | 1214 | ||
1215 | static void conf_message_callback(const char *fmt, va_list ap) | ||
1216 | { | ||
1217 | char buf[1024]; | ||
1218 | |||
1219 | vsnprintf(buf, sizeof(buf), fmt, ap); | ||
1220 | btn_dialog(main_window, buf, 1, "<OK>"); | ||
1221 | } | ||
1222 | |||
1243 | static void show_help(struct menu *menu) | 1223 | static void show_help(struct menu *menu) |
1244 | { | 1224 | { |
1245 | struct gstr help = str_new(); | 1225 | struct gstr help = str_new(); |
1246 | 1226 | ||
1247 | if (menu && menu->sym && menu_has_help(menu)) { | 1227 | if (menu && menu->sym && menu_has_help(menu)) { |
1248 | if (menu->sym->name) { | 1228 | if (menu->sym->name) { |
1249 | str_printf(&help, "CONFIG_%s:\n\n", menu->sym->name); | 1229 | str_printf(&help, "%s%s:\n\n", CONFIG_, menu->sym->name); |
1250 | str_append(&help, _(menu_get_help(menu))); | 1230 | str_append(&help, _(menu_get_help(menu))); |
1251 | str_append(&help, "\n"); | 1231 | str_append(&help, "\n"); |
1252 | get_symbol_str(&help, menu->sym); | 1232 | get_symbol_str(&help, menu->sym); |
1233 | } else { | ||
1234 | str_append(&help, _(menu_get_help(menu))); | ||
1253 | } | 1235 | } |
1254 | } else { | 1236 | } else { |
1255 | str_append(&help, nohelp_text); | 1237 | str_append(&help, nohelp_text); |
@@ -1266,6 +1248,11 @@ static void conf_choice(struct menu *menu) | |||
1266 | int selected_index = 0; | 1248 | int selected_index = 0; |
1267 | int last_top_row = 0; | 1249 | int last_top_row = 0; |
1268 | int res, i = 0; | 1250 | int res, i = 0; |
1251 | struct match_state match_state = { | ||
1252 | .in_search = 0, | ||
1253 | .match_direction = MATCH_TINKER_PATTERN_DOWN, | ||
1254 | .pattern = "", | ||
1255 | }; | ||
1269 | 1256 | ||
1270 | active = sym_get_choice_value(menu->sym); | 1257 | active = sym_get_choice_value(menu->sym); |
1271 | /* this is mostly duplicated from the conf() function. */ | 1258 | /* this is mostly duplicated from the conf() function. */ |
@@ -1279,9 +1266,13 @@ static void conf_choice(struct menu *menu) | |||
1279 | if (child->sym == sym_get_choice_value(menu->sym)) | 1266 | if (child->sym == sym_get_choice_value(menu->sym)) |
1280 | item_make(child, ':', "<X> %s", | 1267 | item_make(child, ':', "<X> %s", |
1281 | _(menu_get_prompt(child))); | 1268 | _(menu_get_prompt(child))); |
1282 | else | 1269 | else if (child->sym) |
1283 | item_make(child, ':', " %s", | 1270 | item_make(child, ':', " %s", |
1284 | _(menu_get_prompt(child))); | 1271 | _(menu_get_prompt(child))); |
1272 | else | ||
1273 | item_make(child, ':', "*** %s ***", | ||
1274 | _(menu_get_prompt(child))); | ||
1275 | |||
1285 | if (child->sym == active){ | 1276 | if (child->sym == active){ |
1286 | last_top_row = top_row(curses_menu); | 1277 | last_top_row = top_row(curses_menu); |
1287 | selected_index = i; | 1278 | selected_index = i; |
@@ -1292,7 +1283,22 @@ static void conf_choice(struct menu *menu) | |||
1292 | _(radiolist_instructions), | 1283 | _(radiolist_instructions), |
1293 | selected_index, | 1284 | selected_index, |
1294 | &last_top_row); | 1285 | &last_top_row); |
1295 | while (!global_exit && (res = wgetch(menu_win(curses_menu)))) { | 1286 | while (!global_exit) { |
1287 | if (match_state.in_search) { | ||
1288 | mvprintw(0, 0, "searching: %s", | ||
1289 | match_state.pattern); | ||
1290 | clrtoeol(); | ||
1291 | } | ||
1292 | refresh_all_windows(main_window); | ||
1293 | res = wgetch(menu_win(curses_menu)); | ||
1294 | if (!res) | ||
1295 | break; | ||
1296 | if (do_match(res, &match_state, &selected_index) == 0) { | ||
1297 | if (selected_index != -1) | ||
1298 | center_item(selected_index, | ||
1299 | &last_top_row); | ||
1300 | continue; | ||
1301 | } | ||
1296 | if (process_special_keys( | 1302 | if (process_special_keys( |
1297 | &res, | 1303 | &res, |
1298 | (struct menu *) item_data())) | 1304 | (struct menu *) item_data())) |
@@ -1322,13 +1328,8 @@ static void conf_choice(struct menu *menu) | |||
1322 | break; | 1328 | break; |
1323 | } | 1329 | } |
1324 | if (res == 10 || res == 27 || res == ' ' || | 1330 | if (res == 10 || res == 27 || res == ' ' || |
1325 | res == KEY_LEFT) | 1331 | res == KEY_LEFT){ |
1326 | break; | 1332 | break; |
1327 | else if (canbhot(res)) { | ||
1328 | /* check for hot keys: */ | ||
1329 | int tmp = get_next_hot(res); | ||
1330 | if (tmp != -1) | ||
1331 | center_item(tmp, &last_top_row); | ||
1332 | } | 1333 | } |
1333 | refresh_all_windows(main_window); | 1334 | refresh_all_windows(main_window); |
1334 | } | 1335 | } |
@@ -1337,7 +1338,7 @@ static void conf_choice(struct menu *menu) | |||
1337 | break; | 1338 | break; |
1338 | 1339 | ||
1339 | child = item_data(); | 1340 | child = item_data(); |
1340 | if (!child || !menu_is_visible(child)) | 1341 | if (!child || !menu_is_visible(child) || !child->sym) |
1341 | continue; | 1342 | continue; |
1342 | switch (res) { | 1343 | switch (res) { |
1343 | case ' ': | 1344 | case ' ': |
@@ -1447,16 +1448,8 @@ static void conf_save(void) | |||
1447 | case 0: | 1448 | case 0: |
1448 | if (!dialog_input_result[0]) | 1449 | if (!dialog_input_result[0]) |
1449 | return; | 1450 | return; |
1450 | supress_stdout(0); | ||
1451 | res = conf_write(dialog_input_result); | 1451 | res = conf_write(dialog_input_result); |
1452 | supress_stdout(1); | ||
1453 | if (!res) { | 1452 | if (!res) { |
1454 | char buf[1024]; | ||
1455 | sprintf(buf, "%s %s", | ||
1456 | _("configuration file saved to: "), | ||
1457 | dialog_input_result); | ||
1458 | btn_dialog(main_window, | ||
1459 | buf, 1, "<OK>"); | ||
1460 | set_config_filename(dialog_input_result); | 1453 | set_config_filename(dialog_input_result); |
1461 | return; | 1454 | return; |
1462 | } | 1455 | } |
@@ -1483,7 +1476,7 @@ void setup_windows(void) | |||
1483 | /* set up the menu and menu window */ | 1476 | /* set up the menu and menu window */ |
1484 | main_window = newwin(LINES-2, COLS-2, 2, 1); | 1477 | main_window = newwin(LINES-2, COLS-2, 2, 1); |
1485 | keypad(main_window, TRUE); | 1478 | keypad(main_window, TRUE); |
1486 | mwin_max_lines = LINES-6; | 1479 | mwin_max_lines = LINES-7; |
1487 | mwin_max_cols = COLS-6; | 1480 | mwin_max_cols = COLS-6; |
1488 | 1481 | ||
1489 | /* panels order is from bottom to top */ | 1482 | /* panels order is from bottom to top */ |
@@ -1530,9 +1523,10 @@ int main(int ac, char **av) | |||
1530 | /* set btns menu */ | 1523 | /* set btns menu */ |
1531 | curses_menu = new_menu(curses_menu_items); | 1524 | curses_menu = new_menu(curses_menu_items); |
1532 | menu_opts_off(curses_menu, O_SHOWDESC); | 1525 | menu_opts_off(curses_menu, O_SHOWDESC); |
1533 | menu_opts_off(curses_menu, O_SHOWMATCH); | 1526 | menu_opts_on(curses_menu, O_SHOWMATCH); |
1534 | menu_opts_on(curses_menu, O_ONEVALUE); | 1527 | menu_opts_on(curses_menu, O_ONEVALUE); |
1535 | menu_opts_on(curses_menu, O_NONCYCLIC); | 1528 | menu_opts_on(curses_menu, O_NONCYCLIC); |
1529 | menu_opts_on(curses_menu, O_IGNORECASE); | ||
1536 | set_menu_mark(curses_menu, " "); | 1530 | set_menu_mark(curses_menu, " "); |
1537 | set_menu_fore(curses_menu, attributes[MAIN_MENU_FORE]); | 1531 | set_menu_fore(curses_menu, attributes[MAIN_MENU_FORE]); |
1538 | set_menu_back(curses_menu, attributes[MAIN_MENU_BACK]); | 1532 | set_menu_back(curses_menu, attributes[MAIN_MENU_BACK]); |
@@ -1548,8 +1542,7 @@ int main(int ac, char **av) | |||
1548 | _(menu_no_f_instructions)); | 1542 | _(menu_no_f_instructions)); |
1549 | } | 1543 | } |
1550 | 1544 | ||
1551 | 1545 | conf_set_message_callback(conf_message_callback); | |
1552 | |||
1553 | /* do the work */ | 1546 | /* do the work */ |
1554 | while (!global_exit) { | 1547 | while (!global_exit) { |
1555 | conf(&rootmenu); | 1548 | conf(&rootmenu); |
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c index 115edb437fb..f8137b3a538 100644 --- a/scripts/kconfig/nconf.gui.c +++ b/scripts/kconfig/nconf.gui.c | |||
@@ -137,7 +137,7 @@ void set_colors() | |||
137 | if (has_colors()) { | 137 | if (has_colors()) { |
138 | normal_color_theme(); | 138 | normal_color_theme(); |
139 | } else { | 139 | } else { |
140 | /* give deafults */ | 140 | /* give defaults */ |
141 | no_colors_theme(); | 141 | no_colors_theme(); |
142 | } | 142 | } |
143 | } | 143 | } |
@@ -167,7 +167,7 @@ void print_in_middle(WINDOW *win, | |||
167 | length = strlen(string); | 167 | length = strlen(string); |
168 | temp = (width - length) / 2; | 168 | temp = (width - length) / 2; |
169 | x = startx + (int)temp; | 169 | x = startx + (int)temp; |
170 | wattrset(win, color); | 170 | (void) wattrset(win, color); |
171 | mvwprintw(win, y, x, "%s", string); | 171 | mvwprintw(win, y, x, "%s", string); |
172 | refresh(); | 172 | refresh(); |
173 | } | 173 | } |
@@ -226,7 +226,7 @@ void fill_window(WINDOW *win, const char *text) | |||
226 | int len = get_line_length(line); | 226 | int len = get_line_length(line); |
227 | strncpy(tmp, line, min(len, x)); | 227 | strncpy(tmp, line, min(len, x)); |
228 | tmp[len] = '\0'; | 228 | tmp[len] = '\0'; |
229 | mvwprintw(win, i, 0, tmp); | 229 | mvwprintw(win, i, 0, "%s", tmp); |
230 | } | 230 | } |
231 | } | 231 | } |
232 | 232 | ||
@@ -297,11 +297,11 @@ int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...) | |||
297 | set_menu_fore(menu, attributes[DIALOG_MENU_FORE]); | 297 | set_menu_fore(menu, attributes[DIALOG_MENU_FORE]); |
298 | set_menu_back(menu, attributes[DIALOG_MENU_BACK]); | 298 | set_menu_back(menu, attributes[DIALOG_MENU_BACK]); |
299 | 299 | ||
300 | wattrset(win, attributes[DIALOG_BOX]); | 300 | (void) wattrset(win, attributes[DIALOG_BOX]); |
301 | box(win, 0, 0); | 301 | box(win, 0, 0); |
302 | 302 | ||
303 | /* print message */ | 303 | /* print message */ |
304 | wattrset(msg_win, attributes[DIALOG_TEXT]); | 304 | (void) wattrset(msg_win, attributes[DIALOG_TEXT]); |
305 | fill_window(msg_win, msg); | 305 | fill_window(msg_win, msg); |
306 | 306 | ||
307 | set_menu_win(menu, win); | 307 | set_menu_win(menu, win); |
@@ -392,16 +392,16 @@ int dialog_inputbox(WINDOW *main_window, | |||
392 | form_win = derwin(win, 1, prompt_width, prompt_lines+3, 2); | 392 | form_win = derwin(win, 1, prompt_width, prompt_lines+3, 2); |
393 | keypad(form_win, TRUE); | 393 | keypad(form_win, TRUE); |
394 | 394 | ||
395 | wattrset(form_win, attributes[INPUT_FIELD]); | 395 | (void) wattrset(form_win, attributes[INPUT_FIELD]); |
396 | 396 | ||
397 | wattrset(win, attributes[INPUT_BOX]); | 397 | (void) wattrset(win, attributes[INPUT_BOX]); |
398 | box(win, 0, 0); | 398 | box(win, 0, 0); |
399 | wattrset(win, attributes[INPUT_HEADING]); | 399 | (void) wattrset(win, attributes[INPUT_HEADING]); |
400 | if (title) | 400 | if (title) |
401 | mvwprintw(win, 0, 3, "%s", title); | 401 | mvwprintw(win, 0, 3, "%s", title); |
402 | 402 | ||
403 | /* print message */ | 403 | /* print message */ |
404 | wattrset(prompt_win, attributes[INPUT_TEXT]); | 404 | (void) wattrset(prompt_win, attributes[INPUT_TEXT]); |
405 | fill_window(prompt_win, prompt); | 405 | fill_window(prompt_win, prompt); |
406 | 406 | ||
407 | mvwprintw(form_win, 0, 0, "%*s", prompt_width, " "); | 407 | mvwprintw(form_win, 0, 0, "%*s", prompt_width, " "); |
@@ -531,7 +531,7 @@ void show_scroll_win(WINDOW *main_window, | |||
531 | 531 | ||
532 | /* create the pad */ | 532 | /* create the pad */ |
533 | pad = newpad(total_lines+10, total_cols+10); | 533 | pad = newpad(total_lines+10, total_cols+10); |
534 | wattrset(pad, attributes[SCROLLWIN_TEXT]); | 534 | (void) wattrset(pad, attributes[SCROLLWIN_TEXT]); |
535 | fill_window(pad, text); | 535 | fill_window(pad, text); |
536 | 536 | ||
537 | win_lines = min(total_lines+4, LINES-2); | 537 | win_lines = min(total_lines+4, LINES-2); |
@@ -546,9 +546,9 @@ void show_scroll_win(WINDOW *main_window, | |||
546 | win = newwin(win_lines, win_cols, y, x); | 546 | win = newwin(win_lines, win_cols, y, x); |
547 | keypad(win, TRUE); | 547 | keypad(win, TRUE); |
548 | /* show the help in the help window, and show the help panel */ | 548 | /* show the help in the help window, and show the help panel */ |
549 | wattrset(win, attributes[SCROLLWIN_BOX]); | 549 | (void) wattrset(win, attributes[SCROLLWIN_BOX]); |
550 | box(win, 0, 0); | 550 | box(win, 0, 0); |
551 | wattrset(win, attributes[SCROLLWIN_HEADING]); | 551 | (void) wattrset(win, attributes[SCROLLWIN_HEADING]); |
552 | mvwprintw(win, 0, 3, " %s ", title); | 552 | mvwprintw(win, 0, 3, " %s ", title); |
553 | panel = new_panel(win); | 553 | panel = new_panel(win); |
554 | 554 | ||
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h index fb429666600..58fbda8fc0d 100644 --- a/scripts/kconfig/nconf.h +++ b/scripts/kconfig/nconf.h | |||
@@ -69,7 +69,8 @@ typedef enum { | |||
69 | F_BACK = 5, | 69 | F_BACK = 5, |
70 | F_SAVE = 6, | 70 | F_SAVE = 6, |
71 | F_LOAD = 7, | 71 | F_LOAD = 7, |
72 | F_EXIT = 8 | 72 | F_SEARCH = 8, |
73 | F_EXIT = 9, | ||
73 | } function_key; | 74 | } function_key; |
74 | 75 | ||
75 | void set_colors(void); | 76 | void set_colors(void); |
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 00c51507cfc..06dd2e33581 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc | |||
@@ -3,25 +3,42 @@ | |||
3 | * Released under the terms of the GNU GPL v2.0. | 3 | * Released under the terms of the GNU GPL v2.0. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <qapplication.h> | 6 | #include <qglobal.h> |
7 | |||
8 | #if QT_VERSION < 0x040000 | ||
7 | #include <qmainwindow.h> | 9 | #include <qmainwindow.h> |
10 | #include <qvbox.h> | ||
11 | #include <qvaluelist.h> | ||
12 | #include <qtextbrowser.h> | ||
13 | #include <qaction.h> | ||
14 | #include <qheader.h> | ||
15 | #include <qfiledialog.h> | ||
16 | #include <qdragobject.h> | ||
17 | #include <qpopupmenu.h> | ||
18 | #else | ||
19 | #include <q3mainwindow.h> | ||
20 | #include <q3vbox.h> | ||
21 | #include <q3valuelist.h> | ||
22 | #include <q3textbrowser.h> | ||
23 | #include <q3action.h> | ||
24 | #include <q3header.h> | ||
25 | #include <q3filedialog.h> | ||
26 | #include <q3dragobject.h> | ||
27 | #include <q3popupmenu.h> | ||
28 | #endif | ||
29 | |||
30 | #include <qapplication.h> | ||
8 | #include <qdesktopwidget.h> | 31 | #include <qdesktopwidget.h> |
9 | #include <qtoolbar.h> | 32 | #include <qtoolbar.h> |
10 | #include <qlayout.h> | 33 | #include <qlayout.h> |
11 | #include <qvbox.h> | ||
12 | #include <qsplitter.h> | 34 | #include <qsplitter.h> |
13 | #include <qlistview.h> | ||
14 | #include <qtextbrowser.h> | ||
15 | #include <qlineedit.h> | 35 | #include <qlineedit.h> |
16 | #include <qlabel.h> | 36 | #include <qlabel.h> |
17 | #include <qpushbutton.h> | 37 | #include <qpushbutton.h> |
18 | #include <qmenubar.h> | 38 | #include <qmenubar.h> |
19 | #include <qmessagebox.h> | 39 | #include <qmessagebox.h> |
20 | #include <qaction.h> | ||
21 | #include <qheader.h> | ||
22 | #include <qfiledialog.h> | ||
23 | #include <qdragobject.h> | ||
24 | #include <qregexp.h> | 40 | #include <qregexp.h> |
41 | #include <qevent.h> | ||
25 | 42 | ||
26 | #include <stdlib.h> | 43 | #include <stdlib.h> |
27 | 44 | ||
@@ -39,7 +56,7 @@ | |||
39 | static QApplication *configApp; | 56 | static QApplication *configApp; |
40 | static ConfigSettings *configSettings; | 57 | static ConfigSettings *configSettings; |
41 | 58 | ||
42 | QAction *ConfigMainWindow::saveAction; | 59 | Q3Action *ConfigMainWindow::saveAction; |
43 | 60 | ||
44 | static inline QString qgettext(const char* str) | 61 | static inline QString qgettext(const char* str) |
45 | { | 62 | { |
@@ -54,15 +71,14 @@ static inline QString qgettext(const QString& str) | |||
54 | /** | 71 | /** |
55 | * Reads a list of integer values from the application settings. | 72 | * Reads a list of integer values from the application settings. |
56 | */ | 73 | */ |
57 | QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok) | 74 | Q3ValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok) |
58 | { | 75 | { |
59 | QValueList<int> result; | 76 | Q3ValueList<int> result; |
60 | QStringList entryList = readListEntry(key, ok); | 77 | QStringList entryList = readListEntry(key, ok); |
61 | if (ok) { | 78 | QStringList::Iterator it; |
62 | QStringList::Iterator it; | 79 | |
63 | for (it = entryList.begin(); it != entryList.end(); ++it) | 80 | for (it = entryList.begin(); it != entryList.end(); ++it) |
64 | result.push_back((*it).toInt()); | 81 | result.push_back((*it).toInt()); |
65 | } | ||
66 | 82 | ||
67 | return result; | 83 | return result; |
68 | } | 84 | } |
@@ -70,10 +86,10 @@ QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok) | |||
70 | /** | 86 | /** |
71 | * Writes a list of integer values to the application settings. | 87 | * Writes a list of integer values to the application settings. |
72 | */ | 88 | */ |
73 | bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value) | 89 | bool ConfigSettings::writeSizes(const QString& key, const Q3ValueList<int>& value) |
74 | { | 90 | { |
75 | QStringList stringList; | 91 | QStringList stringList; |
76 | QValueList<int>::ConstIterator it; | 92 | Q3ValueList<int>::ConstIterator it; |
77 | 93 | ||
78 | for (it = value.begin(); it != value.end(); ++it) | 94 | for (it = value.begin(); it != value.end(); ++it) |
79 | stringList.push_back(QString::number(*it)); | 95 | stringList.push_back(QString::number(*it)); |
@@ -81,7 +97,6 @@ bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value | |||
81 | } | 97 | } |
82 | 98 | ||
83 | 99 | ||
84 | #if QT_VERSION >= 300 | ||
85 | /* | 100 | /* |
86 | * set the new data | 101 | * set the new data |
87 | * TODO check the value | 102 | * TODO check the value |
@@ -92,7 +107,6 @@ void ConfigItem::okRename(int col) | |||
92 | sym_set_string_value(menu->sym, text(dataColIdx).latin1()); | 107 | sym_set_string_value(menu->sym, text(dataColIdx).latin1()); |
93 | listView()->updateList(this); | 108 | listView()->updateList(this); |
94 | } | 109 | } |
95 | #endif | ||
96 | 110 | ||
97 | /* | 111 | /* |
98 | * update the displayed of a menu entry | 112 | * update the displayed of a menu entry |
@@ -149,7 +163,7 @@ void ConfigItem::updateMenu(void) | |||
149 | case S_TRISTATE: | 163 | case S_TRISTATE: |
150 | char ch; | 164 | char ch; |
151 | 165 | ||
152 | if (!sym_is_changable(sym) && !list->showAll) { | 166 | if (!sym_is_changable(sym) && list->optMode == normalOpt) { |
153 | setPixmap(promptColIdx, 0); | 167 | setPixmap(promptColIdx, 0); |
154 | setText(noColIdx, QString::null); | 168 | setText(noColIdx, QString::null); |
155 | setText(modColIdx, QString::null); | 169 | setText(modColIdx, QString::null); |
@@ -196,11 +210,9 @@ void ConfigItem::updateMenu(void) | |||
196 | 210 | ||
197 | data = sym_get_string_value(sym); | 211 | data = sym_get_string_value(sym); |
198 | 212 | ||
199 | #if QT_VERSION >= 300 | ||
200 | int i = list->mapIdx(dataColIdx); | 213 | int i = list->mapIdx(dataColIdx); |
201 | if (i >= 0) | 214 | if (i >= 0) |
202 | setRenameEnabled(i, TRUE); | 215 | setRenameEnabled(i, TRUE); |
203 | #endif | ||
204 | setText(dataColIdx, data); | 216 | setText(dataColIdx, data); |
205 | if (type == S_STRING) | 217 | if (type == S_STRING) |
206 | prompt = QString("%1: %2").arg(prompt).arg(data); | 218 | prompt = QString("%1: %2").arg(prompt).arg(data); |
@@ -320,7 +332,7 @@ ConfigList::ConfigList(ConfigView* p, const char *name) | |||
320 | symbolYesPix(xpm_symbol_yes), symbolModPix(xpm_symbol_mod), symbolNoPix(xpm_symbol_no), | 332 | symbolYesPix(xpm_symbol_yes), symbolModPix(xpm_symbol_mod), symbolNoPix(xpm_symbol_no), |
321 | choiceYesPix(xpm_choice_yes), choiceNoPix(xpm_choice_no), | 333 | choiceYesPix(xpm_choice_yes), choiceNoPix(xpm_choice_no), |
322 | menuPix(xpm_menu), menuInvPix(xpm_menu_inv), menuBackPix(xpm_menuback), voidPix(xpm_void), | 334 | menuPix(xpm_menu), menuInvPix(xpm_menu_inv), menuBackPix(xpm_menuback), voidPix(xpm_void), |
323 | showAll(false), showName(false), showRange(false), showData(false), | 335 | showName(false), showRange(false), showData(false), optMode(normalOpt), |
324 | rootEntry(0), headerPopup(0) | 336 | rootEntry(0), headerPopup(0) |
325 | { | 337 | { |
326 | int i; | 338 | int i; |
@@ -337,10 +349,10 @@ ConfigList::ConfigList(ConfigView* p, const char *name) | |||
337 | 349 | ||
338 | if (name) { | 350 | if (name) { |
339 | configSettings->beginGroup(name); | 351 | configSettings->beginGroup(name); |
340 | showAll = configSettings->readBoolEntry("/showAll", false); | ||
341 | showName = configSettings->readBoolEntry("/showName", false); | 352 | showName = configSettings->readBoolEntry("/showName", false); |
342 | showRange = configSettings->readBoolEntry("/showRange", false); | 353 | showRange = configSettings->readBoolEntry("/showRange", false); |
343 | showData = configSettings->readBoolEntry("/showData", false); | 354 | showData = configSettings->readBoolEntry("/showData", false); |
355 | optMode = (enum optionMode)configSettings->readNumEntry("/optionMode", false); | ||
344 | configSettings->endGroup(); | 356 | configSettings->endGroup(); |
345 | connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings())); | 357 | connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings())); |
346 | } | 358 | } |
@@ -352,6 +364,17 @@ ConfigList::ConfigList(ConfigView* p, const char *name) | |||
352 | reinit(); | 364 | reinit(); |
353 | } | 365 | } |
354 | 366 | ||
367 | bool ConfigList::menuSkip(struct menu *menu) | ||
368 | { | ||
369 | if (optMode == normalOpt && menu_is_visible(menu)) | ||
370 | return false; | ||
371 | if (optMode == promptOpt && menu_has_prompt(menu)) | ||
372 | return false; | ||
373 | if (optMode == allOpt) | ||
374 | return false; | ||
375 | return true; | ||
376 | } | ||
377 | |||
355 | void ConfigList::reinit(void) | 378 | void ConfigList::reinit(void) |
356 | { | 379 | { |
357 | removeColumn(dataColIdx); | 380 | removeColumn(dataColIdx); |
@@ -380,7 +403,7 @@ void ConfigList::saveSettings(void) | |||
380 | configSettings->writeEntry("/showName", showName); | 403 | configSettings->writeEntry("/showName", showName); |
381 | configSettings->writeEntry("/showRange", showRange); | 404 | configSettings->writeEntry("/showRange", showRange); |
382 | configSettings->writeEntry("/showData", showData); | 405 | configSettings->writeEntry("/showData", showData); |
383 | configSettings->writeEntry("/showAll", showAll); | 406 | configSettings->writeEntry("/optionMode", (int)optMode); |
384 | configSettings->endGroup(); | 407 | configSettings->endGroup(); |
385 | } | 408 | } |
386 | } | 409 | } |
@@ -422,7 +445,7 @@ void ConfigList::updateList(ConfigItem* item) | |||
422 | if (!rootEntry) { | 445 | if (!rootEntry) { |
423 | if (mode != listMode) | 446 | if (mode != listMode) |
424 | goto update; | 447 | goto update; |
425 | QListViewItemIterator it(this); | 448 | Q3ListViewItemIterator it(this); |
426 | ConfigItem* item; | 449 | ConfigItem* item; |
427 | 450 | ||
428 | for (; it.current(); ++it) { | 451 | for (; it.current(); ++it) { |
@@ -517,11 +540,9 @@ void ConfigList::changeValue(ConfigItem* item) | |||
517 | case S_INT: | 540 | case S_INT: |
518 | case S_HEX: | 541 | case S_HEX: |
519 | case S_STRING: | 542 | case S_STRING: |
520 | #if QT_VERSION >= 300 | ||
521 | if (colMap[dataColIdx] >= 0) | 543 | if (colMap[dataColIdx] >= 0) |
522 | item->startRename(colMap[dataColIdx]); | 544 | item->startRename(colMap[dataColIdx]); |
523 | else | 545 | else |
524 | #endif | ||
525 | parent()->lineEdit->show(item); | 546 | parent()->lineEdit->show(item); |
526 | break; | 547 | break; |
527 | } | 548 | } |
@@ -553,7 +574,7 @@ void ConfigList::setParentMenu(void) | |||
553 | return; | 574 | return; |
554 | setRootMenu(menu_get_parent_menu(rootEntry->parent)); | 575 | setRootMenu(menu_get_parent_menu(rootEntry->parent)); |
555 | 576 | ||
556 | QListViewItemIterator it(this); | 577 | Q3ListViewItemIterator it(this); |
557 | for (; (item = (ConfigItem*)it.current()); it++) { | 578 | for (; (item = (ConfigItem*)it.current()); it++) { |
558 | if (item->menu == oldroot) { | 579 | if (item->menu == oldroot) { |
559 | setCurrentItem(item); | 580 | setCurrentItem(item); |
@@ -606,7 +627,7 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu) | |||
606 | } | 627 | } |
607 | 628 | ||
608 | visible = menu_is_visible(child); | 629 | visible = menu_is_visible(child); |
609 | if (showAll || visible) { | 630 | if (!menuSkip(child)) { |
610 | if (!child->sym && !child->list && !child->prompt) | 631 | if (!child->sym && !child->list && !child->prompt) |
611 | continue; | 632 | continue; |
612 | if (!item || item->menu != child) | 633 | if (!item || item->menu != child) |
@@ -635,7 +656,7 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu) | |||
635 | 656 | ||
636 | void ConfigList::keyPressEvent(QKeyEvent* ev) | 657 | void ConfigList::keyPressEvent(QKeyEvent* ev) |
637 | { | 658 | { |
638 | QListViewItem* i = currentItem(); | 659 | Q3ListViewItem* i = currentItem(); |
639 | ConfigItem* item; | 660 | ConfigItem* item; |
640 | struct menu *menu; | 661 | struct menu *menu; |
641 | enum prop_type type; | 662 | enum prop_type type; |
@@ -801,10 +822,10 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e) | |||
801 | { | 822 | { |
802 | if (e->y() <= header()->geometry().bottom()) { | 823 | if (e->y() <= header()->geometry().bottom()) { |
803 | if (!headerPopup) { | 824 | if (!headerPopup) { |
804 | QAction *action; | 825 | Q3Action *action; |
805 | 826 | ||
806 | headerPopup = new QPopupMenu(this); | 827 | headerPopup = new Q3PopupMenu(this); |
807 | action = new QAction(NULL, _("Show Name"), 0, this); | 828 | action = new Q3Action(NULL, _("Show Name"), 0, this); |
808 | action->setToggleAction(TRUE); | 829 | action->setToggleAction(TRUE); |
809 | connect(action, SIGNAL(toggled(bool)), | 830 | connect(action, SIGNAL(toggled(bool)), |
810 | parent(), SLOT(setShowName(bool))); | 831 | parent(), SLOT(setShowName(bool))); |
@@ -812,7 +833,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e) | |||
812 | action, SLOT(setOn(bool))); | 833 | action, SLOT(setOn(bool))); |
813 | action->setOn(showName); | 834 | action->setOn(showName); |
814 | action->addTo(headerPopup); | 835 | action->addTo(headerPopup); |
815 | action = new QAction(NULL, _("Show Range"), 0, this); | 836 | action = new Q3Action(NULL, _("Show Range"), 0, this); |
816 | action->setToggleAction(TRUE); | 837 | action->setToggleAction(TRUE); |
817 | connect(action, SIGNAL(toggled(bool)), | 838 | connect(action, SIGNAL(toggled(bool)), |
818 | parent(), SLOT(setShowRange(bool))); | 839 | parent(), SLOT(setShowRange(bool))); |
@@ -820,7 +841,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e) | |||
820 | action, SLOT(setOn(bool))); | 841 | action, SLOT(setOn(bool))); |
821 | action->setOn(showRange); | 842 | action->setOn(showRange); |
822 | action->addTo(headerPopup); | 843 | action->addTo(headerPopup); |
823 | action = new QAction(NULL, _("Show Data"), 0, this); | 844 | action = new Q3Action(NULL, _("Show Data"), 0, this); |
824 | action->setToggleAction(TRUE); | 845 | action->setToggleAction(TRUE); |
825 | connect(action, SIGNAL(toggled(bool)), | 846 | connect(action, SIGNAL(toggled(bool)), |
826 | parent(), SLOT(setShowData(bool))); | 847 | parent(), SLOT(setShowData(bool))); |
@@ -835,7 +856,10 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e) | |||
835 | e->ignore(); | 856 | e->ignore(); |
836 | } | 857 | } |
837 | 858 | ||
838 | ConfigView* ConfigView::viewList; | 859 | ConfigView*ConfigView::viewList; |
860 | QAction *ConfigView::showNormalAction; | ||
861 | QAction *ConfigView::showAllAction; | ||
862 | QAction *ConfigView::showPromptAction; | ||
839 | 863 | ||
840 | ConfigView::ConfigView(QWidget* parent, const char *name) | 864 | ConfigView::ConfigView(QWidget* parent, const char *name) |
841 | : Parent(parent, name) | 865 | : Parent(parent, name) |
@@ -860,13 +884,16 @@ ConfigView::~ConfigView(void) | |||
860 | } | 884 | } |
861 | } | 885 | } |
862 | 886 | ||
863 | void ConfigView::setShowAll(bool b) | 887 | void ConfigView::setOptionMode(QAction *act) |
864 | { | 888 | { |
865 | if (list->showAll != b) { | 889 | if (act == showNormalAction) |
866 | list->showAll = b; | 890 | list->optMode = normalOpt; |
867 | list->updateListAll(); | 891 | else if (act == showAllAction) |
868 | emit showAllChanged(b); | 892 | list->optMode = allOpt; |
869 | } | 893 | else |
894 | list->optMode = promptOpt; | ||
895 | |||
896 | list->updateListAll(); | ||
870 | } | 897 | } |
871 | 898 | ||
872 | void ConfigView::setShowName(bool b) | 899 | void ConfigView::setShowName(bool b) |
@@ -898,7 +925,7 @@ void ConfigView::setShowData(bool b) | |||
898 | 925 | ||
899 | void ConfigList::setAllOpen(bool open) | 926 | void ConfigList::setAllOpen(bool open) |
900 | { | 927 | { |
901 | QListViewItemIterator it(this); | 928 | Q3ListViewItemIterator it(this); |
902 | 929 | ||
903 | for (; it.current(); it++) | 930 | for (; it.current(); it++) |
904 | it.current()->setOpen(open); | 931 | it.current()->setOpen(open); |
@@ -921,7 +948,7 @@ void ConfigView::updateListAll(void) | |||
921 | } | 948 | } |
922 | 949 | ||
923 | ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name) | 950 | ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name) |
924 | : Parent(parent, name), sym(0), menu(0) | 951 | : Parent(parent, name), sym(0), _menu(0) |
925 | { | 952 | { |
926 | if (name) { | 953 | if (name) { |
927 | configSettings->beginGroup(name); | 954 | configSettings->beginGroup(name); |
@@ -944,7 +971,7 @@ void ConfigInfoView::setShowDebug(bool b) | |||
944 | { | 971 | { |
945 | if (_showDebug != b) { | 972 | if (_showDebug != b) { |
946 | _showDebug = b; | 973 | _showDebug = b; |
947 | if (menu) | 974 | if (_menu) |
948 | menuInfo(); | 975 | menuInfo(); |
949 | else if (sym) | 976 | else if (sym) |
950 | symbolInfo(); | 977 | symbolInfo(); |
@@ -954,44 +981,16 @@ void ConfigInfoView::setShowDebug(bool b) | |||
954 | 981 | ||
955 | void ConfigInfoView::setInfo(struct menu *m) | 982 | void ConfigInfoView::setInfo(struct menu *m) |
956 | { | 983 | { |
957 | if (menu == m) | 984 | if (_menu == m) |
958 | return; | 985 | return; |
959 | menu = m; | 986 | _menu = m; |
960 | sym = NULL; | 987 | sym = NULL; |
961 | if (!menu) | 988 | if (!_menu) |
962 | clear(); | 989 | clear(); |
963 | else | 990 | else |
964 | menuInfo(); | 991 | menuInfo(); |
965 | } | 992 | } |
966 | 993 | ||
967 | void ConfigInfoView::setSource(const QString& name) | ||
968 | { | ||
969 | const char *p = name.latin1(); | ||
970 | |||
971 | menu = NULL; | ||
972 | sym = NULL; | ||
973 | |||
974 | switch (p[0]) { | ||
975 | case 'm': | ||
976 | struct menu *m; | ||
977 | |||
978 | if (sscanf(p, "m%p", &m) == 1 && menu != m) { | ||
979 | menu = m; | ||
980 | menuInfo(); | ||
981 | emit menuSelected(menu); | ||
982 | } | ||
983 | break; | ||
984 | case 's': | ||
985 | struct symbol *s; | ||
986 | |||
987 | if (sscanf(p, "s%p", &s) == 1 && sym != s) { | ||
988 | sym = s; | ||
989 | symbolInfo(); | ||
990 | } | ||
991 | break; | ||
992 | } | ||
993 | } | ||
994 | |||
995 | void ConfigInfoView::symbolInfo(void) | 994 | void ConfigInfoView::symbolInfo(void) |
996 | { | 995 | { |
997 | QString str; | 996 | QString str; |
@@ -1013,11 +1012,11 @@ void ConfigInfoView::menuInfo(void) | |||
1013 | struct symbol* sym; | 1012 | struct symbol* sym; |
1014 | QString head, debug, help; | 1013 | QString head, debug, help; |
1015 | 1014 | ||
1016 | sym = menu->sym; | 1015 | sym = _menu->sym; |
1017 | if (sym) { | 1016 | if (sym) { |
1018 | if (menu->prompt) { | 1017 | if (_menu->prompt) { |
1019 | head += "<big><b>"; | 1018 | head += "<big><b>"; |
1020 | head += print_filter(_(menu->prompt->text)); | 1019 | head += print_filter(_(_menu->prompt->text)); |
1021 | head += "</b></big>"; | 1020 | head += "</b></big>"; |
1022 | if (sym->name) { | 1021 | if (sym->name) { |
1023 | head += " ("; | 1022 | head += " ("; |
@@ -1043,23 +1042,23 @@ void ConfigInfoView::menuInfo(void) | |||
1043 | debug = debug_info(sym); | 1042 | debug = debug_info(sym); |
1044 | 1043 | ||
1045 | struct gstr help_gstr = str_new(); | 1044 | struct gstr help_gstr = str_new(); |
1046 | menu_get_ext_help(menu, &help_gstr); | 1045 | menu_get_ext_help(_menu, &help_gstr); |
1047 | help = print_filter(str_get(&help_gstr)); | 1046 | help = print_filter(str_get(&help_gstr)); |
1048 | str_free(&help_gstr); | 1047 | str_free(&help_gstr); |
1049 | } else if (menu->prompt) { | 1048 | } else if (_menu->prompt) { |
1050 | head += "<big><b>"; | 1049 | head += "<big><b>"; |
1051 | head += print_filter(_(menu->prompt->text)); | 1050 | head += print_filter(_(_menu->prompt->text)); |
1052 | head += "</b></big><br><br>"; | 1051 | head += "</b></big><br><br>"; |
1053 | if (showDebug()) { | 1052 | if (showDebug()) { |
1054 | if (menu->prompt->visible.expr) { | 1053 | if (_menu->prompt->visible.expr) { |
1055 | debug += " dep: "; | 1054 | debug += " dep: "; |
1056 | expr_print(menu->prompt->visible.expr, expr_print_help, &debug, E_NONE); | 1055 | expr_print(_menu->prompt->visible.expr, expr_print_help, &debug, E_NONE); |
1057 | debug += "<br><br>"; | 1056 | debug += "<br><br>"; |
1058 | } | 1057 | } |
1059 | } | 1058 | } |
1060 | } | 1059 | } |
1061 | if (showDebug()) | 1060 | if (showDebug()) |
1062 | debug += QString().sprintf("defined at %s:%d<br><br>", menu->file->name, menu->lineno); | 1061 | debug += QString().sprintf("defined at %s:%d<br><br>", _menu->file->name, _menu->lineno); |
1063 | 1062 | ||
1064 | setText(head + debug + help); | 1063 | setText(head + debug + help); |
1065 | } | 1064 | } |
@@ -1162,10 +1161,10 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char | |||
1162 | *text += str2; | 1161 | *text += str2; |
1163 | } | 1162 | } |
1164 | 1163 | ||
1165 | QPopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos) | 1164 | Q3PopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos) |
1166 | { | 1165 | { |
1167 | QPopupMenu* popup = Parent::createPopupMenu(pos); | 1166 | Q3PopupMenu* popup = Parent::createPopupMenu(pos); |
1168 | QAction* action = new QAction(NULL, _("Show Debug Info"), 0, popup); | 1167 | Q3Action* action = new Q3Action(NULL, _("Show Debug Info"), 0, popup); |
1169 | action->setToggleAction(TRUE); | 1168 | action->setToggleAction(TRUE); |
1170 | connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); | 1169 | connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); |
1171 | connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool))); | 1170 | connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool))); |
@@ -1222,7 +1221,7 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *nam | |||
1222 | y = configSettings->readNumEntry("/window y", 0, &ok); | 1221 | y = configSettings->readNumEntry("/window y", 0, &ok); |
1223 | if (ok) | 1222 | if (ok) |
1224 | move(x, y); | 1223 | move(x, y); |
1225 | QValueList<int> sizes = configSettings->readSizes("/split", &ok); | 1224 | Q3ValueList<int> sizes = configSettings->readSizes("/split", &ok); |
1226 | if (ok) | 1225 | if (ok) |
1227 | split->setSizes(sizes); | 1226 | split->setSizes(sizes); |
1228 | configSettings->endGroup(); | 1227 | configSettings->endGroup(); |
@@ -1275,8 +1274,14 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1275 | char title[256]; | 1274 | char title[256]; |
1276 | 1275 | ||
1277 | QDesktopWidget *d = configApp->desktop(); | 1276 | QDesktopWidget *d = configApp->desktop(); |
1278 | snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"), | 1277 | snprintf(title, sizeof(title), "%s%s", |
1279 | getenv("KERNELVERSION")); | 1278 | rootmenu.prompt->text, |
1279 | #if QT_VERSION < 0x040000 | ||
1280 | " (Qt3)" | ||
1281 | #else | ||
1282 | "" | ||
1283 | #endif | ||
1284 | ); | ||
1280 | setCaption(title); | 1285 | setCaption(title); |
1281 | 1286 | ||
1282 | width = configSettings->readNumEntry("/window width", d->width() - 64); | 1287 | width = configSettings->readNumEntry("/window width", d->width() - 64); |
@@ -1309,60 +1314,79 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1309 | configList->setFocus(); | 1314 | configList->setFocus(); |
1310 | 1315 | ||
1311 | menu = menuBar(); | 1316 | menu = menuBar(); |
1312 | toolBar = new QToolBar("Tools", this); | 1317 | toolBar = new Q3ToolBar("Tools", this); |
1313 | 1318 | ||
1314 | backAction = new QAction("Back", QPixmap(xpm_back), _("Back"), 0, this); | 1319 | backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0, this); |
1315 | connect(backAction, SIGNAL(activated()), SLOT(goBack())); | 1320 | connect(backAction, SIGNAL(activated()), SLOT(goBack())); |
1316 | backAction->setEnabled(FALSE); | 1321 | backAction->setEnabled(FALSE); |
1317 | QAction *quitAction = new QAction("Quit", _("&Quit"), Qt::CTRL + Qt::Key_Q, this); | 1322 | Q3Action *quitAction = new Q3Action("Quit", _("&Quit"), Qt::CTRL + Qt::Key_Q, this); |
1318 | connect(quitAction, SIGNAL(activated()), SLOT(close())); | 1323 | connect(quitAction, SIGNAL(activated()), SLOT(close())); |
1319 | QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), Qt::CTRL + Qt::Key_L, this); | 1324 | Q3Action *loadAction = new Q3Action("Load", QPixmap(xpm_load), _("&Load"), Qt::CTRL + Qt::Key_L, this); |
1320 | connect(loadAction, SIGNAL(activated()), SLOT(loadConfig())); | 1325 | connect(loadAction, SIGNAL(activated()), SLOT(loadConfig())); |
1321 | saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), Qt::CTRL + Qt::Key_S, this); | 1326 | saveAction = new Q3Action("Save", QPixmap(xpm_save), _("&Save"), Qt::CTRL + Qt::Key_S, this); |
1322 | connect(saveAction, SIGNAL(activated()), SLOT(saveConfig())); | 1327 | connect(saveAction, SIGNAL(activated()), SLOT(saveConfig())); |
1323 | conf_set_changed_callback(conf_changed); | 1328 | conf_set_changed_callback(conf_changed); |
1324 | // Set saveAction's initial state | 1329 | // Set saveAction's initial state |
1325 | conf_changed(); | 1330 | conf_changed(); |
1326 | QAction *saveAsAction = new QAction("Save As...", _("Save &As..."), 0, this); | 1331 | Q3Action *saveAsAction = new Q3Action("Save As...", _("Save &As..."), 0, this); |
1327 | connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs())); | 1332 | connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs())); |
1328 | QAction *searchAction = new QAction("Find", _("&Find"), Qt::CTRL + Qt::Key_F, this); | 1333 | Q3Action *searchAction = new Q3Action("Find", _("&Find"), Qt::CTRL + Qt::Key_F, this); |
1329 | connect(searchAction, SIGNAL(activated()), SLOT(searchConfig())); | 1334 | connect(searchAction, SIGNAL(activated()), SLOT(searchConfig())); |
1330 | QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), _("Single View"), 0, this); | 1335 | Q3Action *singleViewAction = new Q3Action("Single View", QPixmap(xpm_single_view), _("Single View"), 0, this); |
1331 | connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView())); | 1336 | connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView())); |
1332 | QAction *splitViewAction = new QAction("Split View", QPixmap(xpm_split_view), _("Split View"), 0, this); | 1337 | Q3Action *splitViewAction = new Q3Action("Split View", QPixmap(xpm_split_view), _("Split View"), 0, this); |
1333 | connect(splitViewAction, SIGNAL(activated()), SLOT(showSplitView())); | 1338 | connect(splitViewAction, SIGNAL(activated()), SLOT(showSplitView())); |
1334 | QAction *fullViewAction = new QAction("Full View", QPixmap(xpm_tree_view), _("Full View"), 0, this); | 1339 | Q3Action *fullViewAction = new Q3Action("Full View", QPixmap(xpm_tree_view), _("Full View"), 0, this); |
1335 | connect(fullViewAction, SIGNAL(activated()), SLOT(showFullView())); | 1340 | connect(fullViewAction, SIGNAL(activated()), SLOT(showFullView())); |
1336 | 1341 | ||
1337 | QAction *showNameAction = new QAction(NULL, _("Show Name"), 0, this); | 1342 | Q3Action *showNameAction = new Q3Action(NULL, _("Show Name"), 0, this); |
1338 | showNameAction->setToggleAction(TRUE); | 1343 | showNameAction->setToggleAction(TRUE); |
1339 | connect(showNameAction, SIGNAL(toggled(bool)), configView, SLOT(setShowName(bool))); | 1344 | connect(showNameAction, SIGNAL(toggled(bool)), configView, SLOT(setShowName(bool))); |
1340 | connect(configView, SIGNAL(showNameChanged(bool)), showNameAction, SLOT(setOn(bool))); | 1345 | connect(configView, SIGNAL(showNameChanged(bool)), showNameAction, SLOT(setOn(bool))); |
1341 | showNameAction->setOn(configView->showName()); | 1346 | showNameAction->setOn(configView->showName()); |
1342 | QAction *showRangeAction = new QAction(NULL, _("Show Range"), 0, this); | 1347 | Q3Action *showRangeAction = new Q3Action(NULL, _("Show Range"), 0, this); |
1343 | showRangeAction->setToggleAction(TRUE); | 1348 | showRangeAction->setToggleAction(TRUE); |
1344 | connect(showRangeAction, SIGNAL(toggled(bool)), configView, SLOT(setShowRange(bool))); | 1349 | connect(showRangeAction, SIGNAL(toggled(bool)), configView, SLOT(setShowRange(bool))); |
1345 | connect(configView, SIGNAL(showRangeChanged(bool)), showRangeAction, SLOT(setOn(bool))); | 1350 | connect(configView, SIGNAL(showRangeChanged(bool)), showRangeAction, SLOT(setOn(bool))); |
1346 | showRangeAction->setOn(configList->showRange); | 1351 | showRangeAction->setOn(configList->showRange); |
1347 | QAction *showDataAction = new QAction(NULL, _("Show Data"), 0, this); | 1352 | Q3Action *showDataAction = new Q3Action(NULL, _("Show Data"), 0, this); |
1348 | showDataAction->setToggleAction(TRUE); | 1353 | showDataAction->setToggleAction(TRUE); |
1349 | connect(showDataAction, SIGNAL(toggled(bool)), configView, SLOT(setShowData(bool))); | 1354 | connect(showDataAction, SIGNAL(toggled(bool)), configView, SLOT(setShowData(bool))); |
1350 | connect(configView, SIGNAL(showDataChanged(bool)), showDataAction, SLOT(setOn(bool))); | 1355 | connect(configView, SIGNAL(showDataChanged(bool)), showDataAction, SLOT(setOn(bool))); |
1351 | showDataAction->setOn(configList->showData); | 1356 | showDataAction->setOn(configList->showData); |
1352 | QAction *showAllAction = new QAction(NULL, _("Show All Options"), 0, this); | 1357 | |
1353 | showAllAction->setToggleAction(TRUE); | 1358 | QActionGroup *optGroup = new QActionGroup(this); |
1354 | connect(showAllAction, SIGNAL(toggled(bool)), configView, SLOT(setShowAll(bool))); | 1359 | optGroup->setExclusive(TRUE); |
1355 | connect(showAllAction, SIGNAL(toggled(bool)), menuView, SLOT(setShowAll(bool))); | 1360 | connect(optGroup, SIGNAL(selected(QAction *)), configView, |
1356 | showAllAction->setOn(configList->showAll); | 1361 | SLOT(setOptionMode(QAction *))); |
1357 | QAction *showDebugAction = new QAction(NULL, _("Show Debug Info"), 0, this); | 1362 | connect(optGroup, SIGNAL(selected(QAction *)), menuView, |
1363 | SLOT(setOptionMode(QAction *))); | ||
1364 | |||
1365 | #if QT_VERSION >= 0x040000 | ||
1366 | configView->showNormalAction = new QAction(_("Show Normal Options"), optGroup); | ||
1367 | configView->showAllAction = new QAction(_("Show All Options"), optGroup); | ||
1368 | configView->showPromptAction = new QAction(_("Show Prompt Options"), optGroup); | ||
1369 | #else | ||
1370 | configView->showNormalAction = new QAction(_("Show Normal Options"), 0, optGroup); | ||
1371 | configView->showAllAction = new QAction(_("Show All Options"), 0, optGroup); | ||
1372 | configView->showPromptAction = new QAction(_("Show Prompt Options"), 0, optGroup); | ||
1373 | #endif | ||
1374 | configView->showNormalAction->setToggleAction(TRUE); | ||
1375 | configView->showNormalAction->setOn(configList->optMode == normalOpt); | ||
1376 | configView->showAllAction->setToggleAction(TRUE); | ||
1377 | configView->showAllAction->setOn(configList->optMode == allOpt); | ||
1378 | configView->showPromptAction->setToggleAction(TRUE); | ||
1379 | configView->showPromptAction->setOn(configList->optMode == promptOpt); | ||
1380 | |||
1381 | Q3Action *showDebugAction = new Q3Action(NULL, _("Show Debug Info"), 0, this); | ||
1358 | showDebugAction->setToggleAction(TRUE); | 1382 | showDebugAction->setToggleAction(TRUE); |
1359 | connect(showDebugAction, SIGNAL(toggled(bool)), helpText, SLOT(setShowDebug(bool))); | 1383 | connect(showDebugAction, SIGNAL(toggled(bool)), helpText, SLOT(setShowDebug(bool))); |
1360 | connect(helpText, SIGNAL(showDebugChanged(bool)), showDebugAction, SLOT(setOn(bool))); | 1384 | connect(helpText, SIGNAL(showDebugChanged(bool)), showDebugAction, SLOT(setOn(bool))); |
1361 | showDebugAction->setOn(helpText->showDebug()); | 1385 | showDebugAction->setOn(helpText->showDebug()); |
1362 | 1386 | ||
1363 | QAction *showIntroAction = new QAction(NULL, _("Introduction"), 0, this); | 1387 | Q3Action *showIntroAction = new Q3Action(NULL, _("Introduction"), 0, this); |
1364 | connect(showIntroAction, SIGNAL(activated()), SLOT(showIntro())); | 1388 | connect(showIntroAction, SIGNAL(activated()), SLOT(showIntro())); |
1365 | QAction *showAboutAction = new QAction(NULL, _("About"), 0, this); | 1389 | Q3Action *showAboutAction = new Q3Action(NULL, _("About"), 0, this); |
1366 | connect(showAboutAction, SIGNAL(activated()), SLOT(showAbout())); | 1390 | connect(showAboutAction, SIGNAL(activated()), SLOT(showAbout())); |
1367 | 1391 | ||
1368 | // init tool bar | 1392 | // init tool bar |
@@ -1376,7 +1400,7 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1376 | fullViewAction->addTo(toolBar); | 1400 | fullViewAction->addTo(toolBar); |
1377 | 1401 | ||
1378 | // create config menu | 1402 | // create config menu |
1379 | QPopupMenu* config = new QPopupMenu(this); | 1403 | Q3PopupMenu* config = new Q3PopupMenu(this); |
1380 | menu->insertItem(_("&File"), config); | 1404 | menu->insertItem(_("&File"), config); |
1381 | loadAction->addTo(config); | 1405 | loadAction->addTo(config); |
1382 | saveAction->addTo(config); | 1406 | saveAction->addTo(config); |
@@ -1385,22 +1409,22 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1385 | quitAction->addTo(config); | 1409 | quitAction->addTo(config); |
1386 | 1410 | ||
1387 | // create edit menu | 1411 | // create edit menu |
1388 | QPopupMenu* editMenu = new QPopupMenu(this); | 1412 | Q3PopupMenu* editMenu = new Q3PopupMenu(this); |
1389 | menu->insertItem(_("&Edit"), editMenu); | 1413 | menu->insertItem(_("&Edit"), editMenu); |
1390 | searchAction->addTo(editMenu); | 1414 | searchAction->addTo(editMenu); |
1391 | 1415 | ||
1392 | // create options menu | 1416 | // create options menu |
1393 | QPopupMenu* optionMenu = new QPopupMenu(this); | 1417 | Q3PopupMenu* optionMenu = new Q3PopupMenu(this); |
1394 | menu->insertItem(_("&Option"), optionMenu); | 1418 | menu->insertItem(_("&Option"), optionMenu); |
1395 | showNameAction->addTo(optionMenu); | 1419 | showNameAction->addTo(optionMenu); |
1396 | showRangeAction->addTo(optionMenu); | 1420 | showRangeAction->addTo(optionMenu); |
1397 | showDataAction->addTo(optionMenu); | 1421 | showDataAction->addTo(optionMenu); |
1398 | optionMenu->insertSeparator(); | 1422 | optionMenu->insertSeparator(); |
1399 | showAllAction->addTo(optionMenu); | 1423 | optGroup->addTo(optionMenu); |
1400 | showDebugAction->addTo(optionMenu); | 1424 | optionMenu->insertSeparator(); |
1401 | 1425 | ||
1402 | // create help menu | 1426 | // create help menu |
1403 | QPopupMenu* helpMenu = new QPopupMenu(this); | 1427 | Q3PopupMenu* helpMenu = new Q3PopupMenu(this); |
1404 | menu->insertSeparator(); | 1428 | menu->insertSeparator(); |
1405 | menu->insertItem(_("&Help"), helpMenu); | 1429 | menu->insertItem(_("&Help"), helpMenu); |
1406 | showIntroAction->addTo(helpMenu); | 1430 | showIntroAction->addTo(helpMenu); |
@@ -1435,7 +1459,7 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1435 | showSplitView(); | 1459 | showSplitView(); |
1436 | 1460 | ||
1437 | // UI setup done, restore splitter positions | 1461 | // UI setup done, restore splitter positions |
1438 | QValueList<int> sizes = configSettings->readSizes("/split1", &ok); | 1462 | Q3ValueList<int> sizes = configSettings->readSizes("/split1", &ok); |
1439 | if (ok) | 1463 | if (ok) |
1440 | split1->setSizes(sizes); | 1464 | split1->setSizes(sizes); |
1441 | 1465 | ||
@@ -1446,7 +1470,7 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1446 | 1470 | ||
1447 | void ConfigMainWindow::loadConfig(void) | 1471 | void ConfigMainWindow::loadConfig(void) |
1448 | { | 1472 | { |
1449 | QString s = QFileDialog::getOpenFileName(conf_get_configname(), NULL, this); | 1473 | QString s = Q3FileDialog::getOpenFileName(conf_get_configname(), NULL, this); |
1450 | if (s.isNull()) | 1474 | if (s.isNull()) |
1451 | return; | 1475 | return; |
1452 | if (conf_read(QFile::encodeName(s))) | 1476 | if (conf_read(QFile::encodeName(s))) |
@@ -1462,7 +1486,7 @@ void ConfigMainWindow::saveConfig(void) | |||
1462 | 1486 | ||
1463 | void ConfigMainWindow::saveConfigAs(void) | 1487 | void ConfigMainWindow::saveConfigAs(void) |
1464 | { | 1488 | { |
1465 | QString s = QFileDialog::getSaveFileName(conf_get_configname(), NULL, this); | 1489 | QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this); |
1466 | if (s.isNull()) | 1490 | if (s.isNull()) |
1467 | return; | 1491 | return; |
1468 | if (conf_write(QFile::encodeName(s))) | 1492 | if (conf_write(QFile::encodeName(s))) |
@@ -1491,7 +1515,7 @@ void ConfigMainWindow::setMenuLink(struct menu *menu) | |||
1491 | ConfigList* list = NULL; | 1515 | ConfigList* list = NULL; |
1492 | ConfigItem* item; | 1516 | ConfigItem* item; |
1493 | 1517 | ||
1494 | if (!menu_is_visible(menu) && !configView->showAll()) | 1518 | if (configList->menuSkip(menu)) |
1495 | return; | 1519 | return; |
1496 | 1520 | ||
1497 | switch (configList->mode) { | 1521 | switch (configList->mode) { |
@@ -1631,7 +1655,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) | |||
1631 | 1655 | ||
1632 | void ConfigMainWindow::showIntro(void) | 1656 | void ConfigMainWindow::showIntro(void) |
1633 | { | 1657 | { |
1634 | static const QString str = _("Welcome to the qconf graphical kernel configuration tool for Linux.\n\n" | 1658 | static const QString str = _("Welcome to the qconf graphical configuration tool.\n\n" |
1635 | "For each option, a blank box indicates the feature is disabled, a check\n" | 1659 | "For each option, a blank box indicates the feature is disabled, a check\n" |
1636 | "indicates it is enabled, and a dot indicates that it is to be compiled\n" | 1660 | "indicates it is enabled, and a dot indicates that it is to be compiled\n" |
1637 | "as a module. Clicking on the box will cycle through the three states.\n\n" | 1661 | "as a module. Clicking on the box will cycle through the three states.\n\n" |
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index b3b5657b6b3..91677d900db 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h | |||
@@ -3,26 +3,25 @@ | |||
3 | * Released under the terms of the GNU GPL v2.0. | 3 | * Released under the terms of the GNU GPL v2.0. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #if QT_VERSION < 0x040000 | ||
6 | #include <qlistview.h> | 7 | #include <qlistview.h> |
7 | #if QT_VERSION >= 300 | ||
8 | #include <qsettings.h> | ||
9 | #else | 8 | #else |
10 | class QSettings { | 9 | #include <q3listview.h> |
11 | public: | 10 | #endif |
12 | void beginGroup(const QString& group) { } | 11 | #include <qsettings.h> |
13 | void endGroup(void) { } | 12 | |
14 | bool readBoolEntry(const QString& key, bool def = FALSE, bool* ok = 0) const | 13 | #if QT_VERSION < 0x040000 |
15 | { if (ok) *ok = FALSE; return def; } | 14 | #define Q3ValueList QValueList |
16 | int readNumEntry(const QString& key, int def = 0, bool* ok = 0) const | 15 | #define Q3PopupMenu QPopupMenu |
17 | { if (ok) *ok = FALSE; return def; } | 16 | #define Q3ListView QListView |
18 | QString readEntry(const QString& key, const QString& def = QString::null, bool* ok = 0) const | 17 | #define Q3ListViewItem QListViewItem |
19 | { if (ok) *ok = FALSE; return def; } | 18 | #define Q3VBox QVBox |
20 | QStringList readListEntry(const QString& key, bool* ok = 0) const | 19 | #define Q3TextBrowser QTextBrowser |
21 | { if (ok) *ok = FALSE; return QStringList(); } | 20 | #define Q3MainWindow QMainWindow |
22 | template <class t> | 21 | #define Q3Action QAction |
23 | bool writeEntry(const QString& key, t value) | 22 | #define Q3ToolBar QToolBar |
24 | { return TRUE; } | 23 | #define Q3ListViewItemIterator QListViewItemIterator |
25 | }; | 24 | #define Q3FileDialog QFileDialog |
26 | #endif | 25 | #endif |
27 | 26 | ||
28 | class ConfigView; | 27 | class ConfigView; |
@@ -31,11 +30,10 @@ class ConfigItem; | |||
31 | class ConfigLineEdit; | 30 | class ConfigLineEdit; |
32 | class ConfigMainWindow; | 31 | class ConfigMainWindow; |
33 | 32 | ||
34 | |||
35 | class ConfigSettings : public QSettings { | 33 | class ConfigSettings : public QSettings { |
36 | public: | 34 | public: |
37 | QValueList<int> readSizes(const QString& key, bool *ok); | 35 | Q3ValueList<int> readSizes(const QString& key, bool *ok); |
38 | bool writeSizes(const QString& key, const QValueList<int>& value); | 36 | bool writeSizes(const QString& key, const Q3ValueList<int>& value); |
39 | }; | 37 | }; |
40 | 38 | ||
41 | enum colIdx { | 39 | enum colIdx { |
@@ -44,10 +42,13 @@ enum colIdx { | |||
44 | enum listMode { | 42 | enum listMode { |
45 | singleMode, menuMode, symbolMode, fullMode, listMode | 43 | singleMode, menuMode, symbolMode, fullMode, listMode |
46 | }; | 44 | }; |
45 | enum optionMode { | ||
46 | normalOpt = 0, allOpt, promptOpt | ||
47 | }; | ||
47 | 48 | ||
48 | class ConfigList : public QListView { | 49 | class ConfigList : public Q3ListView { |
49 | Q_OBJECT | 50 | Q_OBJECT |
50 | typedef class QListView Parent; | 51 | typedef class Q3ListView Parent; |
51 | public: | 52 | public: |
52 | ConfigList(ConfigView* p, const char *name = 0); | 53 | ConfigList(ConfigView* p, const char *name = 0); |
53 | void reinit(void); | 54 | void reinit(void); |
@@ -115,6 +116,8 @@ public: | |||
115 | void setAllOpen(bool open); | 116 | void setAllOpen(bool open); |
116 | void setParentMenu(void); | 117 | void setParentMenu(void); |
117 | 118 | ||
119 | bool menuSkip(struct menu *); | ||
120 | |||
118 | template <class P> | 121 | template <class P> |
119 | void updateMenuList(P*, struct menu*); | 122 | void updateMenuList(P*, struct menu*); |
120 | 123 | ||
@@ -124,22 +127,23 @@ public: | |||
124 | QPixmap choiceYesPix, choiceNoPix; | 127 | QPixmap choiceYesPix, choiceNoPix; |
125 | QPixmap menuPix, menuInvPix, menuBackPix, voidPix; | 128 | QPixmap menuPix, menuInvPix, menuBackPix, voidPix; |
126 | 129 | ||
127 | bool showAll, showName, showRange, showData; | 130 | bool showName, showRange, showData; |
128 | enum listMode mode; | 131 | enum listMode mode; |
132 | enum optionMode optMode; | ||
129 | struct menu *rootEntry; | 133 | struct menu *rootEntry; |
130 | QColorGroup disabledColorGroup; | 134 | QColorGroup disabledColorGroup; |
131 | QColorGroup inactivedColorGroup; | 135 | QColorGroup inactivedColorGroup; |
132 | QPopupMenu* headerPopup; | 136 | Q3PopupMenu* headerPopup; |
133 | 137 | ||
134 | private: | 138 | private: |
135 | int colMap[colNr]; | 139 | int colMap[colNr]; |
136 | int colRevMap[colNr]; | 140 | int colRevMap[colNr]; |
137 | }; | 141 | }; |
138 | 142 | ||
139 | class ConfigItem : public QListViewItem { | 143 | class ConfigItem : public Q3ListViewItem { |
140 | typedef class QListViewItem Parent; | 144 | typedef class Q3ListViewItem Parent; |
141 | public: | 145 | public: |
142 | ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool v) | 146 | ConfigItem(Q3ListView *parent, ConfigItem *after, struct menu *m, bool v) |
143 | : Parent(parent, after), menu(m), visible(v), goParent(false) | 147 | : Parent(parent, after), menu(m), visible(v), goParent(false) |
144 | { | 148 | { |
145 | init(); | 149 | init(); |
@@ -149,16 +153,14 @@ public: | |||
149 | { | 153 | { |
150 | init(); | 154 | init(); |
151 | } | 155 | } |
152 | ConfigItem(QListView *parent, ConfigItem *after, bool v) | 156 | ConfigItem(Q3ListView *parent, ConfigItem *after, bool v) |
153 | : Parent(parent, after), menu(0), visible(v), goParent(true) | 157 | : Parent(parent, after), menu(0), visible(v), goParent(true) |
154 | { | 158 | { |
155 | init(); | 159 | init(); |
156 | } | 160 | } |
157 | ~ConfigItem(void); | 161 | ~ConfigItem(void); |
158 | void init(void); | 162 | void init(void); |
159 | #if QT_VERSION >= 300 | ||
160 | void okRename(int col); | 163 | void okRename(int col); |
161 | #endif | ||
162 | void updateMenu(void); | 164 | void updateMenu(void); |
163 | void testUpdateMenu(bool v); | 165 | void testUpdateMenu(bool v); |
164 | ConfigList* listView() const | 166 | ConfigList* listView() const |
@@ -213,26 +215,24 @@ public: | |||
213 | ConfigItem *item; | 215 | ConfigItem *item; |
214 | }; | 216 | }; |
215 | 217 | ||
216 | class ConfigView : public QVBox { | 218 | class ConfigView : public Q3VBox { |
217 | Q_OBJECT | 219 | Q_OBJECT |
218 | typedef class QVBox Parent; | 220 | typedef class Q3VBox Parent; |
219 | public: | 221 | public: |
220 | ConfigView(QWidget* parent, const char *name = 0); | 222 | ConfigView(QWidget* parent, const char *name = 0); |
221 | ~ConfigView(void); | 223 | ~ConfigView(void); |
222 | static void updateList(ConfigItem* item); | 224 | static void updateList(ConfigItem* item); |
223 | static void updateListAll(void); | 225 | static void updateListAll(void); |
224 | 226 | ||
225 | bool showAll(void) const { return list->showAll; } | ||
226 | bool showName(void) const { return list->showName; } | 227 | bool showName(void) const { return list->showName; } |
227 | bool showRange(void) const { return list->showRange; } | 228 | bool showRange(void) const { return list->showRange; } |
228 | bool showData(void) const { return list->showData; } | 229 | bool showData(void) const { return list->showData; } |
229 | public slots: | 230 | public slots: |
230 | void setShowAll(bool); | ||
231 | void setShowName(bool); | 231 | void setShowName(bool); |
232 | void setShowRange(bool); | 232 | void setShowRange(bool); |
233 | void setShowData(bool); | 233 | void setShowData(bool); |
234 | void setOptionMode(QAction *); | ||
234 | signals: | 235 | signals: |
235 | void showAllChanged(bool); | ||
236 | void showNameChanged(bool); | 236 | void showNameChanged(bool); |
237 | void showRangeChanged(bool); | 237 | void showRangeChanged(bool); |
238 | void showDataChanged(bool); | 238 | void showDataChanged(bool); |
@@ -242,11 +242,15 @@ public: | |||
242 | 242 | ||
243 | static ConfigView* viewList; | 243 | static ConfigView* viewList; |
244 | ConfigView* nextView; | 244 | ConfigView* nextView; |
245 | |||
246 | static QAction *showNormalAction; | ||
247 | static QAction *showAllAction; | ||
248 | static QAction *showPromptAction; | ||
245 | }; | 249 | }; |
246 | 250 | ||
247 | class ConfigInfoView : public QTextBrowser { | 251 | class ConfigInfoView : public Q3TextBrowser { |
248 | Q_OBJECT | 252 | Q_OBJECT |
249 | typedef class QTextBrowser Parent; | 253 | typedef class Q3TextBrowser Parent; |
250 | public: | 254 | public: |
251 | ConfigInfoView(QWidget* parent, const char *name = 0); | 255 | ConfigInfoView(QWidget* parent, const char *name = 0); |
252 | bool showDebug(void) const { return _showDebug; } | 256 | bool showDebug(void) const { return _showDebug; } |
@@ -254,7 +258,6 @@ public: | |||
254 | public slots: | 258 | public slots: |
255 | void setInfo(struct menu *menu); | 259 | void setInfo(struct menu *menu); |
256 | void saveSettings(void); | 260 | void saveSettings(void); |
257 | void setSource(const QString& name); | ||
258 | void setShowDebug(bool); | 261 | void setShowDebug(bool); |
259 | 262 | ||
260 | signals: | 263 | signals: |
@@ -267,11 +270,11 @@ protected: | |||
267 | QString debug_info(struct symbol *sym); | 270 | QString debug_info(struct symbol *sym); |
268 | static QString print_filter(const QString &str); | 271 | static QString print_filter(const QString &str); |
269 | static void expr_print_help(void *data, struct symbol *sym, const char *str); | 272 | static void expr_print_help(void *data, struct symbol *sym, const char *str); |
270 | QPopupMenu* createPopupMenu(const QPoint& pos); | 273 | Q3PopupMenu* createPopupMenu(const QPoint& pos); |
271 | void contentsContextMenuEvent(QContextMenuEvent *e); | 274 | void contentsContextMenuEvent(QContextMenuEvent *e); |
272 | 275 | ||
273 | struct symbol *sym; | 276 | struct symbol *sym; |
274 | struct menu *menu; | 277 | struct menu *_menu; |
275 | bool _showDebug; | 278 | bool _showDebug; |
276 | }; | 279 | }; |
277 | 280 | ||
@@ -295,10 +298,10 @@ protected: | |||
295 | struct symbol **result; | 298 | struct symbol **result; |
296 | }; | 299 | }; |
297 | 300 | ||
298 | class ConfigMainWindow : public QMainWindow { | 301 | class ConfigMainWindow : public Q3MainWindow { |
299 | Q_OBJECT | 302 | Q_OBJECT |
300 | 303 | ||
301 | static QAction *saveAction; | 304 | static Q3Action *saveAction; |
302 | static void conf_changed(void); | 305 | static void conf_changed(void); |
303 | public: | 306 | public: |
304 | ConfigMainWindow(void); | 307 | ConfigMainWindow(void); |
@@ -327,8 +330,8 @@ protected: | |||
327 | ConfigView *configView; | 330 | ConfigView *configView; |
328 | ConfigList *configList; | 331 | ConfigList *configList; |
329 | ConfigInfoView *helpText; | 332 | ConfigInfoView *helpText; |
330 | QToolBar *toolBar; | 333 | Q3ToolBar *toolBar; |
331 | QAction *backAction; | 334 | Q3Action *backAction; |
332 | QSplitter* split1; | 335 | QSplitter* split1; |
333 | QSplitter* split2; | 336 | QSplitter* split2; |
334 | }; | 337 | }; |
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 0d800820c3c..fd81fc33d63 100644 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl | |||
@@ -42,6 +42,8 @@ | |||
42 | # mv config_strip .config | 42 | # mv config_strip .config |
43 | # make oldconfig | 43 | # make oldconfig |
44 | # | 44 | # |
45 | use strict; | ||
46 | |||
45 | my $config = ".config"; | 47 | my $config = ".config"; |
46 | 48 | ||
47 | my $uname = `uname -r`; | 49 | my $uname = `uname -r`; |
@@ -113,14 +115,18 @@ find_config; | |||
113 | # Get the build source and top level Kconfig file (passed in) | 115 | # Get the build source and top level Kconfig file (passed in) |
114 | my $ksource = $ARGV[0]; | 116 | my $ksource = $ARGV[0]; |
115 | my $kconfig = $ARGV[1]; | 117 | my $kconfig = $ARGV[1]; |
118 | my $lsmod_file = $ARGV[2]; | ||
119 | |||
120 | my @makefiles = `find $ksource -name Makefile 2>/dev/null`; | ||
121 | chomp @makefiles; | ||
116 | 122 | ||
117 | my @makefiles = `find $ksource -name Makefile`; | ||
118 | my %depends; | 123 | my %depends; |
119 | my %selects; | 124 | my %selects; |
120 | my %prompts; | 125 | my %prompts; |
121 | my %objects; | 126 | my %objects; |
122 | my $var; | 127 | my $var; |
123 | my $cont = 0; | 128 | my $iflevel = 0; |
129 | my @ifdeps; | ||
124 | 130 | ||
125 | # prevent recursion | 131 | # prevent recursion |
126 | my %read_kconfigs; | 132 | my %read_kconfigs; |
@@ -132,19 +138,54 @@ sub read_kconfig { | |||
132 | my $config; | 138 | my $config; |
133 | my @kconfigs; | 139 | my @kconfigs; |
134 | 140 | ||
135 | open(KIN, "$ksource/$kconfig") || die "Can't open $kconfig"; | 141 | my $cont = 0; |
142 | my $line; | ||
143 | |||
144 | my $source = "$ksource/$kconfig"; | ||
145 | my $last_source = ""; | ||
146 | |||
147 | # Check for any environment variables used | ||
148 | while ($source =~ /\$(\w+)/ && $last_source ne $source) { | ||
149 | my $env = $1; | ||
150 | $last_source = $source; | ||
151 | $source =~ s/\$$env/$ENV{$env}/; | ||
152 | } | ||
153 | |||
154 | open(KIN, "$source") || die "Can't open $kconfig"; | ||
136 | while (<KIN>) { | 155 | while (<KIN>) { |
137 | chomp; | 156 | chomp; |
138 | 157 | ||
158 | # Make sure that lines ending with \ continue | ||
159 | if ($cont) { | ||
160 | $_ = $line . " " . $_; | ||
161 | } | ||
162 | |||
163 | if (s/\\$//) { | ||
164 | $cont = 1; | ||
165 | $line = $_; | ||
166 | next; | ||
167 | } | ||
168 | |||
169 | $cont = 0; | ||
170 | |||
139 | # collect any Kconfig sources | 171 | # collect any Kconfig sources |
140 | if (/^source\s*"(.*)"/) { | 172 | if (/^source\s*"(.*)"/) { |
141 | $kconfigs[$#kconfigs+1] = $1; | 173 | $kconfigs[$#kconfigs+1] = $1; |
142 | } | 174 | } |
143 | 175 | ||
144 | # configs found | 176 | # configs found |
145 | if (/^\s*config\s+(\S+)\s*$/) { | 177 | if (/^\s*(menu)?config\s+(\S+)\s*$/) { |
146 | $state = "NEW"; | 178 | $state = "NEW"; |
147 | $config = $1; | 179 | $config = $2; |
180 | |||
181 | for (my $i = 0; $i < $iflevel; $i++) { | ||
182 | if ($i) { | ||
183 | $depends{$config} .= " " . $ifdeps[$i]; | ||
184 | } else { | ||
185 | $depends{$config} = $ifdeps[$i]; | ||
186 | } | ||
187 | $state = "DEP"; | ||
188 | } | ||
148 | 189 | ||
149 | # collect the depends for the config | 190 | # collect the depends for the config |
150 | } elsif ($state eq "NEW" && /^\s*depends\s+on\s+(.*)$/) { | 191 | } elsif ($state eq "NEW" && /^\s*depends\s+on\s+(.*)$/) { |
@@ -164,7 +205,22 @@ sub read_kconfig { | |||
164 | # configs without prompts must be selected | 205 | # configs without prompts must be selected |
165 | } elsif ($state ne "NONE" && /^\s*tristate\s\S/) { | 206 | } elsif ($state ne "NONE" && /^\s*tristate\s\S/) { |
166 | # note if the config has a prompt | 207 | # note if the config has a prompt |
167 | $prompt{$config} = 1; | 208 | $prompts{$config} = 1; |
209 | |||
210 | # Check for if statements | ||
211 | } elsif (/^if\s+(.*\S)\s*$/) { | ||
212 | my $deps = $1; | ||
213 | # remove beginning and ending non text | ||
214 | $deps =~ s/^[^a-zA-Z0-9_]*//; | ||
215 | $deps =~ s/[^a-zA-Z0-9_]*$//; | ||
216 | |||
217 | my @deps = split /[^a-zA-Z0-9_]+/, $deps; | ||
218 | |||
219 | $ifdeps[$iflevel++] = join ':', @deps; | ||
220 | |||
221 | } elsif (/^endif/) { | ||
222 | |||
223 | $iflevel-- if ($iflevel); | ||
168 | 224 | ||
169 | # stop on "help" | 225 | # stop on "help" |
170 | } elsif (/^\s*help\s*$/) { | 226 | } elsif (/^\s*help\s*$/) { |
@@ -188,7 +244,8 @@ if ($kconfig) { | |||
188 | 244 | ||
189 | # Read all Makefiles to map the configs to the objects | 245 | # Read all Makefiles to map the configs to the objects |
190 | foreach my $makefile (@makefiles) { | 246 | foreach my $makefile (@makefiles) { |
191 | chomp $makefile; | 247 | |
248 | my $cont = 0; | ||
192 | 249 | ||
193 | open(MIN,$makefile) || die "Can't open $makefile"; | 250 | open(MIN,$makefile) || die "Can't open $makefile"; |
194 | while (<MIN>) { | 251 | while (<MIN>) { |
@@ -215,7 +272,7 @@ foreach my $makefile (@makefiles) { | |||
215 | foreach my $obj (split /\s+/,$objs) { | 272 | foreach my $obj (split /\s+/,$objs) { |
216 | $obj =~ s/-/_/g; | 273 | $obj =~ s/-/_/g; |
217 | if ($obj =~ /(.*)\.o$/) { | 274 | if ($obj =~ /(.*)\.o$/) { |
218 | # Objects may bes enabled by more than one config. | 275 | # Objects may be enabled by more than one config. |
219 | # Store configs in an array. | 276 | # Store configs in an array. |
220 | my @arr; | 277 | my @arr; |
221 | 278 | ||
@@ -237,8 +294,36 @@ foreach my $makefile (@makefiles) { | |||
237 | 294 | ||
238 | my %modules; | 295 | my %modules; |
239 | 296 | ||
240 | # see what modules are loaded on this system | 297 | if (defined($lsmod_file)) { |
241 | open(LIN,"/sbin/lsmod|") || die "Cant lsmod"; | 298 | if ( ! -f $lsmod_file) { |
299 | die "$lsmod_file not found"; | ||
300 | } | ||
301 | if ( -x $lsmod_file) { | ||
302 | # the file is executable, run it | ||
303 | open(LIN, "$lsmod_file|"); | ||
304 | } else { | ||
305 | # Just read the contents | ||
306 | open(LIN, "$lsmod_file"); | ||
307 | } | ||
308 | } else { | ||
309 | |||
310 | # see what modules are loaded on this system | ||
311 | my $lsmod; | ||
312 | |||
313 | foreach my $dir ( ("/sbin", "/bin", "/usr/sbin", "/usr/bin") ) { | ||
314 | if ( -x "$dir/lsmod" ) { | ||
315 | $lsmod = "$dir/lsmod"; | ||
316 | last; | ||
317 | } | ||
318 | } | ||
319 | if (!defined($lsmod)) { | ||
320 | # try just the path | ||
321 | $lsmod = "lsmod"; | ||
322 | } | ||
323 | |||
324 | open(LIN,"$lsmod|") || die "Can not call lsmod with $lsmod"; | ||
325 | } | ||
326 | |||
242 | while (<LIN>) { | 327 | while (<LIN>) { |
243 | next if (/^Module/); # Skip the first line. | 328 | next if (/^Module/); # Skip the first line. |
244 | if (/^(\S+)/) { | 329 | if (/^(\S+)/) { |
@@ -252,7 +337,7 @@ close (LIN); | |||
252 | my %configs; | 337 | my %configs; |
253 | foreach my $module (keys(%modules)) { | 338 | foreach my $module (keys(%modules)) { |
254 | if (defined($objects{$module})) { | 339 | if (defined($objects{$module})) { |
255 | @arr = @{$objects{$module}}; | 340 | my @arr = @{$objects{$module}}; |
256 | foreach my $conf (@arr) { | 341 | foreach my $conf (@arr) { |
257 | $configs{$conf} = $module; | 342 | $configs{$conf} = $module; |
258 | } | 343 | } |
@@ -307,7 +392,7 @@ while ($repeat) { | |||
307 | parse_config_dep_select $depends{$config}; | 392 | parse_config_dep_select $depends{$config}; |
308 | } | 393 | } |
309 | 394 | ||
310 | if (defined($prompt{$config}) || !defined($selects{$config})) { | 395 | if (defined($prompts{$config}) || !defined($selects{$config})) { |
311 | next; | 396 | next; |
312 | } | 397 | } |
313 | 398 | ||
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 2e7a048e0cf..a796c95fe8a 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c | |||
@@ -205,6 +205,16 @@ static void sym_calc_visibility(struct symbol *sym) | |||
205 | } | 205 | } |
206 | if (sym_is_choice_value(sym)) | 206 | if (sym_is_choice_value(sym)) |
207 | return; | 207 | return; |
208 | /* defaulting to "yes" if no explicit "depends on" are given */ | ||
209 | tri = yes; | ||
210 | if (sym->dir_dep.expr) | ||
211 | tri = expr_calc_value(sym->dir_dep.expr); | ||
212 | if (tri == mod) | ||
213 | tri = yes; | ||
214 | if (sym->dir_dep.tri != tri) { | ||
215 | sym->dir_dep.tri = tri; | ||
216 | sym_set_changed(sym); | ||
217 | } | ||
208 | tri = no; | 218 | tri = no; |
209 | if (sym->rev_dep.expr) | 219 | if (sym->rev_dep.expr) |
210 | tri = expr_calc_value(sym->rev_dep.expr); | 220 | tri = expr_calc_value(sym->rev_dep.expr); |
@@ -216,44 +226,63 @@ static void sym_calc_visibility(struct symbol *sym) | |||
216 | } | 226 | } |
217 | } | 227 | } |
218 | 228 | ||
219 | static struct symbol *sym_calc_choice(struct symbol *sym) | 229 | /* |
230 | * Find the default symbol for a choice. | ||
231 | * First try the default values for the choice symbol | ||
232 | * Next locate the first visible choice value | ||
233 | * Return NULL if none was found | ||
234 | */ | ||
235 | struct symbol *sym_choice_default(struct symbol *sym) | ||
220 | { | 236 | { |
221 | struct symbol *def_sym; | 237 | struct symbol *def_sym; |
222 | struct property *prop; | 238 | struct property *prop; |
223 | struct expr *e; | 239 | struct expr *e; |
224 | 240 | ||
225 | /* is the user choice visible? */ | ||
226 | def_sym = sym->def[S_DEF_USER].val; | ||
227 | if (def_sym) { | ||
228 | sym_calc_visibility(def_sym); | ||
229 | if (def_sym->visible != no) | ||
230 | return def_sym; | ||
231 | } | ||
232 | |||
233 | /* any of the defaults visible? */ | 241 | /* any of the defaults visible? */ |
234 | for_all_defaults(sym, prop) { | 242 | for_all_defaults(sym, prop) { |
235 | prop->visible.tri = expr_calc_value(prop->visible.expr); | 243 | prop->visible.tri = expr_calc_value(prop->visible.expr); |
236 | if (prop->visible.tri == no) | 244 | if (prop->visible.tri == no) |
237 | continue; | 245 | continue; |
238 | def_sym = prop_get_symbol(prop); | 246 | def_sym = prop_get_symbol(prop); |
239 | sym_calc_visibility(def_sym); | ||
240 | if (def_sym->visible != no) | 247 | if (def_sym->visible != no) |
241 | return def_sym; | 248 | return def_sym; |
242 | } | 249 | } |
243 | 250 | ||
244 | /* just get the first visible value */ | 251 | /* just get the first visible value */ |
245 | prop = sym_get_choice_prop(sym); | 252 | prop = sym_get_choice_prop(sym); |
246 | expr_list_for_each_sym(prop->expr, e, def_sym) { | 253 | expr_list_for_each_sym(prop->expr, e, def_sym) |
247 | sym_calc_visibility(def_sym); | ||
248 | if (def_sym->visible != no) | 254 | if (def_sym->visible != no) |
249 | return def_sym; | 255 | return def_sym; |
250 | } | ||
251 | 256 | ||
252 | /* no choice? reset tristate value */ | 257 | /* failed to locate any defaults */ |
253 | sym->curr.tri = no; | ||
254 | return NULL; | 258 | return NULL; |
255 | } | 259 | } |
256 | 260 | ||
261 | static struct symbol *sym_calc_choice(struct symbol *sym) | ||
262 | { | ||
263 | struct symbol *def_sym; | ||
264 | struct property *prop; | ||
265 | struct expr *e; | ||
266 | |||
267 | /* first calculate all choice values' visibilities */ | ||
268 | prop = sym_get_choice_prop(sym); | ||
269 | expr_list_for_each_sym(prop->expr, e, def_sym) | ||
270 | sym_calc_visibility(def_sym); | ||
271 | |||
272 | /* is the user choice visible? */ | ||
273 | def_sym = sym->def[S_DEF_USER].val; | ||
274 | if (def_sym && def_sym->visible != no) | ||
275 | return def_sym; | ||
276 | |||
277 | def_sym = sym_choice_default(sym); | ||
278 | |||
279 | if (def_sym == NULL) | ||
280 | /* no choice? reset tristate value */ | ||
281 | sym->curr.tri = no; | ||
282 | |||
283 | return def_sym; | ||
284 | } | ||
285 | |||
257 | void sym_calc_value(struct symbol *sym) | 286 | void sym_calc_value(struct symbol *sym) |
258 | { | 287 | { |
259 | struct symbol_value newval, oldval; | 288 | struct symbol_value newval, oldval; |
@@ -321,6 +350,18 @@ void sym_calc_value(struct symbol *sym) | |||
321 | } | 350 | } |
322 | } | 351 | } |
323 | calc_newval: | 352 | calc_newval: |
353 | if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) { | ||
354 | struct expr *e; | ||
355 | e = expr_simplify_unmet_dep(sym->rev_dep.expr, | ||
356 | sym->dir_dep.expr); | ||
357 | fprintf(stderr, "warning: ("); | ||
358 | expr_fprint(e, stderr); | ||
359 | fprintf(stderr, ") selects %s which has unmet direct dependencies (", | ||
360 | sym->name); | ||
361 | expr_fprint(sym->dir_dep.expr, stderr); | ||
362 | fprintf(stderr, ")\n"); | ||
363 | expr_free(e); | ||
364 | } | ||
324 | newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri); | 365 | newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri); |
325 | } | 366 | } |
326 | if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN) | 367 | if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN) |
@@ -365,12 +406,13 @@ void sym_calc_value(struct symbol *sym) | |||
365 | 406 | ||
366 | if (sym_is_choice(sym)) { | 407 | if (sym_is_choice(sym)) { |
367 | struct symbol *choice_sym; | 408 | struct symbol *choice_sym; |
368 | int flags = sym->flags & (SYMBOL_CHANGED | SYMBOL_WRITE); | ||
369 | 409 | ||
370 | prop = sym_get_choice_prop(sym); | 410 | prop = sym_get_choice_prop(sym); |
371 | expr_list_for_each_sym(prop->expr, e, choice_sym) { | 411 | expr_list_for_each_sym(prop->expr, e, choice_sym) { |
372 | choice_sym->flags |= flags; | 412 | if ((sym->flags & SYMBOL_WRITE) && |
373 | if (flags & SYMBOL_CHANGED) | 413 | choice_sym->visible != no) |
414 | choice_sym->flags |= SYMBOL_WRITE; | ||
415 | if (sym->flags & SYMBOL_CHANGED) | ||
374 | sym_set_changed(choice_sym); | 416 | sym_set_changed(choice_sym); |
375 | } | 417 | } |
376 | } | 418 | } |
@@ -623,6 +665,80 @@ bool sym_set_string_value(struct symbol *sym, const char *newval) | |||
623 | return true; | 665 | return true; |
624 | } | 666 | } |
625 | 667 | ||
668 | /* | ||
669 | * Find the default value associated to a symbol. | ||
670 | * For tristate symbol handle the modules=n case | ||
671 | * in which case "m" becomes "y". | ||
672 | * If the symbol does not have any default then fallback | ||
673 | * to the fixed default values. | ||
674 | */ | ||
675 | const char *sym_get_string_default(struct symbol *sym) | ||
676 | { | ||
677 | struct property *prop; | ||
678 | struct symbol *ds; | ||
679 | const char *str; | ||
680 | tristate val; | ||
681 | |||
682 | sym_calc_visibility(sym); | ||
683 | sym_calc_value(modules_sym); | ||
684 | val = symbol_no.curr.tri; | ||
685 | str = symbol_empty.curr.val; | ||
686 | |||
687 | /* If symbol has a default value look it up */ | ||
688 | prop = sym_get_default_prop(sym); | ||
689 | if (prop != NULL) { | ||
690 | switch (sym->type) { | ||
691 | case S_BOOLEAN: | ||
692 | case S_TRISTATE: | ||
693 | /* The visibility may limit the value from yes => mod */ | ||
694 | val = EXPR_AND(expr_calc_value(prop->expr), prop->visible.tri); | ||
695 | break; | ||
696 | default: | ||
697 | /* | ||
698 | * The following fails to handle the situation | ||
699 | * where a default value is further limited by | ||
700 | * the valid range. | ||
701 | */ | ||
702 | ds = prop_get_symbol(prop); | ||
703 | if (ds != NULL) { | ||
704 | sym_calc_value(ds); | ||
705 | str = (const char *)ds->curr.val; | ||
706 | } | ||
707 | } | ||
708 | } | ||
709 | |||
710 | /* Handle select statements */ | ||
711 | val = EXPR_OR(val, sym->rev_dep.tri); | ||
712 | |||
713 | /* transpose mod to yes if modules are not enabled */ | ||
714 | if (val == mod) | ||
715 | if (!sym_is_choice_value(sym) && modules_sym->curr.tri == no) | ||
716 | val = yes; | ||
717 | |||
718 | /* transpose mod to yes if type is bool */ | ||
719 | if (sym->type == S_BOOLEAN && val == mod) | ||
720 | val = yes; | ||
721 | |||
722 | switch (sym->type) { | ||
723 | case S_BOOLEAN: | ||
724 | case S_TRISTATE: | ||
725 | switch (val) { | ||
726 | case no: return "n"; | ||
727 | case mod: return "m"; | ||
728 | case yes: return "y"; | ||
729 | } | ||
730 | case S_INT: | ||
731 | case S_HEX: | ||
732 | return str; | ||
733 | case S_STRING: | ||
734 | return str; | ||
735 | case S_OTHER: | ||
736 | case S_UNKNOWN: | ||
737 | break; | ||
738 | } | ||
739 | return ""; | ||
740 | } | ||
741 | |||
626 | const char *sym_get_string_value(struct symbol *sym) | 742 | const char *sym_get_string_value(struct symbol *sym) |
627 | { | 743 | { |
628 | tristate val; | 744 | tristate val; |
@@ -728,6 +844,55 @@ struct symbol *sym_find(const char *name) | |||
728 | return symbol; | 844 | return symbol; |
729 | } | 845 | } |
730 | 846 | ||
847 | /* | ||
848 | * Expand symbol's names embedded in the string given in argument. Symbols' | ||
849 | * name to be expanded shall be prefixed by a '$'. Unknown symbol expands to | ||
850 | * the empty string. | ||
851 | */ | ||
852 | const char *sym_expand_string_value(const char *in) | ||
853 | { | ||
854 | const char *src; | ||
855 | char *res; | ||
856 | size_t reslen; | ||
857 | |||
858 | reslen = strlen(in) + 1; | ||
859 | res = malloc(reslen); | ||
860 | res[0] = '\0'; | ||
861 | |||
862 | while ((src = strchr(in, '$'))) { | ||
863 | char *p, name[SYMBOL_MAXLENGTH]; | ||
864 | const char *symval = ""; | ||
865 | struct symbol *sym; | ||
866 | size_t newlen; | ||
867 | |||
868 | strncat(res, in, src - in); | ||
869 | src++; | ||
870 | |||
871 | p = name; | ||
872 | while (isalnum(*src) || *src == '_') | ||
873 | *p++ = *src++; | ||
874 | *p = '\0'; | ||
875 | |||
876 | sym = sym_find(name); | ||
877 | if (sym != NULL) { | ||
878 | sym_calc_value(sym); | ||
879 | symval = sym_get_string_value(sym); | ||
880 | } | ||
881 | |||
882 | newlen = strlen(res) + strlen(symval) + strlen(src) + 1; | ||
883 | if (newlen > reslen) { | ||
884 | reslen = newlen; | ||
885 | res = realloc(res, reslen); | ||
886 | } | ||
887 | |||
888 | strcat(res, symval); | ||
889 | in = src; | ||
890 | } | ||
891 | strcat(res, in); | ||
892 | |||
893 | return res; | ||
894 | } | ||
895 | |||
731 | struct symbol **sym_re_search(const char *pattern) | 896 | struct symbol **sym_re_search(const char *pattern) |
732 | { | 897 | { |
733 | struct symbol *sym, **sym_arr = NULL; | 898 | struct symbol *sym, **sym_arr = NULL; |
@@ -765,6 +930,112 @@ struct symbol **sym_re_search(const char *pattern) | |||
765 | return sym_arr; | 930 | return sym_arr; |
766 | } | 931 | } |
767 | 932 | ||
933 | /* | ||
934 | * When we check for recursive dependencies we use a stack to save | ||
935 | * current state so we can print out relevant info to user. | ||
936 | * The entries are located on the call stack so no need to free memory. | ||
937 | * Note inser() remove() must always match to properly clear the stack. | ||
938 | */ | ||
939 | static struct dep_stack { | ||
940 | struct dep_stack *prev, *next; | ||
941 | struct symbol *sym; | ||
942 | struct property *prop; | ||
943 | struct expr *expr; | ||
944 | } *check_top; | ||
945 | |||
946 | static void dep_stack_insert(struct dep_stack *stack, struct symbol *sym) | ||
947 | { | ||
948 | memset(stack, 0, sizeof(*stack)); | ||
949 | if (check_top) | ||
950 | check_top->next = stack; | ||
951 | stack->prev = check_top; | ||
952 | stack->sym = sym; | ||
953 | check_top = stack; | ||
954 | } | ||
955 | |||
956 | static void dep_stack_remove(void) | ||
957 | { | ||
958 | check_top = check_top->prev; | ||
959 | if (check_top) | ||
960 | check_top->next = NULL; | ||
961 | } | ||
962 | |||
963 | /* | ||
964 | * Called when we have detected a recursive dependency. | ||
965 | * check_top point to the top of the stact so we use | ||
966 | * the ->prev pointer to locate the bottom of the stack. | ||
967 | */ | ||
968 | static void sym_check_print_recursive(struct symbol *last_sym) | ||
969 | { | ||
970 | struct dep_stack *stack; | ||
971 | struct symbol *sym, *next_sym; | ||
972 | struct menu *menu = NULL; | ||
973 | struct property *prop; | ||
974 | struct dep_stack cv_stack; | ||
975 | |||
976 | if (sym_is_choice_value(last_sym)) { | ||
977 | dep_stack_insert(&cv_stack, last_sym); | ||
978 | last_sym = prop_get_symbol(sym_get_choice_prop(last_sym)); | ||
979 | } | ||
980 | |||
981 | for (stack = check_top; stack != NULL; stack = stack->prev) | ||
982 | if (stack->sym == last_sym) | ||
983 | break; | ||
984 | if (!stack) { | ||
985 | fprintf(stderr, "unexpected recursive dependency error\n"); | ||
986 | return; | ||
987 | } | ||
988 | |||
989 | for (; stack; stack = stack->next) { | ||
990 | sym = stack->sym; | ||
991 | next_sym = stack->next ? stack->next->sym : last_sym; | ||
992 | prop = stack->prop; | ||
993 | if (prop == NULL) | ||
994 | prop = stack->sym->prop; | ||
995 | |||
996 | /* for choice values find the menu entry (used below) */ | ||
997 | if (sym_is_choice(sym) || sym_is_choice_value(sym)) { | ||
998 | for (prop = sym->prop; prop; prop = prop->next) { | ||
999 | menu = prop->menu; | ||
1000 | if (prop->menu) | ||
1001 | break; | ||
1002 | } | ||
1003 | } | ||
1004 | if (stack->sym == last_sym) | ||
1005 | fprintf(stderr, "%s:%d:error: recursive dependency detected!\n", | ||
1006 | prop->file->name, prop->lineno); | ||
1007 | if (stack->expr) { | ||
1008 | fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n", | ||
1009 | prop->file->name, prop->lineno, | ||
1010 | sym->name ? sym->name : "<choice>", | ||
1011 | prop_get_type_name(prop->type), | ||
1012 | next_sym->name ? next_sym->name : "<choice>"); | ||
1013 | } else if (stack->prop) { | ||
1014 | fprintf(stderr, "%s:%d:\tsymbol %s depends on %s\n", | ||
1015 | prop->file->name, prop->lineno, | ||
1016 | sym->name ? sym->name : "<choice>", | ||
1017 | next_sym->name ? next_sym->name : "<choice>"); | ||
1018 | } else if (sym_is_choice(sym)) { | ||
1019 | fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n", | ||
1020 | menu->file->name, menu->lineno, | ||
1021 | sym->name ? sym->name : "<choice>", | ||
1022 | next_sym->name ? next_sym->name : "<choice>"); | ||
1023 | } else if (sym_is_choice_value(sym)) { | ||
1024 | fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n", | ||
1025 | menu->file->name, menu->lineno, | ||
1026 | sym->name ? sym->name : "<choice>", | ||
1027 | next_sym->name ? next_sym->name : "<choice>"); | ||
1028 | } else { | ||
1029 | fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n", | ||
1030 | prop->file->name, prop->lineno, | ||
1031 | sym->name ? sym->name : "<choice>", | ||
1032 | next_sym->name ? next_sym->name : "<choice>"); | ||
1033 | } | ||
1034 | } | ||
1035 | |||
1036 | if (check_top == &cv_stack) | ||
1037 | dep_stack_remove(); | ||
1038 | } | ||
768 | 1039 | ||
769 | static struct symbol *sym_check_expr_deps(struct expr *e) | 1040 | static struct symbol *sym_check_expr_deps(struct expr *e) |
770 | { | 1041 | { |
@@ -801,24 +1072,33 @@ static struct symbol *sym_check_sym_deps(struct symbol *sym) | |||
801 | { | 1072 | { |
802 | struct symbol *sym2; | 1073 | struct symbol *sym2; |
803 | struct property *prop; | 1074 | struct property *prop; |
1075 | struct dep_stack stack; | ||
1076 | |||
1077 | dep_stack_insert(&stack, sym); | ||
804 | 1078 | ||
805 | sym2 = sym_check_expr_deps(sym->rev_dep.expr); | 1079 | sym2 = sym_check_expr_deps(sym->rev_dep.expr); |
806 | if (sym2) | 1080 | if (sym2) |
807 | return sym2; | 1081 | goto out; |
808 | 1082 | ||
809 | for (prop = sym->prop; prop; prop = prop->next) { | 1083 | for (prop = sym->prop; prop; prop = prop->next) { |
810 | if (prop->type == P_CHOICE || prop->type == P_SELECT) | 1084 | if (prop->type == P_CHOICE || prop->type == P_SELECT) |
811 | continue; | 1085 | continue; |
1086 | stack.prop = prop; | ||
812 | sym2 = sym_check_expr_deps(prop->visible.expr); | 1087 | sym2 = sym_check_expr_deps(prop->visible.expr); |
813 | if (sym2) | 1088 | if (sym2) |
814 | break; | 1089 | break; |
815 | if (prop->type != P_DEFAULT || sym_is_choice(sym)) | 1090 | if (prop->type != P_DEFAULT || sym_is_choice(sym)) |
816 | continue; | 1091 | continue; |
1092 | stack.expr = prop->expr; | ||
817 | sym2 = sym_check_expr_deps(prop->expr); | 1093 | sym2 = sym_check_expr_deps(prop->expr); |
818 | if (sym2) | 1094 | if (sym2) |
819 | break; | 1095 | break; |
1096 | stack.expr = NULL; | ||
820 | } | 1097 | } |
821 | 1098 | ||
1099 | out: | ||
1100 | dep_stack_remove(); | ||
1101 | |||
822 | return sym2; | 1102 | return sym2; |
823 | } | 1103 | } |
824 | 1104 | ||
@@ -827,6 +1107,9 @@ static struct symbol *sym_check_choice_deps(struct symbol *choice) | |||
827 | struct symbol *sym, *sym2; | 1107 | struct symbol *sym, *sym2; |
828 | struct property *prop; | 1108 | struct property *prop; |
829 | struct expr *e; | 1109 | struct expr *e; |
1110 | struct dep_stack stack; | ||
1111 | |||
1112 | dep_stack_insert(&stack, choice); | ||
830 | 1113 | ||
831 | prop = sym_get_choice_prop(choice); | 1114 | prop = sym_get_choice_prop(choice); |
832 | expr_list_for_each_sym(prop->expr, e, sym) | 1115 | expr_list_for_each_sym(prop->expr, e, sym) |
@@ -840,10 +1123,8 @@ static struct symbol *sym_check_choice_deps(struct symbol *choice) | |||
840 | 1123 | ||
841 | expr_list_for_each_sym(prop->expr, e, sym) { | 1124 | expr_list_for_each_sym(prop->expr, e, sym) { |
842 | sym2 = sym_check_sym_deps(sym); | 1125 | sym2 = sym_check_sym_deps(sym); |
843 | if (sym2) { | 1126 | if (sym2) |
844 | fprintf(stderr, " -> %s", sym->name); | ||
845 | break; | 1127 | break; |
846 | } | ||
847 | } | 1128 | } |
848 | out: | 1129 | out: |
849 | expr_list_for_each_sym(prop->expr, e, sym) | 1130 | expr_list_for_each_sym(prop->expr, e, sym) |
@@ -853,6 +1134,8 @@ out: | |||
853 | prop_get_symbol(sym_get_choice_prop(sym2)) == choice) | 1134 | prop_get_symbol(sym_get_choice_prop(sym2)) == choice) |
854 | sym2 = choice; | 1135 | sym2 = choice; |
855 | 1136 | ||
1137 | dep_stack_remove(); | ||
1138 | |||
856 | return sym2; | 1139 | return sym2; |
857 | } | 1140 | } |
858 | 1141 | ||
@@ -862,18 +1145,20 @@ struct symbol *sym_check_deps(struct symbol *sym) | |||
862 | struct property *prop; | 1145 | struct property *prop; |
863 | 1146 | ||
864 | if (sym->flags & SYMBOL_CHECK) { | 1147 | if (sym->flags & SYMBOL_CHECK) { |
865 | fprintf(stderr, "%s:%d:error: found recursive dependency: %s", | 1148 | sym_check_print_recursive(sym); |
866 | sym->prop->file->name, sym->prop->lineno, | ||
867 | sym->name ? sym->name : "<choice>"); | ||
868 | return sym; | 1149 | return sym; |
869 | } | 1150 | } |
870 | if (sym->flags & SYMBOL_CHECKED) | 1151 | if (sym->flags & SYMBOL_CHECKED) |
871 | return NULL; | 1152 | return NULL; |
872 | 1153 | ||
873 | if (sym_is_choice_value(sym)) { | 1154 | if (sym_is_choice_value(sym)) { |
1155 | struct dep_stack stack; | ||
1156 | |||
874 | /* for choice groups start the check with main choice symbol */ | 1157 | /* for choice groups start the check with main choice symbol */ |
1158 | dep_stack_insert(&stack, sym); | ||
875 | prop = sym_get_choice_prop(sym); | 1159 | prop = sym_get_choice_prop(sym); |
876 | sym2 = sym_check_deps(prop_get_symbol(prop)); | 1160 | sym2 = sym_check_deps(prop_get_symbol(prop)); |
1161 | dep_stack_remove(); | ||
877 | } else if (sym_is_choice(sym)) { | 1162 | } else if (sym_is_choice(sym)) { |
878 | sym2 = sym_check_choice_deps(sym); | 1163 | sym2 = sym_check_choice_deps(sym); |
879 | } else { | 1164 | } else { |
@@ -882,14 +1167,8 @@ struct symbol *sym_check_deps(struct symbol *sym) | |||
882 | sym->flags &= ~SYMBOL_CHECK; | 1167 | sym->flags &= ~SYMBOL_CHECK; |
883 | } | 1168 | } |
884 | 1169 | ||
885 | if (sym2) { | 1170 | if (sym2 && sym2 == sym) |
886 | fprintf(stderr, " -> %s", sym->name ? sym->name : "<choice>"); | 1171 | sym2 = NULL; |
887 | if (sym2 == sym) { | ||
888 | fprintf(stderr, "\n"); | ||
889 | zconfnerrs++; | ||
890 | sym2 = NULL; | ||
891 | } | ||
892 | } | ||
893 | 1172 | ||
894 | return sym2; | 1173 | return sym2; |
895 | } | 1174 | } |
@@ -943,6 +1222,8 @@ const char *prop_get_type_name(enum prop_type type) | |||
943 | return "select"; | 1222 | return "select"; |
944 | case P_RANGE: | 1223 | case P_RANGE: |
945 | return "range"; | 1224 | return "range"; |
1225 | case P_SYMBOL: | ||
1226 | return "symbol"; | ||
946 | case P_UNKNOWN: | 1227 | case P_UNKNOWN: |
947 | break; | 1228 | break; |
948 | } | 1229 | } |
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index 81c100d953e..6330cc871a4 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c | |||
@@ -12,15 +12,18 @@ | |||
12 | struct file *file_lookup(const char *name) | 12 | struct file *file_lookup(const char *name) |
13 | { | 13 | { |
14 | struct file *file; | 14 | struct file *file; |
15 | const char *file_name = sym_expand_string_value(name); | ||
15 | 16 | ||
16 | for (file = file_list; file; file = file->next) { | 17 | for (file = file_list; file; file = file->next) { |
17 | if (!strcmp(name, file->name)) | 18 | if (!strcmp(name, file->name)) { |
19 | free((void *)file_name); | ||
18 | return file; | 20 | return file; |
21 | } | ||
19 | } | 22 | } |
20 | 23 | ||
21 | file = malloc(sizeof(*file)); | 24 | file = malloc(sizeof(*file)); |
22 | memset(file, 0, sizeof(*file)); | 25 | memset(file, 0, sizeof(*file)); |
23 | file->name = strdup(name); | 26 | file->name = file_name; |
24 | file->next = file_list; | 27 | file->next = file_list; |
25 | file_list = file; | 28 | file_list = file; |
26 | return file; | 29 | return file; |
@@ -72,7 +75,7 @@ int file_write_dep(const char *name) | |||
72 | } | 75 | } |
73 | 76 | ||
74 | 77 | ||
75 | /* Allocate initial growable sting */ | 78 | /* Allocate initial growable string */ |
76 | struct gstr str_new(void) | 79 | struct gstr str_new(void) |
77 | { | 80 | { |
78 | struct gstr gs; | 81 | struct gstr gs; |
diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf index d8bc7424962..c9e690eb754 100644 --- a/scripts/kconfig/zconf.gperf +++ b/scripts/kconfig/zconf.gperf | |||
@@ -38,6 +38,7 @@ hex, T_TYPE, TF_COMMAND, S_HEX | |||
38 | string, T_TYPE, TF_COMMAND, S_STRING | 38 | string, T_TYPE, TF_COMMAND, S_STRING |
39 | select, T_SELECT, TF_COMMAND | 39 | select, T_SELECT, TF_COMMAND |
40 | range, T_RANGE, TF_COMMAND | 40 | range, T_RANGE, TF_COMMAND |
41 | visible, T_VISIBLE, TF_COMMAND | ||
41 | option, T_OPTION, TF_COMMAND | 42 | option, T_OPTION, TF_COMMAND |
42 | on, T_ON, TF_PARAM | 43 | on, T_ON, TF_PARAM |
43 | modules, T_OPT_MODULES, TF_OPTION | 44 | modules, T_OPT_MODULES, TF_OPTION |
diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped index c1748faf463..4055d5de175 100644 --- a/scripts/kconfig/zconf.hash.c_shipped +++ b/scripts/kconfig/zconf.hash.c_shipped | |||
@@ -32,7 +32,7 @@ | |||
32 | struct kconf_id; | 32 | struct kconf_id; |
33 | 33 | ||
34 | static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len); | 34 | static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len); |
35 | /* maximum key range = 47, duplicates = 0 */ | 35 | /* maximum key range = 50, duplicates = 0 */ |
36 | 36 | ||
37 | #ifdef __GNUC__ | 37 | #ifdef __GNUC__ |
38 | __inline | 38 | __inline |
@@ -46,32 +46,32 @@ kconf_id_hash (register const char *str, register unsigned int len) | |||
46 | { | 46 | { |
47 | static unsigned char asso_values[] = | 47 | static unsigned char asso_values[] = |
48 | { | 48 | { |
49 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 49 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
50 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 50 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
51 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 51 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
52 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 52 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
53 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 53 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
54 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 54 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
55 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 55 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
56 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 56 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
57 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 57 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
58 | 49, 49, 49, 49, 49, 49, 49, 49, 11, 5, | 58 | 52, 52, 52, 52, 52, 52, 52, 52, 40, 5, |
59 | 0, 0, 5, 49, 5, 20, 49, 49, 5, 20, | 59 | 0, 0, 5, 52, 0, 20, 52, 52, 10, 20, |
60 | 5, 0, 30, 49, 0, 15, 0, 10, 0, 49, | 60 | 5, 0, 35, 52, 0, 30, 0, 15, 0, 52, |
61 | 25, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 61 | 15, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
62 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 62 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
63 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 63 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
64 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 64 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
65 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 65 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
66 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 66 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
67 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 67 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
68 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 68 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
69 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 69 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
70 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 70 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
71 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 71 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
72 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 72 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
73 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, | 73 | 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, |
74 | 49, 49, 49, 49, 49, 49 | 74 | 52, 52, 52, 52, 52, 52 |
75 | }; | 75 | }; |
76 | register int hval = len; | 76 | register int hval = len; |
77 | 77 | ||
@@ -102,25 +102,26 @@ struct kconf_id_strings_t | |||
102 | char kconf_id_strings_str12[sizeof("default")]; | 102 | char kconf_id_strings_str12[sizeof("default")]; |
103 | char kconf_id_strings_str13[sizeof("def_bool")]; | 103 | char kconf_id_strings_str13[sizeof("def_bool")]; |
104 | char kconf_id_strings_str14[sizeof("help")]; | 104 | char kconf_id_strings_str14[sizeof("help")]; |
105 | char kconf_id_strings_str15[sizeof("bool")]; | ||
106 | char kconf_id_strings_str16[sizeof("config")]; | 105 | char kconf_id_strings_str16[sizeof("config")]; |
107 | char kconf_id_strings_str17[sizeof("def_tristate")]; | 106 | char kconf_id_strings_str17[sizeof("def_tristate")]; |
108 | char kconf_id_strings_str18[sizeof("boolean")]; | 107 | char kconf_id_strings_str18[sizeof("hex")]; |
109 | char kconf_id_strings_str19[sizeof("defconfig_list")]; | 108 | char kconf_id_strings_str19[sizeof("defconfig_list")]; |
110 | char kconf_id_strings_str21[sizeof("string")]; | ||
111 | char kconf_id_strings_str22[sizeof("if")]; | 109 | char kconf_id_strings_str22[sizeof("if")]; |
112 | char kconf_id_strings_str23[sizeof("int")]; | 110 | char kconf_id_strings_str23[sizeof("int")]; |
113 | char kconf_id_strings_str26[sizeof("select")]; | ||
114 | char kconf_id_strings_str27[sizeof("modules")]; | 111 | char kconf_id_strings_str27[sizeof("modules")]; |
115 | char kconf_id_strings_str28[sizeof("tristate")]; | 112 | char kconf_id_strings_str28[sizeof("tristate")]; |
116 | char kconf_id_strings_str29[sizeof("menu")]; | 113 | char kconf_id_strings_str29[sizeof("menu")]; |
117 | char kconf_id_strings_str31[sizeof("source")]; | ||
118 | char kconf_id_strings_str32[sizeof("comment")]; | 114 | char kconf_id_strings_str32[sizeof("comment")]; |
119 | char kconf_id_strings_str33[sizeof("hex")]; | ||
120 | char kconf_id_strings_str35[sizeof("menuconfig")]; | 115 | char kconf_id_strings_str35[sizeof("menuconfig")]; |
121 | char kconf_id_strings_str36[sizeof("prompt")]; | 116 | char kconf_id_strings_str36[sizeof("string")]; |
122 | char kconf_id_strings_str37[sizeof("depends")]; | 117 | char kconf_id_strings_str37[sizeof("visible")]; |
118 | char kconf_id_strings_str41[sizeof("prompt")]; | ||
119 | char kconf_id_strings_str42[sizeof("depends")]; | ||
120 | char kconf_id_strings_str44[sizeof("bool")]; | ||
121 | char kconf_id_strings_str46[sizeof("select")]; | ||
122 | char kconf_id_strings_str47[sizeof("boolean")]; | ||
123 | char kconf_id_strings_str48[sizeof("mainmenu")]; | 123 | char kconf_id_strings_str48[sizeof("mainmenu")]; |
124 | char kconf_id_strings_str51[sizeof("source")]; | ||
124 | }; | 125 | }; |
125 | static struct kconf_id_strings_t kconf_id_strings_contents = | 126 | static struct kconf_id_strings_t kconf_id_strings_contents = |
126 | { | 127 | { |
@@ -136,25 +137,26 @@ static struct kconf_id_strings_t kconf_id_strings_contents = | |||
136 | "default", | 137 | "default", |
137 | "def_bool", | 138 | "def_bool", |
138 | "help", | 139 | "help", |
139 | "bool", | ||
140 | "config", | 140 | "config", |
141 | "def_tristate", | 141 | "def_tristate", |
142 | "boolean", | 142 | "hex", |
143 | "defconfig_list", | 143 | "defconfig_list", |
144 | "string", | ||
145 | "if", | 144 | "if", |
146 | "int", | 145 | "int", |
147 | "select", | ||
148 | "modules", | 146 | "modules", |
149 | "tristate", | 147 | "tristate", |
150 | "menu", | 148 | "menu", |
151 | "source", | ||
152 | "comment", | 149 | "comment", |
153 | "hex", | ||
154 | "menuconfig", | 150 | "menuconfig", |
151 | "string", | ||
152 | "visible", | ||
155 | "prompt", | 153 | "prompt", |
156 | "depends", | 154 | "depends", |
157 | "mainmenu" | 155 | "bool", |
156 | "select", | ||
157 | "boolean", | ||
158 | "mainmenu", | ||
159 | "source" | ||
158 | }; | 160 | }; |
159 | #define kconf_id_strings ((const char *) &kconf_id_strings_contents) | 161 | #define kconf_id_strings ((const char *) &kconf_id_strings_contents) |
160 | #ifdef __GNUC__ | 162 | #ifdef __GNUC__ |
@@ -168,11 +170,11 @@ kconf_id_lookup (register const char *str, register unsigned int len) | |||
168 | { | 170 | { |
169 | enum | 171 | enum |
170 | { | 172 | { |
171 | TOTAL_KEYWORDS = 31, | 173 | TOTAL_KEYWORDS = 32, |
172 | MIN_WORD_LENGTH = 2, | 174 | MIN_WORD_LENGTH = 2, |
173 | MAX_WORD_LENGTH = 14, | 175 | MAX_WORD_LENGTH = 14, |
174 | MIN_HASH_VALUE = 2, | 176 | MIN_HASH_VALUE = 2, |
175 | MAX_HASH_VALUE = 48 | 177 | MAX_HASH_VALUE = 51 |
176 | }; | 178 | }; |
177 | 179 | ||
178 | static struct kconf_id wordlist[] = | 180 | static struct kconf_id wordlist[] = |
@@ -191,31 +193,35 @@ kconf_id_lookup (register const char *str, register unsigned int len) | |||
191 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_UNKNOWN}, | 193 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_UNKNOWN}, |
192 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN}, | 194 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN}, |
193 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_HELP, TF_COMMAND}, | 195 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_HELP, TF_COMMAND}, |
194 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str15, T_TYPE, TF_COMMAND, S_BOOLEAN}, | 196 | {-1}, |
195 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_CONFIG, TF_COMMAND}, | 197 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_CONFIG, TF_COMMAND}, |
196 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_DEFAULT, TF_COMMAND, S_TRISTATE}, | 198 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_DEFAULT, TF_COMMAND, S_TRISTATE}, |
197 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_BOOLEAN}, | 199 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_TYPE, TF_COMMAND, S_HEX}, |
198 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19, T_OPT_DEFCONFIG_LIST,TF_OPTION}, | 200 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19, T_OPT_DEFCONFIG_LIST,TF_OPTION}, |
199 | {-1}, | 201 | {-1}, {-1}, |
200 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_TYPE, TF_COMMAND, S_STRING}, | ||
201 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_IF, TF_COMMAND|TF_PARAM}, | 202 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_IF, TF_COMMAND|TF_PARAM}, |
202 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_TYPE, TF_COMMAND, S_INT}, | 203 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_TYPE, TF_COMMAND, S_INT}, |
203 | {-1}, {-1}, | 204 | {-1}, {-1}, {-1}, |
204 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26, T_SELECT, TF_COMMAND}, | ||
205 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_OPT_MODULES, TF_OPTION}, | 205 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_OPT_MODULES, TF_OPTION}, |
206 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28, T_TYPE, TF_COMMAND, S_TRISTATE}, | 206 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28, T_TYPE, TF_COMMAND, S_TRISTATE}, |
207 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29, T_MENU, TF_COMMAND}, | 207 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29, T_MENU, TF_COMMAND}, |
208 | {-1}, | 208 | {-1}, {-1}, |
209 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SOURCE, TF_COMMAND}, | ||
210 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND}, | 209 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND}, |
211 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_TYPE, TF_COMMAND, S_HEX}, | 210 | {-1}, {-1}, |
212 | {-1}, | ||
213 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_MENUCONFIG, TF_COMMAND}, | 211 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_MENUCONFIG, TF_COMMAND}, |
214 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_PROMPT, TF_COMMAND}, | 212 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_TYPE, TF_COMMAND, S_STRING}, |
215 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_DEPENDS, TF_COMMAND}, | 213 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_VISIBLE, TF_COMMAND}, |
216 | {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, | 214 | {-1}, {-1}, {-1}, |
215 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_PROMPT, TF_COMMAND}, | ||
216 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42, T_DEPENDS, TF_COMMAND}, | ||
217 | {-1}, | 217 | {-1}, |
218 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48, T_MAINMENU, TF_COMMAND} | 218 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str44, T_TYPE, TF_COMMAND, S_BOOLEAN}, |
219 | {-1}, | ||
220 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46, T_SELECT, TF_COMMAND}, | ||
221 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47, T_TYPE, TF_COMMAND, S_BOOLEAN}, | ||
222 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48, T_MAINMENU, TF_COMMAND}, | ||
223 | {-1}, {-1}, | ||
224 | {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51, T_SOURCE, TF_COMMAND} | ||
219 | }; | 225 | }; |
220 | 226 | ||
221 | if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) | 227 | if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) |
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index d8f7236cb0a..3dbaec185cc 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l | |||
@@ -304,9 +304,10 @@ void zconf_nextfile(const char *name) | |||
304 | memset(buf, 0, sizeof(*buf)); | 304 | memset(buf, 0, sizeof(*buf)); |
305 | 305 | ||
306 | current_buf->state = YY_CURRENT_BUFFER; | 306 | current_buf->state = YY_CURRENT_BUFFER; |
307 | yyin = zconf_fopen(name); | 307 | yyin = zconf_fopen(file->name); |
308 | if (!yyin) { | 308 | if (!yyin) { |
309 | printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name); | 309 | printf("%s:%d: can't open file \"%s\"\n", |
310 | zconf_curname(), zconf_lineno(), file->name); | ||
310 | exit(1); | 311 | exit(1); |
311 | } | 312 | } |
312 | yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE)); | 313 | yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE)); |
@@ -353,7 +354,7 @@ int zconf_lineno(void) | |||
353 | return current_pos.lineno; | 354 | return current_pos.lineno; |
354 | } | 355 | } |
355 | 356 | ||
356 | char *zconf_curname(void) | 357 | const char *zconf_curname(void) |
357 | { | 358 | { |
358 | return current_pos.file ? current_pos.file->name : "<none>"; | 359 | return current_pos.file ? current_pos.file->name : "<none>"; |
359 | } | 360 | } |
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped index 32a9eefd842..4c5495ea205 100644 --- a/scripts/kconfig/zconf.tab.c_shipped +++ b/scripts/kconfig/zconf.tab.c_shipped | |||
@@ -160,18 +160,19 @@ static struct menu *current_menu, *current_entry; | |||
160 | T_DEFAULT = 275, | 160 | T_DEFAULT = 275, |
161 | T_SELECT = 276, | 161 | T_SELECT = 276, |
162 | T_RANGE = 277, | 162 | T_RANGE = 277, |
163 | T_OPTION = 278, | 163 | T_VISIBLE = 278, |
164 | T_ON = 279, | 164 | T_OPTION = 279, |
165 | T_WORD = 280, | 165 | T_ON = 280, |
166 | T_WORD_QUOTE = 281, | 166 | T_WORD = 281, |
167 | T_UNEQUAL = 282, | 167 | T_WORD_QUOTE = 282, |
168 | T_CLOSE_PAREN = 283, | 168 | T_UNEQUAL = 283, |
169 | T_OPEN_PAREN = 284, | 169 | T_CLOSE_PAREN = 284, |
170 | T_EOL = 285, | 170 | T_OPEN_PAREN = 285, |
171 | T_OR = 286, | 171 | T_EOL = 286, |
172 | T_AND = 287, | 172 | T_OR = 287, |
173 | T_EQUAL = 288, | 173 | T_AND = 288, |
174 | T_NOT = 289 | 174 | T_EQUAL = 289, |
175 | T_NOT = 290 | ||
175 | }; | 176 | }; |
176 | #endif | 177 | #endif |
177 | 178 | ||
@@ -417,22 +418,22 @@ union yyalloc | |||
417 | #endif | 418 | #endif |
418 | 419 | ||
419 | /* YYFINAL -- State number of the termination state. */ | 420 | /* YYFINAL -- State number of the termination state. */ |
420 | #define YYFINAL 3 | 421 | #define YYFINAL 11 |
421 | /* YYLAST -- Last index in YYTABLE. */ | 422 | /* YYLAST -- Last index in YYTABLE. */ |
422 | #define YYLAST 259 | 423 | #define YYLAST 290 |
423 | 424 | ||
424 | /* YYNTOKENS -- Number of terminals. */ | 425 | /* YYNTOKENS -- Number of terminals. */ |
425 | #define YYNTOKENS 35 | 426 | #define YYNTOKENS 36 |
426 | /* YYNNTS -- Number of nonterminals. */ | 427 | /* YYNNTS -- Number of nonterminals. */ |
427 | #define YYNNTS 46 | 428 | #define YYNNTS 50 |
428 | /* YYNRULES -- Number of rules. */ | 429 | /* YYNRULES -- Number of rules. */ |
429 | #define YYNRULES 110 | 430 | #define YYNRULES 118 |
430 | /* YYNRULES -- Number of states. */ | 431 | /* YYNRULES -- Number of states. */ |
431 | #define YYNSTATES 180 | 432 | #define YYNSTATES 191 |
432 | 433 | ||
433 | /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ | 434 | /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ |
434 | #define YYUNDEFTOK 2 | 435 | #define YYUNDEFTOK 2 |
435 | #define YYMAXUTOK 289 | 436 | #define YYMAXUTOK 290 |
436 | 437 | ||
437 | #define YYTRANSLATE(YYX) \ | 438 | #define YYTRANSLATE(YYX) \ |
438 | ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) | 439 | ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) |
@@ -468,7 +469,8 @@ static const yytype_uint8 yytranslate[] = | |||
468 | 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, | 469 | 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, |
469 | 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, | 470 | 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, |
470 | 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, | 471 | 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, |
471 | 25, 26, 27, 28, 29, 30, 31, 32, 33, 34 | 472 | 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, |
473 | 35 | ||
472 | }; | 474 | }; |
473 | 475 | ||
474 | #if YYDEBUG | 476 | #if YYDEBUG |
@@ -476,73 +478,75 @@ static const yytype_uint8 yytranslate[] = | |||
476 | YYRHS. */ | 478 | YYRHS. */ |
477 | static const yytype_uint16 yyprhs[] = | 479 | static const yytype_uint16 yyprhs[] = |
478 | { | 480 | { |
479 | 0, 0, 3, 5, 6, 9, 12, 15, 20, 23, | 481 | 0, 0, 3, 6, 8, 11, 13, 14, 17, 20, |
480 | 28, 33, 37, 39, 41, 43, 45, 47, 49, 51, | 482 | 23, 26, 31, 36, 40, 42, 44, 46, 48, 50, |
481 | 53, 55, 57, 59, 61, 63, 67, 70, 74, 77, | 483 | 52, 54, 56, 58, 60, 62, 64, 66, 68, 72, |
482 | 81, 84, 85, 88, 91, 94, 97, 100, 103, 107, | 484 | 75, 79, 82, 86, 89, 90, 93, 96, 99, 102, |
483 | 112, 117, 122, 128, 132, 133, 137, 138, 141, 145, | 485 | 105, 108, 112, 117, 122, 127, 133, 137, 138, 142, |
484 | 148, 150, 154, 155, 158, 161, 164, 167, 170, 175, | 486 | 143, 146, 150, 153, 155, 159, 160, 163, 166, 169, |
485 | 179, 182, 187, 188, 191, 195, 197, 201, 202, 205, | 487 | 172, 175, 180, 184, 187, 192, 193, 196, 200, 202, |
486 | 208, 211, 215, 218, 220, 224, 225, 228, 231, 234, | 488 | 206, 207, 210, 213, 216, 220, 224, 228, 230, 234, |
487 | 238, 242, 245, 248, 251, 252, 255, 258, 261, 266, | 489 | 235, 238, 241, 244, 248, 252, 255, 258, 261, 262, |
488 | 267, 270, 272, 274, 277, 280, 283, 285, 288, 289, | 490 | 265, 268, 271, 276, 277, 280, 283, 286, 287, 290, |
489 | 292, 294, 298, 302, 306, 309, 313, 317, 319, 321, | 491 | 292, 294, 297, 300, 303, 305, 308, 309, 312, 314, |
490 | 322 | 492 | 318, 322, 326, 329, 333, 337, 339, 341, 342 |
491 | }; | 493 | }; |
492 | 494 | ||
493 | /* YYRHS -- A `-1'-separated list of the rules' RHS. */ | 495 | /* YYRHS -- A `-1'-separated list of the rules' RHS. */ |
494 | static const yytype_int8 yyrhs[] = | 496 | static const yytype_int8 yyrhs[] = |
495 | { | 497 | { |
496 | 36, 0, -1, 37, -1, -1, 37, 39, -1, 37, | 498 | 37, 0, -1, 81, 38, -1, 38, -1, 63, 39, |
497 | 53, -1, 37, 64, -1, 37, 3, 74, 76, -1, | 499 | -1, 39, -1, -1, 39, 41, -1, 39, 55, -1, |
498 | 37, 75, -1, 37, 25, 1, 30, -1, 37, 38, | 500 | 39, 67, -1, 39, 80, -1, 39, 26, 1, 31, |
499 | 1, 30, -1, 37, 1, 30, -1, 16, -1, 18, | 501 | -1, 39, 40, 1, 31, -1, 39, 1, 31, -1, |
500 | -1, 19, -1, 21, -1, 17, -1, 22, -1, 20, | 502 | 16, -1, 18, -1, 19, -1, 21, -1, 17, -1, |
501 | -1, 30, -1, 59, -1, 68, -1, 42, -1, 44, | 503 | 22, -1, 20, -1, 23, -1, 31, -1, 61, -1, |
502 | -1, 66, -1, 25, 1, 30, -1, 1, 30, -1, | 504 | 71, -1, 44, -1, 46, -1, 69, -1, 26, 1, |
503 | 10, 25, 30, -1, 41, 45, -1, 11, 25, 30, | 505 | 31, -1, 1, 31, -1, 10, 26, 31, -1, 43, |
504 | -1, 43, 45, -1, -1, 45, 46, -1, 45, 47, | 506 | 47, -1, 11, 26, 31, -1, 45, 47, -1, -1, |
505 | -1, 45, 72, -1, 45, 70, -1, 45, 40, -1, | 507 | 47, 48, -1, 47, 49, -1, 47, 75, -1, 47, |
506 | 45, 30, -1, 19, 73, 30, -1, 18, 74, 77, | 508 | 73, -1, 47, 42, -1, 47, 31, -1, 19, 78, |
507 | 30, -1, 20, 78, 77, 30, -1, 21, 25, 77, | 509 | 31, -1, 18, 79, 82, 31, -1, 20, 83, 82, |
508 | 30, -1, 22, 79, 79, 77, 30, -1, 23, 48, | 510 | 31, -1, 21, 26, 82, 31, -1, 22, 84, 84, |
509 | 30, -1, -1, 48, 25, 49, -1, -1, 33, 74, | 511 | 82, 31, -1, 24, 50, 31, -1, -1, 50, 26, |
510 | -1, 7, 80, 30, -1, 50, 54, -1, 75, -1, | 512 | 51, -1, -1, 34, 79, -1, 7, 85, 31, -1, |
511 | 51, 56, 52, -1, -1, 54, 55, -1, 54, 72, | 513 | 52, 56, -1, 80, -1, 53, 58, 54, -1, -1, |
512 | -1, 54, 70, -1, 54, 30, -1, 54, 40, -1, | 514 | 56, 57, -1, 56, 75, -1, 56, 73, -1, 56, |
513 | 18, 74, 77, 30, -1, 19, 73, 30, -1, 17, | 515 | 31, -1, 56, 42, -1, 18, 79, 82, 31, -1, |
514 | 30, -1, 20, 25, 77, 30, -1, -1, 56, 39, | 516 | 19, 78, 31, -1, 17, 31, -1, 20, 26, 82, |
515 | -1, 14, 78, 76, -1, 75, -1, 57, 60, 58, | 517 | 31, -1, -1, 58, 41, -1, 14, 83, 81, -1, |
516 | -1, -1, 60, 39, -1, 60, 64, -1, 60, 53, | 518 | 80, -1, 59, 62, 60, -1, -1, 62, 41, -1, |
517 | -1, 4, 74, 30, -1, 61, 71, -1, 75, -1, | 519 | 62, 67, -1, 62, 55, -1, 3, 79, 81, -1, |
518 | 62, 65, 63, -1, -1, 65, 39, -1, 65, 64, | 520 | 4, 79, 31, -1, 64, 76, 74, -1, 80, -1, |
519 | -1, 65, 53, -1, 6, 74, 30, -1, 9, 74, | 521 | 65, 68, 66, -1, -1, 68, 41, -1, 68, 67, |
520 | 30, -1, 67, 71, -1, 12, 30, -1, 69, 13, | 522 | -1, 68, 55, -1, 6, 79, 31, -1, 9, 79, |
521 | -1, -1, 71, 72, -1, 71, 30, -1, 71, 40, | 523 | 31, -1, 70, 74, -1, 12, 31, -1, 72, 13, |
522 | -1, 16, 24, 78, 30, -1, -1, 74, 77, -1, | 524 | -1, -1, 74, 75, -1, 74, 31, -1, 74, 42, |
523 | 25, -1, 26, -1, 5, 30, -1, 8, 30, -1, | 525 | -1, 16, 25, 83, 31, -1, -1, 76, 77, -1, |
524 | 15, 30, -1, 30, -1, 76, 30, -1, -1, 14, | 526 | 76, 31, -1, 23, 82, -1, -1, 79, 82, -1, |
525 | 78, -1, 79, -1, 79, 33, 79, -1, 79, 27, | 527 | 26, -1, 27, -1, 5, 31, -1, 8, 31, -1, |
526 | 79, -1, 29, 78, 28, -1, 34, 78, -1, 78, | 528 | 15, 31, -1, 31, -1, 81, 31, -1, -1, 14, |
527 | 31, 78, -1, 78, 32, 78, -1, 25, -1, 26, | 529 | 83, -1, 84, -1, 84, 34, 84, -1, 84, 28, |
528 | -1, -1, 25, -1 | 530 | 84, -1, 30, 83, 29, -1, 35, 83, -1, 83, |
531 | 32, 83, -1, 83, 33, 83, -1, 26, -1, 27, | ||
532 | -1, -1, 26, -1 | ||
529 | }; | 533 | }; |
530 | 534 | ||
531 | /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ | 535 | /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ |
532 | static const yytype_uint16 yyrline[] = | 536 | static const yytype_uint16 yyrline[] = |
533 | { | 537 | { |
534 | 0, 107, 107, 109, 111, 112, 113, 114, 115, 116, | 538 | 0, 108, 108, 108, 110, 110, 112, 114, 115, 116, |
535 | 117, 121, 125, 125, 125, 125, 125, 125, 125, 129, | 539 | 117, 118, 119, 123, 127, 127, 127, 127, 127, 127, |
536 | 130, 131, 132, 133, 134, 138, 139, 145, 153, 159, | 540 | 127, 127, 131, 132, 133, 134, 135, 136, 140, 141, |
537 | 167, 177, 179, 180, 181, 182, 183, 184, 187, 195, | 541 | 147, 155, 161, 169, 179, 181, 182, 183, 184, 185, |
538 | 201, 211, 217, 223, 226, 228, 239, 240, 245, 254, | 542 | 186, 189, 197, 203, 213, 219, 225, 228, 230, 241, |
539 | 259, 267, 270, 272, 273, 274, 275, 276, 279, 285, | 543 | 242, 247, 256, 261, 269, 272, 274, 275, 276, 277, |
540 | 296, 302, 312, 314, 319, 327, 335, 338, 340, 341, | 544 | 278, 281, 287, 298, 304, 314, 316, 321, 329, 337, |
541 | 342, 347, 354, 359, 367, 370, 372, 373, 374, 377, | 545 | 340, 342, 343, 344, 349, 356, 363, 368, 376, 379, |
542 | 385, 392, 399, 405, 412, 414, 415, 416, 419, 427, | 546 | 381, 382, 383, 386, 394, 401, 408, 414, 421, 423, |
543 | 429, 434, 435, 438, 439, 440, 444, 445, 448, 449, | 547 | 424, 425, 428, 436, 438, 439, 442, 449, 451, 456, |
544 | 452, 453, 454, 455, 456, 457, 458, 461, 462, 465, | 548 | 457, 460, 461, 462, 466, 467, 470, 471, 474, 475, |
545 | 466 | 549 | 476, 477, 478, 479, 480, 483, 484, 487, 488 |
546 | }; | 550 | }; |
547 | #endif | 551 | #endif |
548 | 552 | ||
@@ -555,19 +559,19 @@ static const char *const yytname[] = | |||
555 | "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG", | 559 | "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG", |
556 | "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS", | 560 | "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS", |
557 | "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE", | 561 | "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE", |
558 | "T_OPTION", "T_ON", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL", | 562 | "T_VISIBLE", "T_OPTION", "T_ON", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL", |
559 | "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND", "T_EQUAL", | 563 | "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND", "T_EQUAL", |
560 | "T_NOT", "$accept", "input", "stmt_list", "option_name", "common_stmt", | 564 | "T_NOT", "$accept", "input", "start", "stmt_list", "option_name", |
561 | "option_error", "config_entry_start", "config_stmt", | 565 | "common_stmt", "option_error", "config_entry_start", "config_stmt", |
562 | "menuconfig_entry_start", "menuconfig_stmt", "config_option_list", | 566 | "menuconfig_entry_start", "menuconfig_stmt", "config_option_list", |
563 | "config_option", "symbol_option", "symbol_option_list", | 567 | "config_option", "symbol_option", "symbol_option_list", |
564 | "symbol_option_arg", "choice", "choice_entry", "choice_end", | 568 | "symbol_option_arg", "choice", "choice_entry", "choice_end", |
565 | "choice_stmt", "choice_option_list", "choice_option", "choice_block", | 569 | "choice_stmt", "choice_option_list", "choice_option", "choice_block", |
566 | "if_entry", "if_end", "if_stmt", "if_block", "menu", "menu_entry", | 570 | "if_entry", "if_end", "if_stmt", "if_block", "mainmenu_stmt", "menu", |
567 | "menu_end", "menu_stmt", "menu_block", "source_stmt", "comment", | 571 | "menu_entry", "menu_end", "menu_stmt", "menu_block", "source_stmt", |
568 | "comment_stmt", "help_start", "help", "depends_list", "depends", | 572 | "comment", "comment_stmt", "help_start", "help", "depends_list", |
569 | "prompt_stmt_opt", "prompt", "end", "nl", "if_expr", "expr", "symbol", | 573 | "depends", "visibility_list", "visible", "prompt_stmt_opt", "prompt", |
570 | "word_opt", 0 | 574 | "end", "nl", "if_expr", "expr", "symbol", "word_opt", 0 |
571 | }; | 575 | }; |
572 | #endif | 576 | #endif |
573 | 577 | ||
@@ -579,42 +583,42 @@ static const yytype_uint16 yytoknum[] = | |||
579 | 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, | 583 | 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, |
580 | 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, | 584 | 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, |
581 | 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, | 585 | 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, |
582 | 285, 286, 287, 288, 289 | 586 | 285, 286, 287, 288, 289, 290 |
583 | }; | 587 | }; |
584 | # endif | 588 | # endif |
585 | 589 | ||
586 | /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ | 590 | /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ |
587 | static const yytype_uint8 yyr1[] = | 591 | static const yytype_uint8 yyr1[] = |
588 | { | 592 | { |
589 | 0, 35, 36, 37, 37, 37, 37, 37, 37, 37, | 593 | 0, 36, 37, 37, 38, 38, 39, 39, 39, 39, |
590 | 37, 37, 38, 38, 38, 38, 38, 38, 38, 39, | 594 | 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, |
591 | 39, 39, 39, 39, 39, 40, 40, 41, 42, 43, | 595 | 40, 40, 41, 41, 41, 41, 41, 41, 42, 42, |
592 | 44, 45, 45, 45, 45, 45, 45, 45, 46, 46, | 596 | 43, 44, 45, 46, 47, 47, 47, 47, 47, 47, |
593 | 46, 46, 46, 47, 48, 48, 49, 49, 50, 51, | 597 | 47, 48, 48, 48, 48, 48, 49, 50, 50, 51, |
594 | 52, 53, 54, 54, 54, 54, 54, 54, 55, 55, | 598 | 51, 52, 53, 54, 55, 56, 56, 56, 56, 56, |
595 | 55, 55, 56, 56, 57, 58, 59, 60, 60, 60, | 599 | 56, 57, 57, 57, 57, 58, 58, 59, 60, 61, |
596 | 60, 61, 62, 63, 64, 65, 65, 65, 65, 66, | 600 | 62, 62, 62, 62, 63, 64, 65, 66, 67, 68, |
597 | 67, 68, 69, 70, 71, 71, 71, 71, 72, 73, | 601 | 68, 68, 68, 69, 70, 71, 72, 73, 74, 74, |
598 | 73, 74, 74, 75, 75, 75, 76, 76, 77, 77, | 602 | 74, 74, 75, 76, 76, 76, 77, 78, 78, 79, |
599 | 78, 78, 78, 78, 78, 78, 78, 79, 79, 80, | 603 | 79, 80, 80, 80, 81, 81, 82, 82, 83, 83, |
600 | 80 | 604 | 83, 83, 83, 83, 83, 84, 84, 85, 85 |
601 | }; | 605 | }; |
602 | 606 | ||
603 | /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ | 607 | /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ |
604 | static const yytype_uint8 yyr2[] = | 608 | static const yytype_uint8 yyr2[] = |
605 | { | 609 | { |
606 | 0, 2, 1, 0, 2, 2, 2, 4, 2, 4, | 610 | 0, 2, 2, 1, 2, 1, 0, 2, 2, 2, |
607 | 4, 3, 1, 1, 1, 1, 1, 1, 1, 1, | 611 | 2, 4, 4, 3, 1, 1, 1, 1, 1, 1, |
608 | 1, 1, 1, 1, 1, 3, 2, 3, 2, 3, | 612 | 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, |
609 | 2, 0, 2, 2, 2, 2, 2, 2, 3, 4, | 613 | 3, 2, 3, 2, 0, 2, 2, 2, 2, 2, |
610 | 4, 4, 5, 3, 0, 3, 0, 2, 3, 2, | 614 | 2, 3, 4, 4, 4, 5, 3, 0, 3, 0, |
611 | 1, 3, 0, 2, 2, 2, 2, 2, 4, 3, | 615 | 2, 3, 2, 1, 3, 0, 2, 2, 2, 2, |
612 | 2, 4, 0, 2, 3, 1, 3, 0, 2, 2, | 616 | 2, 4, 3, 2, 4, 0, 2, 3, 1, 3, |
613 | 2, 3, 2, 1, 3, 0, 2, 2, 2, 3, | 617 | 0, 2, 2, 2, 3, 3, 3, 1, 3, 0, |
614 | 3, 2, 2, 2, 0, 2, 2, 2, 4, 0, | 618 | 2, 2, 2, 3, 3, 2, 2, 2, 0, 2, |
615 | 2, 1, 1, 2, 2, 2, 1, 2, 0, 2, | 619 | 2, 2, 4, 0, 2, 2, 2, 0, 2, 1, |
616 | 1, 3, 3, 3, 2, 3, 3, 1, 1, 0, | 620 | 1, 2, 2, 2, 1, 2, 0, 2, 1, 3, |
617 | 1 | 621 | 3, 3, 2, 3, 3, 1, 1, 0, 1 |
618 | }; | 622 | }; |
619 | 623 | ||
620 | /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state | 624 | /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state |
@@ -622,158 +626,172 @@ static const yytype_uint8 yyr2[] = | |||
622 | means the default is an error. */ | 626 | means the default is an error. */ |
623 | static const yytype_uint8 yydefact[] = | 627 | static const yytype_uint8 yydefact[] = |
624 | { | 628 | { |
625 | 3, 0, 0, 1, 0, 0, 0, 0, 0, 109, | 629 | 6, 0, 104, 0, 3, 0, 6, 6, 99, 100, |
626 | 0, 0, 0, 0, 0, 0, 12, 16, 13, 14, | 630 | 0, 1, 0, 0, 0, 0, 117, 0, 0, 0, |
627 | 18, 15, 17, 0, 19, 0, 4, 31, 22, 31, | 631 | 0, 0, 0, 14, 18, 15, 16, 20, 17, 19, |
628 | 23, 52, 62, 5, 67, 20, 84, 75, 6, 24, | 632 | 21, 0, 22, 0, 7, 34, 25, 34, 26, 55, |
629 | 84, 21, 8, 11, 91, 92, 0, 0, 93, 0, | 633 | 65, 8, 70, 23, 93, 79, 9, 27, 88, 24, |
630 | 110, 0, 94, 0, 0, 0, 107, 108, 0, 0, | 634 | 10, 0, 105, 2, 74, 13, 0, 101, 0, 118, |
631 | 0, 100, 95, 0, 0, 0, 0, 0, 0, 0, | 635 | 0, 102, 0, 0, 0, 115, 116, 0, 0, 0, |
632 | 0, 0, 0, 96, 7, 71, 79, 48, 80, 27, | 636 | 108, 103, 0, 0, 0, 0, 0, 0, 0, 88, |
633 | 29, 0, 104, 0, 0, 64, 0, 0, 9, 10, | 637 | 0, 0, 75, 83, 51, 84, 30, 32, 0, 112, |
634 | 0, 0, 0, 0, 89, 0, 0, 0, 44, 0, | 638 | 0, 0, 67, 0, 0, 11, 12, 0, 0, 0, |
635 | 37, 36, 32, 33, 0, 35, 34, 0, 0, 89, | 639 | 0, 97, 0, 0, 0, 47, 0, 40, 39, 35, |
636 | 0, 56, 57, 53, 55, 54, 63, 51, 50, 68, | 640 | 36, 0, 38, 37, 0, 0, 97, 0, 59, 60, |
637 | 70, 66, 69, 65, 86, 87, 85, 76, 78, 74, | 641 | 56, 58, 57, 66, 54, 53, 71, 73, 69, 72, |
638 | 77, 73, 97, 103, 105, 106, 102, 101, 26, 82, | 642 | 68, 106, 95, 0, 94, 80, 82, 78, 81, 77, |
639 | 0, 98, 0, 98, 98, 98, 0, 0, 0, 83, | 643 | 90, 91, 89, 111, 113, 114, 110, 109, 29, 86, |
640 | 60, 98, 0, 98, 0, 0, 0, 38, 90, 0, | 644 | 0, 106, 0, 106, 106, 106, 0, 0, 0, 87, |
641 | 0, 98, 46, 43, 25, 0, 59, 0, 88, 99, | 645 | 63, 106, 0, 106, 0, 96, 0, 0, 41, 98, |
642 | 39, 40, 41, 0, 0, 45, 58, 61, 42, 47 | 646 | 0, 0, 106, 49, 46, 28, 0, 62, 0, 107, |
647 | 92, 42, 43, 44, 0, 0, 48, 61, 64, 45, | ||
648 | 50 | ||
643 | }; | 649 | }; |
644 | 650 | ||
645 | /* YYDEFGOTO[NTERM-NUM]. */ | 651 | /* YYDEFGOTO[NTERM-NUM]. */ |
646 | static const yytype_int16 yydefgoto[] = | 652 | static const yytype_int16 yydefgoto[] = |
647 | { | 653 | { |
648 | -1, 1, 2, 25, 26, 101, 27, 28, 29, 30, | 654 | -1, 3, 4, 5, 33, 34, 108, 35, 36, 37, |
649 | 65, 102, 103, 147, 175, 31, 32, 117, 33, 67, | 655 | 38, 74, 109, 110, 157, 186, 39, 40, 124, 41, |
650 | 113, 68, 34, 121, 35, 69, 36, 37, 129, 38, | 656 | 76, 120, 77, 42, 128, 43, 78, 6, 44, 45, |
651 | 71, 39, 40, 41, 104, 105, 70, 106, 142, 143, | 657 | 137, 46, 80, 47, 48, 49, 111, 112, 81, 113, |
652 | 42, 74, 156, 60, 61, 51 | 658 | 79, 134, 152, 153, 50, 7, 165, 69, 70, 60 |
653 | }; | 659 | }; |
654 | 660 | ||
655 | /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing | 661 | /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing |
656 | STATE-NUM. */ | 662 | STATE-NUM. */ |
657 | #define YYPACT_NINF -80 | 663 | #define YYPACT_NINF -90 |
658 | static const yytype_int16 yypact[] = | 664 | static const yytype_int16 yypact[] = |
659 | { | 665 | { |
660 | -80, 2, 132, -80, -13, -1, -1, -2, -1, 9, | 666 | 4, 42, -90, 96, -90, 111, -90, 15, -90, -90, |
661 | 33, -1, 27, 40, -3, 38, -80, -80, -80, -80, | 667 | 75, -90, 82, 42, 104, 42, 110, 107, 42, 115, |
662 | -80, -80, -80, 71, -80, 77, -80, -80, -80, -80, | 668 | 125, -4, 121, -90, -90, -90, -90, -90, -90, -90, |
663 | -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, | 669 | -90, 162, -90, 163, -90, -90, -90, -90, -90, -90, |
664 | -80, -80, -80, -80, -80, -80, 57, 61, -80, 63, | 670 | -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, |
665 | -80, 76, -80, 87, 101, 133, -80, -80, -3, -3, | 671 | -90, 139, -90, -90, 138, -90, 142, -90, 143, -90, |
666 | 195, -6, -80, 136, 149, 39, 104, 65, 150, 5, | 672 | 152, -90, 164, 167, 168, -90, -90, -4, -4, 77, |
667 | 194, 5, 167, -80, 176, -80, -80, -80, -80, -80, | 673 | -18, -90, 177, 185, 33, 71, 195, 247, 236, -2, |
668 | -80, 68, -80, -3, -3, 176, 72, 72, -80, -80, | 674 | 236, 171, -90, -90, -90, -90, -90, -90, 41, -90, |
669 | 177, 187, 78, -1, -1, -3, 196, 72, -80, 222, | 675 | -4, -4, 138, 97, 97, -90, -90, 186, 187, 194, |
670 | -80, -80, -80, -80, 221, -80, -80, 205, -1, -1, | 676 | 42, 42, -4, 196, 97, -90, 219, -90, -90, -90, |
671 | 211, -80, -80, -80, -80, -80, -80, -80, -80, -80, | 677 | -90, 210, -90, -90, 204, 42, 42, 199, -90, -90, |
672 | -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, | 678 | -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, |
673 | -80, -80, -80, -80, 206, -80, -80, -80, -80, -80, | 679 | -90, 222, -90, 223, -90, -90, -90, -90, -90, -90, |
674 | -3, 223, 209, 223, 197, 223, 72, 7, 210, -80, | 680 | -90, -90, -90, -90, 215, -90, -90, -90, -90, -90, |
675 | -80, 223, 212, 223, 201, -3, 213, -80, -80, 214, | 681 | -4, 222, 228, 222, -5, 222, 97, 35, 229, -90, |
676 | 215, 223, 208, -80, -80, 216, -80, 217, -80, 113, | 682 | -90, 222, 232, 222, -4, -90, 135, 233, -90, -90, |
677 | -80, -80, -80, 218, -1, -80, -80, -80, -80, -80 | 683 | 234, 235, 222, 240, -90, -90, 237, -90, 239, -13, |
684 | -90, -90, -90, -90, 244, 42, -90, -90, -90, -90, | ||
685 | -90 | ||
678 | }; | 686 | }; |
679 | 687 | ||
680 | /* YYPGOTO[NTERM-NUM]. */ | 688 | /* YYPGOTO[NTERM-NUM]. */ |
681 | static const yytype_int16 yypgoto[] = | 689 | static const yytype_int16 yypgoto[] = |
682 | { | 690 | { |
683 | -80, -80, -80, -80, 122, -34, -80, -80, -80, -80, | 691 | -90, -90, 269, 271, -90, 23, -70, -90, -90, -90, |
684 | 220, -80, -80, -80, -80, -80, -80, -80, 59, -80, | 692 | -90, 243, -90, -90, -90, -90, -90, -90, -90, -48, |
685 | -80, -80, -80, -80, -80, -80, -80, -80, -80, 125, | 693 | -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, |
686 | -80, -80, -80, -80, -80, 183, 219, 22, 142, -5, | 694 | -90, -20, -90, -90, -90, -90, -90, 206, 205, -68, |
687 | 147, 192, 69, -54, -79, -80 | 695 | -90, -90, 169, -1, 27, -7, 118, -66, -89, -90 |
688 | }; | 696 | }; |
689 | 697 | ||
690 | /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If | 698 | /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If |
691 | positive, shift that token. If negative, reduce the rule which | 699 | positive, shift that token. If negative, reduce the rule which |
692 | number is the opposite. If zero, do what YYDEFACT says. | 700 | number is the opposite. If zero, do what YYDEFACT says. |
693 | If YYTABLE_NINF, syntax error. */ | 701 | If YYTABLE_NINF, syntax error. */ |
694 | #define YYTABLE_NINF -82 | 702 | #define YYTABLE_NINF -86 |
695 | static const yytype_int16 yytable[] = | 703 | static const yytype_int16 yytable[] = |
696 | { | 704 | { |
697 | 46, 47, 3, 49, 81, 82, 53, 136, 137, 6, | 705 | 10, 88, 89, 54, 146, 147, 119, 1, 122, 164, |
698 | 7, 8, 9, 10, 11, 12, 13, 43, 146, 14, | 706 | 93, 141, 56, 142, 58, 156, 94, 62, 1, 90, |
699 | 15, 86, 56, 57, 44, 45, 58, 87, 48, 134, | 707 | 91, 131, 65, 66, 144, 145, 67, 90, 91, 132, |
700 | 135, 59, 162, 112, 50, 24, 125, 163, 125, -28, | 708 | 127, 68, 136, -31, 97, 2, 154, -31, -31, -31, |
701 | 90, 144, -28, -28, -28, -28, -28, -28, -28, -28, | 709 | -31, -31, -31, -31, -31, 98, 52, -31, -31, 99, |
702 | -28, 91, 54, -28, -28, 92, -28, 93, 94, 95, | 710 | -31, 100, 101, 102, 103, 104, -31, 105, 129, 106, |
703 | 96, 97, 98, 52, 99, 55, 90, 161, 62, 100, | 711 | 138, 173, 92, 141, 107, 142, 174, 172, 8, 9, |
704 | -49, -49, 63, -49, -49, -49, -49, 91, 64, -49, | 712 | 143, -33, 97, 90, 91, -33, -33, -33, -33, -33, |
705 | -49, 92, 107, 108, 109, 110, 154, 73, 141, 115, | 713 | -33, -33, -33, 98, 166, -33, -33, 99, -33, 100, |
706 | 99, 75, 126, 76, 126, 111, 133, 56, 57, 83, | 714 | 101, 102, 103, 104, -33, 105, 11, 106, 179, 151, |
707 | 84, 169, 140, 151, -30, 90, 77, -30, -30, -30, | 715 | 123, 126, 107, 135, 125, 130, 2, 139, 2, 90, |
708 | -30, -30, -30, -30, -30, -30, 91, 78, -30, -30, | 716 | 91, -5, 12, 55, 161, 13, 14, 15, 16, 17, |
709 | 92, -30, 93, 94, 95, 96, 97, 98, 120, 99, | 717 | 18, 19, 20, 65, 66, 21, 22, 23, 24, 25, |
710 | 128, 79, -2, 4, 100, 5, 6, 7, 8, 9, | 718 | 26, 27, 28, 29, 30, 57, 59, 31, 61, -4, |
711 | 10, 11, 12, 13, 83, 84, 14, 15, 16, 17, | 719 | 12, 63, 32, 13, 14, 15, 16, 17, 18, 19, |
712 | 18, 19, 20, 21, 22, 7, 8, 23, 10, 11, | 720 | 20, 64, 71, 21, 22, 23, 24, 25, 26, 27, |
713 | 12, 13, 24, 80, 14, 15, 88, -81, 90, 179, | 721 | 28, 29, 30, 72, 73, 31, 180, 90, 91, 52, |
714 | -81, -81, -81, -81, -81, -81, -81, -81, -81, 89, | 722 | 32, -85, 97, 82, 83, -85, -85, -85, -85, -85, |
715 | 24, -81, -81, 92, -81, -81, -81, -81, -81, -81, | 723 | -85, -85, -85, 84, 190, -85, -85, 99, -85, -85, |
716 | 116, 119, 99, 127, 122, 90, 130, 124, -72, -72, | 724 | -85, -85, -85, -85, -85, 85, 97, 106, 86, 87, |
717 | -72, -72, -72, -72, -72, -72, 132, 138, -72, -72, | 725 | -52, -52, 140, -52, -52, -52, -52, 98, 95, -52, |
718 | 92, 155, 158, 159, 160, 118, 123, 139, 131, 99, | 726 | -52, 99, 114, 115, 116, 117, 96, 148, 149, 150, |
719 | 165, 145, 167, 148, 124, 73, 83, 84, 83, 84, | 727 | 158, 106, 155, 159, 97, 163, 118, -76, -76, -76, |
720 | 173, 168, 83, 84, 149, 150, 153, 155, 84, 157, | 728 | -76, -76, -76, -76, -76, 160, 164, -76, -76, 99, |
721 | 164, 174, 166, 170, 171, 172, 176, 177, 178, 66, | 729 | 13, 14, 15, 16, 17, 18, 19, 20, 91, 106, |
722 | 114, 152, 85, 0, 0, 0, 0, 0, 0, 72 | 730 | 21, 22, 14, 15, 140, 17, 18, 19, 20, 168, |
731 | 175, 21, 22, 177, 181, 182, 183, 32, 187, 167, | ||
732 | 188, 169, 170, 171, 185, 189, 53, 51, 32, 176, | ||
733 | 75, 178, 121, 0, 133, 162, 0, 0, 0, 0, | ||
734 | 184 | ||
723 | }; | 735 | }; |
724 | 736 | ||
725 | static const yytype_int16 yycheck[] = | 737 | static const yytype_int16 yycheck[] = |
726 | { | 738 | { |
727 | 5, 6, 0, 8, 58, 59, 11, 86, 87, 4, | 739 | 1, 67, 68, 10, 93, 94, 76, 3, 76, 14, |
728 | 5, 6, 7, 8, 9, 10, 11, 30, 97, 14, | 740 | 28, 81, 13, 81, 15, 104, 34, 18, 3, 32, |
729 | 15, 27, 25, 26, 25, 26, 29, 33, 30, 83, | 741 | 33, 23, 26, 27, 90, 91, 30, 32, 33, 31, |
730 | 84, 34, 25, 67, 25, 30, 70, 30, 72, 0, | 742 | 78, 35, 80, 0, 1, 31, 102, 4, 5, 6, |
731 | 1, 95, 3, 4, 5, 6, 7, 8, 9, 10, | 743 | 7, 8, 9, 10, 11, 12, 31, 14, 15, 16, |
732 | 11, 12, 25, 14, 15, 16, 17, 18, 19, 20, | 744 | 17, 18, 19, 20, 21, 22, 23, 24, 78, 26, |
733 | 21, 22, 23, 30, 25, 25, 1, 146, 30, 30, | 745 | 80, 26, 69, 133, 31, 133, 31, 156, 26, 27, |
734 | 5, 6, 1, 8, 9, 10, 11, 12, 1, 14, | 746 | 29, 0, 1, 32, 33, 4, 5, 6, 7, 8, |
735 | 15, 16, 17, 18, 19, 20, 140, 30, 93, 67, | 747 | 9, 10, 11, 12, 150, 14, 15, 16, 17, 18, |
736 | 25, 30, 70, 30, 72, 30, 28, 25, 26, 31, | 748 | 19, 20, 21, 22, 23, 24, 0, 26, 164, 100, |
737 | 32, 155, 24, 108, 0, 1, 30, 3, 4, 5, | 749 | 77, 78, 31, 80, 77, 78, 31, 80, 31, 32, |
738 | 6, 7, 8, 9, 10, 11, 12, 30, 14, 15, | 750 | 33, 0, 1, 31, 115, 4, 5, 6, 7, 8, |
739 | 16, 17, 18, 19, 20, 21, 22, 23, 69, 25, | 751 | 9, 10, 11, 26, 27, 14, 15, 16, 17, 18, |
740 | 71, 30, 0, 1, 30, 3, 4, 5, 6, 7, | 752 | 19, 20, 21, 22, 23, 31, 26, 26, 31, 0, |
741 | 8, 9, 10, 11, 31, 32, 14, 15, 16, 17, | 753 | 1, 26, 31, 4, 5, 6, 7, 8, 9, 10, |
742 | 18, 19, 20, 21, 22, 5, 6, 25, 8, 9, | 754 | 11, 26, 31, 14, 15, 16, 17, 18, 19, 20, |
743 | 10, 11, 30, 30, 14, 15, 30, 0, 1, 174, | 755 | 21, 22, 23, 1, 1, 26, 31, 32, 33, 31, |
744 | 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, | 756 | 31, 0, 1, 31, 31, 4, 5, 6, 7, 8, |
745 | 30, 14, 15, 16, 17, 18, 19, 20, 21, 22, | 757 | 9, 10, 11, 31, 185, 14, 15, 16, 17, 18, |
746 | 68, 69, 25, 71, 69, 1, 71, 30, 4, 5, | 758 | 19, 20, 21, 22, 23, 31, 1, 26, 31, 31, |
747 | 6, 7, 8, 9, 10, 11, 30, 30, 14, 15, | 759 | 5, 6, 31, 8, 9, 10, 11, 12, 31, 14, |
748 | 16, 14, 143, 144, 145, 68, 69, 30, 71, 25, | 760 | 15, 16, 17, 18, 19, 20, 31, 31, 31, 25, |
749 | 151, 25, 153, 1, 30, 30, 31, 32, 31, 32, | 761 | 1, 26, 26, 13, 1, 26, 31, 4, 5, 6, |
750 | 161, 30, 31, 32, 13, 30, 25, 14, 32, 30, | 762 | 7, 8, 9, 10, 11, 31, 14, 14, 15, 16, |
751 | 30, 33, 30, 30, 30, 30, 30, 30, 30, 29, | 763 | 4, 5, 6, 7, 8, 9, 10, 11, 33, 26, |
752 | 67, 109, 60, -1, -1, -1, -1, -1, -1, 40 | 764 | 14, 15, 5, 6, 31, 8, 9, 10, 11, 31, |
765 | 31, 14, 15, 31, 31, 31, 31, 31, 31, 151, | ||
766 | 31, 153, 154, 155, 34, 31, 7, 6, 31, 161, | ||
767 | 37, 163, 76, -1, 79, 116, -1, -1, -1, -1, | ||
768 | 172 | ||
753 | }; | 769 | }; |
754 | 770 | ||
755 | /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing | 771 | /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing |
756 | symbol of state STATE-NUM. */ | 772 | symbol of state STATE-NUM. */ |
757 | static const yytype_uint8 yystos[] = | 773 | static const yytype_uint8 yystos[] = |
758 | { | 774 | { |
759 | 0, 36, 37, 0, 1, 3, 4, 5, 6, 7, | 775 | 0, 3, 31, 37, 38, 39, 63, 81, 26, 27, |
760 | 8, 9, 10, 11, 14, 15, 16, 17, 18, 19, | 776 | 79, 0, 1, 4, 5, 6, 7, 8, 9, 10, |
761 | 20, 21, 22, 25, 30, 38, 39, 41, 42, 43, | 777 | 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, |
762 | 44, 50, 51, 53, 57, 59, 61, 62, 64, 66, | 778 | 23, 26, 31, 40, 41, 43, 44, 45, 46, 52, |
763 | 67, 68, 75, 30, 25, 26, 74, 74, 30, 74, | 779 | 53, 55, 59, 61, 64, 65, 67, 69, 70, 71, |
764 | 25, 80, 30, 74, 25, 25, 25, 26, 29, 34, | 780 | 80, 39, 31, 38, 81, 31, 79, 31, 79, 26, |
765 | 78, 79, 30, 1, 1, 45, 45, 54, 56, 60, | 781 | 85, 31, 79, 26, 26, 26, 27, 30, 35, 83, |
766 | 71, 65, 71, 30, 76, 30, 30, 30, 30, 30, | 782 | 84, 31, 1, 1, 47, 47, 56, 58, 62, 76, |
767 | 30, 78, 78, 31, 32, 76, 27, 33, 30, 30, | 783 | 68, 74, 31, 31, 31, 31, 31, 31, 83, 83, |
768 | 1, 12, 16, 18, 19, 20, 21, 22, 23, 25, | 784 | 32, 33, 81, 28, 34, 31, 31, 1, 12, 16, |
769 | 30, 40, 46, 47, 69, 70, 72, 17, 18, 19, | 785 | 18, 19, 20, 21, 22, 24, 26, 31, 42, 48, |
770 | 20, 30, 40, 55, 70, 72, 39, 52, 75, 39, | 786 | 49, 72, 73, 75, 17, 18, 19, 20, 31, 42, |
771 | 53, 58, 64, 75, 30, 40, 72, 39, 53, 63, | 787 | 57, 73, 75, 41, 54, 80, 41, 55, 60, 67, |
772 | 64, 75, 30, 28, 78, 78, 79, 79, 30, 30, | 788 | 80, 23, 31, 74, 77, 41, 55, 66, 67, 80, |
773 | 24, 74, 73, 74, 78, 25, 79, 48, 1, 13, | 789 | 31, 42, 75, 29, 83, 83, 84, 84, 31, 31, |
774 | 30, 74, 73, 25, 78, 14, 77, 30, 77, 77, | 790 | 25, 79, 78, 79, 83, 26, 84, 50, 1, 13, |
775 | 77, 79, 25, 30, 30, 77, 30, 77, 30, 78, | 791 | 31, 79, 78, 26, 14, 82, 83, 82, 31, 82, |
776 | 30, 30, 30, 77, 33, 49, 30, 30, 30, 74 | 792 | 82, 82, 84, 26, 31, 31, 82, 31, 82, 83, |
793 | 31, 31, 31, 31, 82, 34, 51, 31, 31, 31, | ||
794 | 79 | ||
777 | }; | 795 | }; |
778 | 796 | ||
779 | #define yyerrok (yyerrstatus = 0) | 797 | #define yyerrok (yyerrstatus = 0) |
@@ -1284,7 +1302,7 @@ yydestruct (yymsg, yytype, yyvaluep) | |||
1284 | 1302 | ||
1285 | switch (yytype) | 1303 | switch (yytype) |
1286 | { | 1304 | { |
1287 | case 51: /* "choice_entry" */ | 1305 | case 53: /* "choice_entry" */ |
1288 | 1306 | ||
1289 | { | 1307 | { |
1290 | fprintf(stderr, "%s:%d: missing end statement for this entry\n", | 1308 | fprintf(stderr, "%s:%d: missing end statement for this entry\n", |
@@ -1294,7 +1312,7 @@ yydestruct (yymsg, yytype, yyvaluep) | |||
1294 | }; | 1312 | }; |
1295 | 1313 | ||
1296 | break; | 1314 | break; |
1297 | case 57: /* "if_entry" */ | 1315 | case 59: /* "if_entry" */ |
1298 | 1316 | ||
1299 | { | 1317 | { |
1300 | fprintf(stderr, "%s:%d: missing end statement for this entry\n", | 1318 | fprintf(stderr, "%s:%d: missing end statement for this entry\n", |
@@ -1304,7 +1322,7 @@ yydestruct (yymsg, yytype, yyvaluep) | |||
1304 | }; | 1322 | }; |
1305 | 1323 | ||
1306 | break; | 1324 | break; |
1307 | case 62: /* "menu_entry" */ | 1325 | case 65: /* "menu_entry" */ |
1308 | 1326 | ||
1309 | { | 1327 | { |
1310 | fprintf(stderr, "%s:%d: missing end statement for this entry\n", | 1328 | fprintf(stderr, "%s:%d: missing end statement for this entry\n", |
@@ -1614,39 +1632,39 @@ yyreduce: | |||
1614 | YY_REDUCE_PRINT (yyn); | 1632 | YY_REDUCE_PRINT (yyn); |
1615 | switch (yyn) | 1633 | switch (yyn) |
1616 | { | 1634 | { |
1617 | case 8: | 1635 | case 10: |
1618 | 1636 | ||
1619 | { zconf_error("unexpected end statement"); ;} | 1637 | { zconf_error("unexpected end statement"); ;} |
1620 | break; | 1638 | break; |
1621 | 1639 | ||
1622 | case 9: | 1640 | case 11: |
1623 | 1641 | ||
1624 | { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;} | 1642 | { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;} |
1625 | break; | 1643 | break; |
1626 | 1644 | ||
1627 | case 10: | 1645 | case 12: |
1628 | 1646 | ||
1629 | { | 1647 | { |
1630 | zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name); | 1648 | zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name); |
1631 | ;} | 1649 | ;} |
1632 | break; | 1650 | break; |
1633 | 1651 | ||
1634 | case 11: | 1652 | case 13: |
1635 | 1653 | ||
1636 | { zconf_error("invalid statement"); ;} | 1654 | { zconf_error("invalid statement"); ;} |
1637 | break; | 1655 | break; |
1638 | 1656 | ||
1639 | case 25: | 1657 | case 28: |
1640 | 1658 | ||
1641 | { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;} | 1659 | { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;} |
1642 | break; | 1660 | break; |
1643 | 1661 | ||
1644 | case 26: | 1662 | case 29: |
1645 | 1663 | ||
1646 | { zconf_error("invalid option"); ;} | 1664 | { zconf_error("invalid option"); ;} |
1647 | break; | 1665 | break; |
1648 | 1666 | ||
1649 | case 27: | 1667 | case 30: |
1650 | 1668 | ||
1651 | { | 1669 | { |
1652 | struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0); | 1670 | struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0); |
@@ -1656,7 +1674,7 @@ yyreduce: | |||
1656 | ;} | 1674 | ;} |
1657 | break; | 1675 | break; |
1658 | 1676 | ||
1659 | case 28: | 1677 | case 31: |
1660 | 1678 | ||
1661 | { | 1679 | { |
1662 | menu_end_entry(); | 1680 | menu_end_entry(); |
@@ -1664,7 +1682,7 @@ yyreduce: | |||
1664 | ;} | 1682 | ;} |
1665 | break; | 1683 | break; |
1666 | 1684 | ||
1667 | case 29: | 1685 | case 32: |
1668 | 1686 | ||
1669 | { | 1687 | { |
1670 | struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0); | 1688 | struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0); |
@@ -1674,7 +1692,7 @@ yyreduce: | |||
1674 | ;} | 1692 | ;} |
1675 | break; | 1693 | break; |
1676 | 1694 | ||
1677 | case 30: | 1695 | case 33: |
1678 | 1696 | ||
1679 | { | 1697 | { |
1680 | if (current_entry->prompt) | 1698 | if (current_entry->prompt) |
@@ -1686,7 +1704,7 @@ yyreduce: | |||
1686 | ;} | 1704 | ;} |
1687 | break; | 1705 | break; |
1688 | 1706 | ||
1689 | case 38: | 1707 | case 41: |
1690 | 1708 | ||
1691 | { | 1709 | { |
1692 | menu_set_type((yyvsp[(1) - (3)].id)->stype); | 1710 | menu_set_type((yyvsp[(1) - (3)].id)->stype); |
@@ -1696,7 +1714,7 @@ yyreduce: | |||
1696 | ;} | 1714 | ;} |
1697 | break; | 1715 | break; |
1698 | 1716 | ||
1699 | case 39: | 1717 | case 42: |
1700 | 1718 | ||
1701 | { | 1719 | { |
1702 | menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr)); | 1720 | menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr)); |
@@ -1704,7 +1722,7 @@ yyreduce: | |||
1704 | ;} | 1722 | ;} |
1705 | break; | 1723 | break; |
1706 | 1724 | ||
1707 | case 40: | 1725 | case 43: |
1708 | 1726 | ||
1709 | { | 1727 | { |
1710 | menu_add_expr(P_DEFAULT, (yyvsp[(2) - (4)].expr), (yyvsp[(3) - (4)].expr)); | 1728 | menu_add_expr(P_DEFAULT, (yyvsp[(2) - (4)].expr), (yyvsp[(3) - (4)].expr)); |
@@ -1716,7 +1734,7 @@ yyreduce: | |||
1716 | ;} | 1734 | ;} |
1717 | break; | 1735 | break; |
1718 | 1736 | ||
1719 | case 41: | 1737 | case 44: |
1720 | 1738 | ||
1721 | { | 1739 | { |
1722 | menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr)); | 1740 | menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr)); |
@@ -1724,7 +1742,7 @@ yyreduce: | |||
1724 | ;} | 1742 | ;} |
1725 | break; | 1743 | break; |
1726 | 1744 | ||
1727 | case 42: | 1745 | case 45: |
1728 | 1746 | ||
1729 | { | 1747 | { |
1730 | menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr)); | 1748 | menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr)); |
@@ -1732,7 +1750,7 @@ yyreduce: | |||
1732 | ;} | 1750 | ;} |
1733 | break; | 1751 | break; |
1734 | 1752 | ||
1735 | case 45: | 1753 | case 48: |
1736 | 1754 | ||
1737 | { | 1755 | { |
1738 | struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string), strlen((yyvsp[(2) - (3)].string))); | 1756 | struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string), strlen((yyvsp[(2) - (3)].string))); |
@@ -1744,17 +1762,17 @@ yyreduce: | |||
1744 | ;} | 1762 | ;} |
1745 | break; | 1763 | break; |
1746 | 1764 | ||
1747 | case 46: | 1765 | case 49: |
1748 | 1766 | ||
1749 | { (yyval.string) = NULL; ;} | 1767 | { (yyval.string) = NULL; ;} |
1750 | break; | 1768 | break; |
1751 | 1769 | ||
1752 | case 47: | 1770 | case 50: |
1753 | 1771 | ||
1754 | { (yyval.string) = (yyvsp[(2) - (2)].string); ;} | 1772 | { (yyval.string) = (yyvsp[(2) - (2)].string); ;} |
1755 | break; | 1773 | break; |
1756 | 1774 | ||
1757 | case 48: | 1775 | case 51: |
1758 | 1776 | ||
1759 | { | 1777 | { |
1760 | struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), SYMBOL_CHOICE); | 1778 | struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), SYMBOL_CHOICE); |
@@ -1765,14 +1783,14 @@ yyreduce: | |||
1765 | ;} | 1783 | ;} |
1766 | break; | 1784 | break; |
1767 | 1785 | ||
1768 | case 49: | 1786 | case 52: |
1769 | 1787 | ||
1770 | { | 1788 | { |
1771 | (yyval.menu) = menu_add_menu(); | 1789 | (yyval.menu) = menu_add_menu(); |
1772 | ;} | 1790 | ;} |
1773 | break; | 1791 | break; |
1774 | 1792 | ||
1775 | case 50: | 1793 | case 53: |
1776 | 1794 | ||
1777 | { | 1795 | { |
1778 | if (zconf_endtoken((yyvsp[(1) - (1)].id), T_CHOICE, T_ENDCHOICE)) { | 1796 | if (zconf_endtoken((yyvsp[(1) - (1)].id), T_CHOICE, T_ENDCHOICE)) { |
@@ -1782,7 +1800,7 @@ yyreduce: | |||
1782 | ;} | 1800 | ;} |
1783 | break; | 1801 | break; |
1784 | 1802 | ||
1785 | case 58: | 1803 | case 61: |
1786 | 1804 | ||
1787 | { | 1805 | { |
1788 | menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr)); | 1806 | menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr)); |
@@ -1790,7 +1808,7 @@ yyreduce: | |||
1790 | ;} | 1808 | ;} |
1791 | break; | 1809 | break; |
1792 | 1810 | ||
1793 | case 59: | 1811 | case 62: |
1794 | 1812 | ||
1795 | { | 1813 | { |
1796 | if ((yyvsp[(1) - (3)].id)->stype == S_BOOLEAN || (yyvsp[(1) - (3)].id)->stype == S_TRISTATE) { | 1814 | if ((yyvsp[(1) - (3)].id)->stype == S_BOOLEAN || (yyvsp[(1) - (3)].id)->stype == S_TRISTATE) { |
@@ -1803,7 +1821,7 @@ yyreduce: | |||
1803 | ;} | 1821 | ;} |
1804 | break; | 1822 | break; |
1805 | 1823 | ||
1806 | case 60: | 1824 | case 63: |
1807 | 1825 | ||
1808 | { | 1826 | { |
1809 | current_entry->sym->flags |= SYMBOL_OPTIONAL; | 1827 | current_entry->sym->flags |= SYMBOL_OPTIONAL; |
@@ -1811,7 +1829,7 @@ yyreduce: | |||
1811 | ;} | 1829 | ;} |
1812 | break; | 1830 | break; |
1813 | 1831 | ||
1814 | case 61: | 1832 | case 64: |
1815 | 1833 | ||
1816 | { | 1834 | { |
1817 | if ((yyvsp[(1) - (4)].id)->stype == S_UNKNOWN) { | 1835 | if ((yyvsp[(1) - (4)].id)->stype == S_UNKNOWN) { |
@@ -1823,7 +1841,7 @@ yyreduce: | |||
1823 | ;} | 1841 | ;} |
1824 | break; | 1842 | break; |
1825 | 1843 | ||
1826 | case 64: | 1844 | case 67: |
1827 | 1845 | ||
1828 | { | 1846 | { |
1829 | printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno()); | 1847 | printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno()); |
@@ -1833,7 +1851,7 @@ yyreduce: | |||
1833 | ;} | 1851 | ;} |
1834 | break; | 1852 | break; |
1835 | 1853 | ||
1836 | case 65: | 1854 | case 68: |
1837 | 1855 | ||
1838 | { | 1856 | { |
1839 | if (zconf_endtoken((yyvsp[(1) - (1)].id), T_IF, T_ENDIF)) { | 1857 | if (zconf_endtoken((yyvsp[(1) - (1)].id), T_IF, T_ENDIF)) { |
@@ -1843,7 +1861,14 @@ yyreduce: | |||
1843 | ;} | 1861 | ;} |
1844 | break; | 1862 | break; |
1845 | 1863 | ||
1846 | case 71: | 1864 | case 74: |
1865 | |||
1866 | { | ||
1867 | menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL); | ||
1868 | ;} | ||
1869 | break; | ||
1870 | |||
1871 | case 75: | ||
1847 | 1872 | ||
1848 | { | 1873 | { |
1849 | menu_add_entry(NULL); | 1874 | menu_add_entry(NULL); |
@@ -1852,14 +1877,14 @@ yyreduce: | |||
1852 | ;} | 1877 | ;} |
1853 | break; | 1878 | break; |
1854 | 1879 | ||
1855 | case 72: | 1880 | case 76: |
1856 | 1881 | ||
1857 | { | 1882 | { |
1858 | (yyval.menu) = menu_add_menu(); | 1883 | (yyval.menu) = menu_add_menu(); |
1859 | ;} | 1884 | ;} |
1860 | break; | 1885 | break; |
1861 | 1886 | ||
1862 | case 73: | 1887 | case 77: |
1863 | 1888 | ||
1864 | { | 1889 | { |
1865 | if (zconf_endtoken((yyvsp[(1) - (1)].id), T_MENU, T_ENDMENU)) { | 1890 | if (zconf_endtoken((yyvsp[(1) - (1)].id), T_MENU, T_ENDMENU)) { |
@@ -1869,7 +1894,7 @@ yyreduce: | |||
1869 | ;} | 1894 | ;} |
1870 | break; | 1895 | break; |
1871 | 1896 | ||
1872 | case 79: | 1897 | case 83: |
1873 | 1898 | ||
1874 | { | 1899 | { |
1875 | printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string)); | 1900 | printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string)); |
@@ -1877,7 +1902,7 @@ yyreduce: | |||
1877 | ;} | 1902 | ;} |
1878 | break; | 1903 | break; |
1879 | 1904 | ||
1880 | case 80: | 1905 | case 84: |
1881 | 1906 | ||
1882 | { | 1907 | { |
1883 | menu_add_entry(NULL); | 1908 | menu_add_entry(NULL); |
@@ -1886,14 +1911,14 @@ yyreduce: | |||
1886 | ;} | 1911 | ;} |
1887 | break; | 1912 | break; |
1888 | 1913 | ||
1889 | case 81: | 1914 | case 85: |
1890 | 1915 | ||
1891 | { | 1916 | { |
1892 | menu_end_entry(); | 1917 | menu_end_entry(); |
1893 | ;} | 1918 | ;} |
1894 | break; | 1919 | break; |
1895 | 1920 | ||
1896 | case 82: | 1921 | case 86: |
1897 | 1922 | ||
1898 | { | 1923 | { |
1899 | printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno()); | 1924 | printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno()); |
@@ -1901,14 +1926,14 @@ yyreduce: | |||
1901 | ;} | 1926 | ;} |
1902 | break; | 1927 | break; |
1903 | 1928 | ||
1904 | case 83: | 1929 | case 87: |
1905 | 1930 | ||
1906 | { | 1931 | { |
1907 | current_entry->help = (yyvsp[(2) - (2)].string); | 1932 | current_entry->help = (yyvsp[(2) - (2)].string); |
1908 | ;} | 1933 | ;} |
1909 | break; | 1934 | break; |
1910 | 1935 | ||
1911 | case 88: | 1936 | case 92: |
1912 | 1937 | ||
1913 | { | 1938 | { |
1914 | menu_add_dep((yyvsp[(3) - (4)].expr)); | 1939 | menu_add_dep((yyvsp[(3) - (4)].expr)); |
@@ -1916,84 +1941,91 @@ yyreduce: | |||
1916 | ;} | 1941 | ;} |
1917 | break; | 1942 | break; |
1918 | 1943 | ||
1919 | case 90: | 1944 | case 96: |
1945 | |||
1946 | { | ||
1947 | menu_add_visibility((yyvsp[(2) - (2)].expr)); | ||
1948 | ;} | ||
1949 | break; | ||
1950 | |||
1951 | case 98: | ||
1920 | 1952 | ||
1921 | { | 1953 | { |
1922 | menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr)); | 1954 | menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr)); |
1923 | ;} | 1955 | ;} |
1924 | break; | 1956 | break; |
1925 | 1957 | ||
1926 | case 93: | 1958 | case 101: |
1927 | 1959 | ||
1928 | { (yyval.id) = (yyvsp[(1) - (2)].id); ;} | 1960 | { (yyval.id) = (yyvsp[(1) - (2)].id); ;} |
1929 | break; | 1961 | break; |
1930 | 1962 | ||
1931 | case 94: | 1963 | case 102: |
1932 | 1964 | ||
1933 | { (yyval.id) = (yyvsp[(1) - (2)].id); ;} | 1965 | { (yyval.id) = (yyvsp[(1) - (2)].id); ;} |
1934 | break; | 1966 | break; |
1935 | 1967 | ||
1936 | case 95: | 1968 | case 103: |
1937 | 1969 | ||
1938 | { (yyval.id) = (yyvsp[(1) - (2)].id); ;} | 1970 | { (yyval.id) = (yyvsp[(1) - (2)].id); ;} |
1939 | break; | 1971 | break; |
1940 | 1972 | ||
1941 | case 98: | 1973 | case 106: |
1942 | 1974 | ||
1943 | { (yyval.expr) = NULL; ;} | 1975 | { (yyval.expr) = NULL; ;} |
1944 | break; | 1976 | break; |
1945 | 1977 | ||
1946 | case 99: | 1978 | case 107: |
1947 | 1979 | ||
1948 | { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;} | 1980 | { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;} |
1949 | break; | 1981 | break; |
1950 | 1982 | ||
1951 | case 100: | 1983 | case 108: |
1952 | 1984 | ||
1953 | { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;} | 1985 | { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;} |
1954 | break; | 1986 | break; |
1955 | 1987 | ||
1956 | case 101: | 1988 | case 109: |
1957 | 1989 | ||
1958 | { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;} | 1990 | { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;} |
1959 | break; | 1991 | break; |
1960 | 1992 | ||
1961 | case 102: | 1993 | case 110: |
1962 | 1994 | ||
1963 | { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;} | 1995 | { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;} |
1964 | break; | 1996 | break; |
1965 | 1997 | ||
1966 | case 103: | 1998 | case 111: |
1967 | 1999 | ||
1968 | { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;} | 2000 | { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;} |
1969 | break; | 2001 | break; |
1970 | 2002 | ||
1971 | case 104: | 2003 | case 112: |
1972 | 2004 | ||
1973 | { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;} | 2005 | { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;} |
1974 | break; | 2006 | break; |
1975 | 2007 | ||
1976 | case 105: | 2008 | case 113: |
1977 | 2009 | ||
1978 | { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;} | 2010 | { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;} |
1979 | break; | 2011 | break; |
1980 | 2012 | ||
1981 | case 106: | 2013 | case 114: |
1982 | 2014 | ||
1983 | { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;} | 2015 | { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;} |
1984 | break; | 2016 | break; |
1985 | 2017 | ||
1986 | case 107: | 2018 | case 115: |
1987 | 2019 | ||
1988 | { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;} | 2020 | { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;} |
1989 | break; | 2021 | break; |
1990 | 2022 | ||
1991 | case 108: | 2023 | case 116: |
1992 | 2024 | ||
1993 | { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;} | 2025 | { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;} |
1994 | break; | 2026 | break; |
1995 | 2027 | ||
1996 | case 109: | 2028 | case 117: |
1997 | 2029 | ||
1998 | { (yyval.string) = NULL; ;} | 2030 | { (yyval.string) = NULL; ;} |
1999 | break; | 2031 | break; |
@@ -2239,6 +2271,10 @@ void conf_parse(const char *name) | |||
2239 | prop = prop_alloc(P_DEFAULT, modules_sym); | 2271 | prop = prop_alloc(P_DEFAULT, modules_sym); |
2240 | prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); | 2272 | prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); |
2241 | } | 2273 | } |
2274 | |||
2275 | rootmenu.prompt->text = _(rootmenu.prompt->text); | ||
2276 | rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); | ||
2277 | |||
2242 | menu_finalize(&rootmenu); | 2278 | menu_finalize(&rootmenu); |
2243 | for_all_symbols(i, sym) { | 2279 | for_all_symbols(i, sym) { |
2244 | if (sym_check_deps(sym)) | 2280 | if (sym_check_deps(sym)) |
@@ -2259,6 +2295,7 @@ static const char *zconf_tokenname(int token) | |||
2259 | case T_IF: return "if"; | 2295 | case T_IF: return "if"; |
2260 | case T_ENDIF: return "endif"; | 2296 | case T_ENDIF: return "endif"; |
2261 | case T_DEPENDS: return "depends"; | 2297 | case T_DEPENDS: return "depends"; |
2298 | case T_VISIBLE: return "visible"; | ||
2262 | } | 2299 | } |
2263 | return "<token>"; | 2300 | return "<token>"; |
2264 | } | 2301 | } |
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 23dfd3baa7a..49fb4ab664c 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
@@ -36,7 +36,7 @@ static struct menu *current_menu, *current_entry; | |||
36 | #define YYERROR_VERBOSE | 36 | #define YYERROR_VERBOSE |
37 | #endif | 37 | #endif |
38 | %} | 38 | %} |
39 | %expect 26 | 39 | %expect 30 |
40 | 40 | ||
41 | %union | 41 | %union |
42 | { | 42 | { |
@@ -68,6 +68,7 @@ static struct menu *current_menu, *current_entry; | |||
68 | %token <id>T_DEFAULT | 68 | %token <id>T_DEFAULT |
69 | %token <id>T_SELECT | 69 | %token <id>T_SELECT |
70 | %token <id>T_RANGE | 70 | %token <id>T_RANGE |
71 | %token <id>T_VISIBLE | ||
71 | %token <id>T_OPTION | 72 | %token <id>T_OPTION |
72 | %token <id>T_ON | 73 | %token <id>T_ON |
73 | %token <string> T_WORD | 74 | %token <string> T_WORD |
@@ -104,14 +105,15 @@ static struct menu *current_menu, *current_entry; | |||
104 | %} | 105 | %} |
105 | 106 | ||
106 | %% | 107 | %% |
107 | input: stmt_list; | 108 | input: nl start | start; |
109 | |||
110 | start: mainmenu_stmt stmt_list | stmt_list; | ||
108 | 111 | ||
109 | stmt_list: | 112 | stmt_list: |
110 | /* empty */ | 113 | /* empty */ |
111 | | stmt_list common_stmt | 114 | | stmt_list common_stmt |
112 | | stmt_list choice_stmt | 115 | | stmt_list choice_stmt |
113 | | stmt_list menu_stmt | 116 | | stmt_list menu_stmt |
114 | | stmt_list T_MAINMENU prompt nl | ||
115 | | stmt_list end { zconf_error("unexpected end statement"); } | 117 | | stmt_list end { zconf_error("unexpected end statement"); } |
116 | | stmt_list T_WORD error T_EOL { zconf_error("unknown statement \"%s\"", $2); } | 118 | | stmt_list T_WORD error T_EOL { zconf_error("unknown statement \"%s\"", $2); } |
117 | | stmt_list option_name error T_EOL | 119 | | stmt_list option_name error T_EOL |
@@ -122,7 +124,7 @@ stmt_list: | |||
122 | ; | 124 | ; |
123 | 125 | ||
124 | option_name: | 126 | option_name: |
125 | T_DEPENDS | T_PROMPT | T_TYPE | T_SELECT | T_OPTIONAL | T_RANGE | T_DEFAULT | 127 | T_DEPENDS | T_PROMPT | T_TYPE | T_SELECT | T_OPTIONAL | T_RANGE | T_DEFAULT | T_VISIBLE |
126 | ; | 128 | ; |
127 | 129 | ||
128 | common_stmt: | 130 | common_stmt: |
@@ -342,6 +344,13 @@ if_block: | |||
342 | | if_block choice_stmt | 344 | | if_block choice_stmt |
343 | ; | 345 | ; |
344 | 346 | ||
347 | /* mainmenu entry */ | ||
348 | |||
349 | mainmenu_stmt: T_MAINMENU prompt nl | ||
350 | { | ||
351 | menu_add_prompt(P_MENU, $2, NULL); | ||
352 | }; | ||
353 | |||
345 | /* menu entry */ | 354 | /* menu entry */ |
346 | 355 | ||
347 | menu: T_MENU prompt T_EOL | 356 | menu: T_MENU prompt T_EOL |
@@ -351,7 +360,7 @@ menu: T_MENU prompt T_EOL | |||
351 | printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); | 360 | printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); |
352 | }; | 361 | }; |
353 | 362 | ||
354 | menu_entry: menu depends_list | 363 | menu_entry: menu visibility_list depends_list |
355 | { | 364 | { |
356 | $$ = menu_add_menu(); | 365 | $$ = menu_add_menu(); |
357 | }; | 366 | }; |
@@ -422,6 +431,19 @@ depends: T_DEPENDS T_ON expr T_EOL | |||
422 | printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); | 431 | printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); |
423 | }; | 432 | }; |
424 | 433 | ||
434 | /* visibility option */ | ||
435 | |||
436 | visibility_list: | ||
437 | /* empty */ | ||
438 | | visibility_list visible | ||
439 | | visibility_list T_EOL | ||
440 | ; | ||
441 | |||
442 | visible: T_VISIBLE if_expr | ||
443 | { | ||
444 | menu_add_visibility($2); | ||
445 | }; | ||
446 | |||
425 | /* prompt statement */ | 447 | /* prompt statement */ |
426 | 448 | ||
427 | prompt_stmt_opt: | 449 | prompt_stmt_opt: |
@@ -494,6 +516,10 @@ void conf_parse(const char *name) | |||
494 | prop = prop_alloc(P_DEFAULT, modules_sym); | 516 | prop = prop_alloc(P_DEFAULT, modules_sym); |
495 | prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); | 517 | prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); |
496 | } | 518 | } |
519 | |||
520 | rootmenu.prompt->text = _(rootmenu.prompt->text); | ||
521 | rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); | ||
522 | |||
497 | menu_finalize(&rootmenu); | 523 | menu_finalize(&rootmenu); |
498 | for_all_symbols(i, sym) { | 524 | for_all_symbols(i, sym) { |
499 | if (sym_check_deps(sym)) | 525 | if (sym_check_deps(sym)) |
@@ -514,6 +540,7 @@ static const char *zconf_tokenname(int token) | |||
514 | case T_IF: return "if"; | 540 | case T_IF: return "if"; |
515 | case T_ENDIF: return "endif"; | 541 | case T_ENDIF: return "endif"; |
516 | case T_DEPENDS: return "depends"; | 542 | case T_DEPENDS: return "depends"; |
543 | case T_VISIBLE: return "visible"; | ||
517 | } | 544 | } |
518 | return "<token>"; | 545 | return "<token>"; |
519 | } | 546 | } |
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 241310e59cd..9f85012acf0 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
@@ -5,7 +5,7 @@ use strict; | |||
5 | ## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ## | 5 | ## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ## |
6 | ## Copyright (C) 2000, 1 Tim Waugh <twaugh@redhat.com> ## | 6 | ## Copyright (C) 2000, 1 Tim Waugh <twaugh@redhat.com> ## |
7 | ## Copyright (C) 2001 Simon Huggins ## | 7 | ## Copyright (C) 2001 Simon Huggins ## |
8 | ## Copyright (C) 2005-2009 Randy Dunlap ## | 8 | ## Copyright (C) 2005-2010 Randy Dunlap ## |
9 | ## ## | 9 | ## ## |
10 | ## #define enhancements by Armin Kuster <akuster@mvista.com> ## | 10 | ## #define enhancements by Armin Kuster <akuster@mvista.com> ## |
11 | ## Copyright (c) 2000 MontaVista Software, Inc. ## | 11 | ## Copyright (c) 2000 MontaVista Software, Inc. ## |
@@ -13,8 +13,6 @@ use strict; | |||
13 | ## This software falls under the GNU General Public License. ## | 13 | ## This software falls under the GNU General Public License. ## |
14 | ## Please read the COPYING file for more information ## | 14 | ## Please read the COPYING file for more information ## |
15 | 15 | ||
16 | # w.o. 03-11-2000: added the '-filelist' option. | ||
17 | |||
18 | # 18/01/2001 - Cleanups | 16 | # 18/01/2001 - Cleanups |
19 | # Functions prototyped as foo(void) same as foo() | 17 | # Functions prototyped as foo(void) same as foo() |
20 | # Stop eval'ing where we don't need to. | 18 | # Stop eval'ing where we don't need to. |
@@ -46,12 +44,13 @@ use strict; | |||
46 | # Note: This only supports 'c'. | 44 | # Note: This only supports 'c'. |
47 | 45 | ||
48 | # usage: | 46 | # usage: |
49 | # kernel-doc [ -docbook | -html | -text | -man ] [ -no-doc-sections ] | 47 | # kernel-doc [ -docbook | -html | -text | -man | -list ] [ -no-doc-sections ] |
50 | # [ -function funcname [ -function funcname ...] ] c file(s)s > outputfile | 48 | # [ -function funcname [ -function funcname ...] ] c file(s)s > outputfile |
51 | # or | 49 | # or |
52 | # [ -nofunction funcname [ -function funcname ...] ] c file(s)s > outputfile | 50 | # [ -nofunction funcname [ -function funcname ...] ] c file(s)s > outputfile |
53 | # | 51 | # |
54 | # Set output format using one of -docbook -html -text or -man. Default is man. | 52 | # Set output format using one of -docbook -html -text or -man. Default is man. |
53 | # The -list format is for internal use by docproc. | ||
55 | # | 54 | # |
56 | # -no-doc-sections | 55 | # -no-doc-sections |
57 | # Do not output DOC: sections | 56 | # Do not output DOC: sections |
@@ -156,6 +155,8 @@ use strict; | |||
156 | # '@parameter' - name of a parameter | 155 | # '@parameter' - name of a parameter |
157 | # '%CONST' - name of a constant. | 156 | # '%CONST' - name of a constant. |
158 | 157 | ||
158 | ## init lots of data | ||
159 | |||
159 | my $errors = 0; | 160 | my $errors = 0; |
160 | my $warnings = 0; | 161 | my $warnings = 0; |
161 | my $anon_struct_union = 0; | 162 | my $anon_struct_union = 0; |
@@ -212,21 +213,21 @@ my %highlights_text = ( $type_constant, "\$1", | |||
212 | $type_param, "\$1" ); | 213 | $type_param, "\$1" ); |
213 | my $blankline_text = ""; | 214 | my $blankline_text = ""; |
214 | 215 | ||
215 | 216 | # list mode | |
216 | sub usage { | 217 | my %highlights_list = ( $type_constant, "\$1", |
217 | print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man ] [ -no-doc-sections ]\n"; | 218 | $type_func, "\$1", |
218 | print " [ -function funcname [ -function funcname ...] ]\n"; | 219 | $type_struct, "\$1", |
219 | print " [ -nofunction funcname [ -nofunction funcname ...] ]\n"; | 220 | $type_param, "\$1" ); |
220 | print " c source file(s) > outputfile\n"; | 221 | my $blankline_list = ""; |
221 | print " -v : verbose output, more warnings & other info listed\n"; | ||
222 | exit 1; | ||
223 | } | ||
224 | 222 | ||
225 | # read arguments | 223 | # read arguments |
226 | if ($#ARGV == -1) { | 224 | if ($#ARGV == -1) { |
227 | usage(); | 225 | usage(); |
228 | } | 226 | } |
229 | 227 | ||
228 | my $kernelversion; | ||
229 | my $dohighlight = ""; | ||
230 | |||
230 | my $verbose = 0; | 231 | my $verbose = 0; |
231 | my $output_mode = "man"; | 232 | my $output_mode = "man"; |
232 | my $no_doc_sections = 0; | 233 | my $no_doc_sections = 0; |
@@ -239,13 +240,13 @@ my $man_date = ('January', 'February', 'March', 'April', 'May', 'June', | |||
239 | 'November', 'December')[(localtime)[4]] . | 240 | 'November', 'December')[(localtime)[4]] . |
240 | " " . ((localtime)[5]+1900); | 241 | " " . ((localtime)[5]+1900); |
241 | 242 | ||
242 | # Essentially these are globals | 243 | # Essentially these are globals. |
243 | # They probably want to be tidied up, made more localised or something. | 244 | # They probably want to be tidied up, made more localised or something. |
244 | # CAVEAT EMPTOR! Some of the others I localised may not want to be, which | 245 | # CAVEAT EMPTOR! Some of the others I localised may not want to be, which |
245 | # could cause "use of undefined value" or other bugs. | 246 | # could cause "use of undefined value" or other bugs. |
246 | my ($function, %function_table, %parametertypes, $declaration_purpose); | 247 | my ($function, %function_table, %parametertypes, $declaration_purpose); |
247 | my ($type, $declaration_name, $return_type); | 248 | my ($type, $declaration_name, $return_type); |
248 | my ($newsection, $newcontents, $prototype, $filelist, $brcount, %source_map); | 249 | my ($newsection, $newcontents, $prototype, $brcount, %source_map); |
249 | 250 | ||
250 | if (defined($ENV{'KBUILD_VERBOSE'})) { | 251 | if (defined($ENV{'KBUILD_VERBOSE'})) { |
251 | $verbose = "$ENV{'KBUILD_VERBOSE'}"; | 252 | $verbose = "$ENV{'KBUILD_VERBOSE'}"; |
@@ -320,6 +321,10 @@ while ($ARGV[0] =~ m/^-(.*)/) { | |||
320 | $output_mode = "xml"; | 321 | $output_mode = "xml"; |
321 | %highlights = %highlights_xml; | 322 | %highlights = %highlights_xml; |
322 | $blankline = $blankline_xml; | 323 | $blankline = $blankline_xml; |
324 | } elsif ($cmd eq "-list") { | ||
325 | $output_mode = "list"; | ||
326 | %highlights = %highlights_list; | ||
327 | $blankline = $blankline_list; | ||
323 | } elsif ($cmd eq "-gnome") { | 328 | } elsif ($cmd eq "-gnome") { |
324 | $output_mode = "gnome"; | 329 | $output_mode = "gnome"; |
325 | %highlights = %highlights_gnome; | 330 | %highlights = %highlights_gnome; |
@@ -338,13 +343,23 @@ while ($ARGV[0] =~ m/^-(.*)/) { | |||
338 | $verbose = 1; | 343 | $verbose = 1; |
339 | } elsif (($cmd eq "-h") || ($cmd eq "--help")) { | 344 | } elsif (($cmd eq "-h") || ($cmd eq "--help")) { |
340 | usage(); | 345 | usage(); |
341 | } elsif ($cmd eq '-filelist') { | ||
342 | $filelist = shift @ARGV; | ||
343 | } elsif ($cmd eq '-no-doc-sections') { | 346 | } elsif ($cmd eq '-no-doc-sections') { |
344 | $no_doc_sections = 1; | 347 | $no_doc_sections = 1; |
345 | } | 348 | } |
346 | } | 349 | } |
347 | 350 | ||
351 | # continue execution near EOF; | ||
352 | |||
353 | sub usage { | ||
354 | print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man | -list ]\n"; | ||
355 | print " [ -no-doc-sections ]\n"; | ||
356 | print " [ -function funcname [ -function funcname ...] ]\n"; | ||
357 | print " [ -nofunction funcname [ -nofunction funcname ...] ]\n"; | ||
358 | print " c source file(s) > outputfile\n"; | ||
359 | print " -v : verbose output, more warnings & other info listed\n"; | ||
360 | exit 1; | ||
361 | } | ||
362 | |||
348 | # get kernel version from env | 363 | # get kernel version from env |
349 | sub get_kernel_version() { | 364 | sub get_kernel_version() { |
350 | my $version = 'unknown kernel version'; | 365 | my $version = 'unknown kernel version'; |
@@ -354,15 +369,6 @@ sub get_kernel_version() { | |||
354 | } | 369 | } |
355 | return $version; | 370 | return $version; |
356 | } | 371 | } |
357 | my $kernelversion = get_kernel_version(); | ||
358 | |||
359 | # generate a sequence of code that will splice in highlighting information | ||
360 | # using the s// operator. | ||
361 | my $dohighlight = ""; | ||
362 | foreach my $pattern (keys %highlights) { | ||
363 | # print STDERR "scanning pattern:$pattern, highlight:($highlights{$pattern})\n"; | ||
364 | $dohighlight .= "\$contents =~ s:$pattern:$highlights{$pattern}:gs;\n"; | ||
365 | } | ||
366 | 372 | ||
367 | ## | 373 | ## |
368 | # dumps section contents to arrays/hashes intended for that purpose. | 374 | # dumps section contents to arrays/hashes intended for that purpose. |
@@ -445,7 +451,7 @@ sub output_highlight { | |||
445 | if ($output_mode eq "html" || $output_mode eq "xml") { | 451 | if ($output_mode eq "html" || $output_mode eq "xml") { |
446 | $contents = local_unescape($contents); | 452 | $contents = local_unescape($contents); |
447 | # convert data read & converted thru xml_escape() into &xyz; format: | 453 | # convert data read & converted thru xml_escape() into &xyz; format: |
448 | $contents =~ s/\\\\\\/&/g; | 454 | $contents =~ s/\\\\\\/\&/g; |
449 | } | 455 | } |
450 | # print STDERR "contents b4:$contents\n"; | 456 | # print STDERR "contents b4:$contents\n"; |
451 | eval $dohighlight; | 457 | eval $dohighlight; |
@@ -762,7 +768,11 @@ sub output_struct_xml(%) { | |||
762 | print $args{'type'} . " " . $args{'struct'} . " {\n"; | 768 | print $args{'type'} . " " . $args{'struct'} . " {\n"; |
763 | foreach $parameter (@{$args{'parameterlist'}}) { | 769 | foreach $parameter (@{$args{'parameterlist'}}) { |
764 | if ($parameter =~ /^#/) { | 770 | if ($parameter =~ /^#/) { |
765 | print "$parameter\n"; | 771 | my $prm = $parameter; |
772 | # convert data read & converted thru xml_escape() into &xyz; format: | ||
773 | # This allows us to have #define macros interspersed in a struct. | ||
774 | $prm =~ s/\\\\\\/\&/g; | ||
775 | print "$prm\n"; | ||
766 | next; | 776 | next; |
767 | } | 777 | } |
768 | 778 | ||
@@ -1365,6 +1375,42 @@ sub output_blockhead_text(%) { | |||
1365 | } | 1375 | } |
1366 | } | 1376 | } |
1367 | 1377 | ||
1378 | ## list mode output functions | ||
1379 | |||
1380 | sub output_function_list(%) { | ||
1381 | my %args = %{$_[0]}; | ||
1382 | |||
1383 | print $args{'function'} . "\n"; | ||
1384 | } | ||
1385 | |||
1386 | # output enum in list | ||
1387 | sub output_enum_list(%) { | ||
1388 | my %args = %{$_[0]}; | ||
1389 | print $args{'enum'} . "\n"; | ||
1390 | } | ||
1391 | |||
1392 | # output typedef in list | ||
1393 | sub output_typedef_list(%) { | ||
1394 | my %args = %{$_[0]}; | ||
1395 | print $args{'typedef'} . "\n"; | ||
1396 | } | ||
1397 | |||
1398 | # output struct as list | ||
1399 | sub output_struct_list(%) { | ||
1400 | my %args = %{$_[0]}; | ||
1401 | |||
1402 | print $args{'struct'} . "\n"; | ||
1403 | } | ||
1404 | |||
1405 | sub output_blockhead_list(%) { | ||
1406 | my %args = %{$_[0]}; | ||
1407 | my ($parameter, $section); | ||
1408 | |||
1409 | foreach $section (@{$args{'sectionlist'}}) { | ||
1410 | print "DOC: $section\n"; | ||
1411 | } | ||
1412 | } | ||
1413 | |||
1368 | ## | 1414 | ## |
1369 | # generic output function for all types (function, struct/union, typedef, enum); | 1415 | # generic output function for all types (function, struct/union, typedef, enum); |
1370 | # calls the generated, variable output_ function name based on | 1416 | # calls the generated, variable output_ function name based on |
@@ -1428,6 +1474,8 @@ sub dump_struct($$) { | |||
1428 | $nested =~ s/\/\*.*?\*\///gos; | 1474 | $nested =~ s/\/\*.*?\*\///gos; |
1429 | # strip kmemcheck_bitfield_{begin,end}.*; | 1475 | # strip kmemcheck_bitfield_{begin,end}.*; |
1430 | $members =~ s/kmemcheck_bitfield_.*?;//gos; | 1476 | $members =~ s/kmemcheck_bitfield_.*?;//gos; |
1477 | # strip attributes | ||
1478 | $members =~ s/__aligned\s*\(\d+\)//gos; | ||
1431 | 1479 | ||
1432 | create_parameterlist($members, ';', $file); | 1480 | create_parameterlist($members, ';', $file); |
1433 | check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); | 1481 | check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); |
@@ -1456,6 +1504,8 @@ sub dump_enum($$) { | |||
1456 | my $file = shift; | 1504 | my $file = shift; |
1457 | 1505 | ||
1458 | $x =~ s@/\*.*?\*/@@gos; # strip comments. | 1506 | $x =~ s@/\*.*?\*/@@gos; # strip comments. |
1507 | $x =~ s/^#\s*define\s+.*$//; # strip #define macros inside enums | ||
1508 | |||
1459 | if ($x =~ /enum\s+(\w+)\s*{(.*)}/) { | 1509 | if ($x =~ /enum\s+(\w+)\s*{(.*)}/) { |
1460 | $declaration_name = $1; | 1510 | $declaration_name = $1; |
1461 | my $members = $2; | 1511 | my $members = $2; |
@@ -1653,6 +1703,8 @@ sub push_parameter($$$) { | |||
1653 | } | 1703 | } |
1654 | } | 1704 | } |
1655 | 1705 | ||
1706 | $param = xml_escape($param); | ||
1707 | |||
1656 | # strip spaces from $param so that it is one continous string | 1708 | # strip spaces from $param so that it is one continous string |
1657 | # on @parameterlist; | 1709 | # on @parameterlist; |
1658 | # this fixes a problem where check_sections() cannot find | 1710 | # this fixes a problem where check_sections() cannot find |
@@ -1679,7 +1731,7 @@ sub check_sections($$$$$$) { | |||
1679 | foreach $px (0 .. $#prms) { | 1731 | foreach $px (0 .. $#prms) { |
1680 | $prm_clean = $prms[$px]; | 1732 | $prm_clean = $prms[$px]; |
1681 | $prm_clean =~ s/\[.*\]//; | 1733 | $prm_clean =~ s/\[.*\]//; |
1682 | $prm_clean =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//; | 1734 | $prm_clean =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i; |
1683 | # ignore array size in a parameter string; | 1735 | # ignore array size in a parameter string; |
1684 | # however, the original param string may contain | 1736 | # however, the original param string may contain |
1685 | # spaces, e.g.: addr[6 + 2] | 1737 | # spaces, e.g.: addr[6 + 2] |
@@ -1732,6 +1784,7 @@ sub dump_function($$) { | |||
1732 | $prototype =~ s/^noinline +//; | 1784 | $prototype =~ s/^noinline +//; |
1733 | $prototype =~ s/__devinit +//; | 1785 | $prototype =~ s/__devinit +//; |
1734 | $prototype =~ s/__init +//; | 1786 | $prototype =~ s/__init +//; |
1787 | $prototype =~ s/__init_or_module +//; | ||
1735 | $prototype =~ s/^#\s*define\s+//; #ak added | 1788 | $prototype =~ s/^#\s*define\s+//; #ak added |
1736 | $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//; | 1789 | $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//; |
1737 | 1790 | ||
@@ -1796,42 +1849,6 @@ sub dump_function($$) { | |||
1796 | }); | 1849 | }); |
1797 | } | 1850 | } |
1798 | 1851 | ||
1799 | sub process_file($); | ||
1800 | |||
1801 | # Read the file that maps relative names to absolute names for | ||
1802 | # separate source and object directories and for shadow trees. | ||
1803 | if (open(SOURCE_MAP, "<.tmp_filelist.txt")) { | ||
1804 | my ($relname, $absname); | ||
1805 | while(<SOURCE_MAP>) { | ||
1806 | chop(); | ||
1807 | ($relname, $absname) = (split())[0..1]; | ||
1808 | $relname =~ s:^/+::; | ||
1809 | $source_map{$relname} = $absname; | ||
1810 | } | ||
1811 | close(SOURCE_MAP); | ||
1812 | } | ||
1813 | |||
1814 | if ($filelist) { | ||
1815 | open(FLIST,"<$filelist") or die "Can't open file list $filelist"; | ||
1816 | while(<FLIST>) { | ||
1817 | chop; | ||
1818 | process_file($_); | ||
1819 | } | ||
1820 | } | ||
1821 | |||
1822 | foreach (@ARGV) { | ||
1823 | chomp; | ||
1824 | process_file($_); | ||
1825 | } | ||
1826 | if ($verbose && $errors) { | ||
1827 | print STDERR "$errors errors\n"; | ||
1828 | } | ||
1829 | if ($verbose && $warnings) { | ||
1830 | print STDERR "$warnings warnings\n"; | ||
1831 | } | ||
1832 | |||
1833 | exit($errors); | ||
1834 | |||
1835 | sub reset_state { | 1852 | sub reset_state { |
1836 | $function = ""; | 1853 | $function = ""; |
1837 | %constants = (); | 1854 | %constants = (); |
@@ -2023,6 +2040,8 @@ sub process_file($) { | |||
2023 | return; | 2040 | return; |
2024 | } | 2041 | } |
2025 | 2042 | ||
2043 | $. = 1; | ||
2044 | |||
2026 | $section_counter = 0; | 2045 | $section_counter = 0; |
2027 | while (<IN>) { | 2046 | while (<IN>) { |
2028 | if ($state == 0) { | 2047 | if ($state == 0) { |
@@ -2113,7 +2132,7 @@ sub process_file($) { | |||
2113 | $section = $newsection; | 2132 | $section = $newsection; |
2114 | } elsif (/$doc_end/) { | 2133 | } elsif (/$doc_end/) { |
2115 | 2134 | ||
2116 | if ($contents ne "") { | 2135 | if (($contents ne "") && ($contents ne "\n")) { |
2117 | dump_section($file, $section, xml_escape($contents)); | 2136 | dump_section($file, $section, xml_escape($contents)); |
2118 | $section = $section_default; | 2137 | $section = $section_default; |
2119 | $contents = ""; | 2138 | $contents = ""; |
@@ -2236,3 +2255,39 @@ sub process_file($) { | |||
2236 | } | 2255 | } |
2237 | } | 2256 | } |
2238 | } | 2257 | } |
2258 | |||
2259 | |||
2260 | $kernelversion = get_kernel_version(); | ||
2261 | |||
2262 | # generate a sequence of code that will splice in highlighting information | ||
2263 | # using the s// operator. | ||
2264 | foreach my $pattern (keys %highlights) { | ||
2265 | # print STDERR "scanning pattern:$pattern, highlight:($highlights{$pattern})\n"; | ||
2266 | $dohighlight .= "\$contents =~ s:$pattern:$highlights{$pattern}:gs;\n"; | ||
2267 | } | ||
2268 | |||
2269 | # Read the file that maps relative names to absolute names for | ||
2270 | # separate source and object directories and for shadow trees. | ||
2271 | if (open(SOURCE_MAP, "<.tmp_filelist.txt")) { | ||
2272 | my ($relname, $absname); | ||
2273 | while(<SOURCE_MAP>) { | ||
2274 | chop(); | ||
2275 | ($relname, $absname) = (split())[0..1]; | ||
2276 | $relname =~ s:^/+::; | ||
2277 | $source_map{$relname} = $absname; | ||
2278 | } | ||
2279 | close(SOURCE_MAP); | ||
2280 | } | ||
2281 | |||
2282 | foreach (@ARGV) { | ||
2283 | chomp; | ||
2284 | process_file($_); | ||
2285 | } | ||
2286 | if ($verbose && $errors) { | ||
2287 | print STDERR "$errors errors\n"; | ||
2288 | } | ||
2289 | if ($verbose && $warnings) { | ||
2290 | print STDERR "$warnings warnings\n"; | ||
2291 | } | ||
2292 | |||
2293 | exit($errors); | ||
diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl index 90e1d9aa35b..827896f5650 100644 --- a/scripts/markup_oops.pl +++ b/scripts/markup_oops.pl | |||
@@ -168,7 +168,7 @@ while (<STDIN>) { | |||
168 | $function = $1; | 168 | $function = $1; |
169 | $func_offset = $2; | 169 | $func_offset = $2; |
170 | } | 170 | } |
171 | if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\] \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]/) { | 171 | if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\] \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+0x([0-9a-f]+)\/0x[a-f0-9]/) { |
172 | $function = $1; | 172 | $function = $1; |
173 | $func_offset = $2; | 173 | $func_offset = $2; |
174 | } | 174 | } |
diff --git a/scripts/mkmakefile b/scripts/mkmakefile index 67d59c7a18d..5325423ceab 100644 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile | |||
@@ -44,7 +44,9 @@ all: | |||
44 | 44 | ||
45 | Makefile:; | 45 | Makefile:; |
46 | 46 | ||
47 | \$(all) %/: all | 47 | \$(all): all |
48 | @: | 48 | @: |
49 | 49 | ||
50 | %/: all | ||
51 | @: | ||
50 | EOF | 52 | EOF |
diff --git a/scripts/mkuboot.sh b/scripts/mkuboot.sh index 2e3d3cd916b..446739c7843 100755 --- a/scripts/mkuboot.sh +++ b/scripts/mkuboot.sh | |||
@@ -11,7 +11,7 @@ if [ -z "${MKIMAGE}" ]; then | |||
11 | if [ -z "${MKIMAGE}" ]; then | 11 | if [ -z "${MKIMAGE}" ]; then |
12 | # Doesn't exist | 12 | # Doesn't exist |
13 | echo '"mkimage" command not found - U-Boot images will not be built' >&2 | 13 | echo '"mkimage" command not found - U-Boot images will not be built' >&2 |
14 | exit 0; | 14 | exit 1; |
15 | fi | 15 | fi |
16 | fi | 16 | fi |
17 | 17 | ||
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 220213e603d..88f3f07205f 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
@@ -796,6 +796,51 @@ static int do_platform_entry(const char *filename, | |||
796 | return 1; | 796 | return 1; |
797 | } | 797 | } |
798 | 798 | ||
799 | static int do_mdio_entry(const char *filename, | ||
800 | struct mdio_device_id *id, char *alias) | ||
801 | { | ||
802 | int i; | ||
803 | |||
804 | alias += sprintf(alias, MDIO_MODULE_PREFIX); | ||
805 | |||
806 | for (i = 0; i < 32; i++) { | ||
807 | if (!((id->phy_id_mask >> (31-i)) & 1)) | ||
808 | *(alias++) = '?'; | ||
809 | else if ((id->phy_id >> (31-i)) & 1) | ||
810 | *(alias++) = '1'; | ||
811 | else | ||
812 | *(alias++) = '0'; | ||
813 | } | ||
814 | |||
815 | /* Terminate the string */ | ||
816 | *alias = 0; | ||
817 | |||
818 | return 1; | ||
819 | } | ||
820 | |||
821 | /* Looks like: zorro:iN. */ | ||
822 | static int do_zorro_entry(const char *filename, struct zorro_device_id *id, | ||
823 | char *alias) | ||
824 | { | ||
825 | id->id = TO_NATIVE(id->id); | ||
826 | strcpy(alias, "zorro:"); | ||
827 | ADD(alias, "i", id->id != ZORRO_WILDCARD, id->id); | ||
828 | return 1; | ||
829 | } | ||
830 | |||
831 | /* looks like: "pnp:dD" */ | ||
832 | static int do_isapnp_entry(const char *filename, | ||
833 | struct isapnp_device_id *id, char *alias) | ||
834 | { | ||
835 | sprintf(alias, "pnp:d%c%c%c%x%x%x%x*", | ||
836 | 'A' + ((id->vendor >> 2) & 0x3f) - 1, | ||
837 | 'A' + (((id->vendor & 3) << 3) | ((id->vendor >> 13) & 7)) - 1, | ||
838 | 'A' + ((id->vendor >> 8) & 0x1f) - 1, | ||
839 | (id->function >> 4) & 0x0f, id->function & 0x0f, | ||
840 | (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f); | ||
841 | return 1; | ||
842 | } | ||
843 | |||
799 | /* Ignore any prefix, eg. some architectures prepend _ */ | 844 | /* Ignore any prefix, eg. some architectures prepend _ */ |
800 | static inline int sym_is(const char *symbol, const char *name) | 845 | static inline int sym_is(const char *symbol, const char *name) |
801 | { | 846 | { |
@@ -839,16 +884,16 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, | |||
839 | char *zeros = NULL; | 884 | char *zeros = NULL; |
840 | 885 | ||
841 | /* We're looking for a section relative symbol */ | 886 | /* We're looking for a section relative symbol */ |
842 | if (!sym->st_shndx || sym->st_shndx >= info->hdr->e_shnum) | 887 | if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections) |
843 | return; | 888 | return; |
844 | 889 | ||
845 | /* Handle all-NULL symbols allocated into .bss */ | 890 | /* Handle all-NULL symbols allocated into .bss */ |
846 | if (info->sechdrs[sym->st_shndx].sh_type & SHT_NOBITS) { | 891 | if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) { |
847 | zeros = calloc(1, sym->st_size); | 892 | zeros = calloc(1, sym->st_size); |
848 | symval = zeros; | 893 | symval = zeros; |
849 | } else { | 894 | } else { |
850 | symval = (void *)info->hdr | 895 | symval = (void *)info->hdr |
851 | + info->sechdrs[sym->st_shndx].sh_offset | 896 | + info->sechdrs[get_secindex(info, sym)].sh_offset |
852 | + sym->st_value; | 897 | + sym->st_value; |
853 | } | 898 | } |
854 | 899 | ||
@@ -943,6 +988,18 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, | |||
943 | do_table(symval, sym->st_size, | 988 | do_table(symval, sym->st_size, |
944 | sizeof(struct platform_device_id), "platform", | 989 | sizeof(struct platform_device_id), "platform", |
945 | do_platform_entry, mod); | 990 | do_platform_entry, mod); |
991 | else if (sym_is(symname, "__mod_mdio_device_table")) | ||
992 | do_table(symval, sym->st_size, | ||
993 | sizeof(struct mdio_device_id), "mdio", | ||
994 | do_mdio_entry, mod); | ||
995 | else if (sym_is(symname, "__mod_zorro_device_table")) | ||
996 | do_table(symval, sym->st_size, | ||
997 | sizeof(struct zorro_device_id), "zorro", | ||
998 | do_zorro_entry, mod); | ||
999 | else if (sym_is(symname, "__mod_isapnp_device_table")) | ||
1000 | do_table(symval, sym->st_size, | ||
1001 | sizeof(struct isapnp_device_id), "isa", | ||
1002 | do_isapnp_entry, mod); | ||
946 | free(zeros); | 1003 | free(zeros); |
947 | } | 1004 | } |
948 | 1005 | ||
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 3318692e4e7..e8fba959fff 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #define _GNU_SOURCE | 14 | #define _GNU_SOURCE |
15 | #include <stdio.h> | 15 | #include <stdio.h> |
16 | #include <ctype.h> | 16 | #include <ctype.h> |
17 | #include <string.h> | ||
17 | #include "modpost.h" | 18 | #include "modpost.h" |
18 | #include "../../include/generated/autoconf.h" | 19 | #include "../../include/generated/autoconf.h" |
19 | #include "../../include/linux/license.h" | 20 | #include "../../include/linux/license.h" |
@@ -253,7 +254,7 @@ static enum export export_no(const char *s) | |||
253 | return export_unknown; | 254 | return export_unknown; |
254 | } | 255 | } |
255 | 256 | ||
256 | static enum export export_from_sec(struct elf_info *elf, Elf_Section sec) | 257 | static enum export export_from_sec(struct elf_info *elf, unsigned int sec) |
257 | { | 258 | { |
258 | if (sec == elf->export_sec) | 259 | if (sec == elf->export_sec) |
259 | return export_plain; | 260 | return export_plain; |
@@ -373,6 +374,8 @@ static int parse_elf(struct elf_info *info, const char *filename) | |||
373 | Elf_Ehdr *hdr; | 374 | Elf_Ehdr *hdr; |
374 | Elf_Shdr *sechdrs; | 375 | Elf_Shdr *sechdrs; |
375 | Elf_Sym *sym; | 376 | Elf_Sym *sym; |
377 | const char *secstrings; | ||
378 | unsigned int symtab_idx = ~0U, symtab_shndx_idx = ~0U; | ||
376 | 379 | ||
377 | hdr = grab_file(filename, &info->size); | 380 | hdr = grab_file(filename, &info->size); |
378 | if (!hdr) { | 381 | if (!hdr) { |
@@ -417,8 +420,27 @@ static int parse_elf(struct elf_info *info, const char *filename) | |||
417 | return 0; | 420 | return 0; |
418 | } | 421 | } |
419 | 422 | ||
423 | if (hdr->e_shnum == 0) { | ||
424 | /* | ||
425 | * There are more than 64k sections, | ||
426 | * read count from .sh_size. | ||
427 | * note: it doesn't need shndx2secindex() | ||
428 | */ | ||
429 | info->num_sections = TO_NATIVE(sechdrs[0].sh_size); | ||
430 | } | ||
431 | else { | ||
432 | info->num_sections = hdr->e_shnum; | ||
433 | } | ||
434 | if (hdr->e_shstrndx == SHN_XINDEX) { | ||
435 | info->secindex_strings = | ||
436 | shndx2secindex(TO_NATIVE(sechdrs[0].sh_link)); | ||
437 | } | ||
438 | else { | ||
439 | info->secindex_strings = hdr->e_shstrndx; | ||
440 | } | ||
441 | |||
420 | /* Fix endianness in section headers */ | 442 | /* Fix endianness in section headers */ |
421 | for (i = 0; i < hdr->e_shnum; i++) { | 443 | for (i = 0; i < info->num_sections; i++) { |
422 | sechdrs[i].sh_name = TO_NATIVE(sechdrs[i].sh_name); | 444 | sechdrs[i].sh_name = TO_NATIVE(sechdrs[i].sh_name); |
423 | sechdrs[i].sh_type = TO_NATIVE(sechdrs[i].sh_type); | 445 | sechdrs[i].sh_type = TO_NATIVE(sechdrs[i].sh_type); |
424 | sechdrs[i].sh_flags = TO_NATIVE(sechdrs[i].sh_flags); | 446 | sechdrs[i].sh_flags = TO_NATIVE(sechdrs[i].sh_flags); |
@@ -431,9 +453,8 @@ static int parse_elf(struct elf_info *info, const char *filename) | |||
431 | sechdrs[i].sh_entsize = TO_NATIVE(sechdrs[i].sh_entsize); | 453 | sechdrs[i].sh_entsize = TO_NATIVE(sechdrs[i].sh_entsize); |
432 | } | 454 | } |
433 | /* Find symbol table. */ | 455 | /* Find symbol table. */ |
434 | for (i = 1; i < hdr->e_shnum; i++) { | 456 | secstrings = (void *)hdr + sechdrs[info->secindex_strings].sh_offset; |
435 | const char *secstrings | 457 | for (i = 1; i < info->num_sections; i++) { |
436 | = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; | ||
437 | const char *secname; | 458 | const char *secname; |
438 | int nobits = sechdrs[i].sh_type == SHT_NOBITS; | 459 | int nobits = sechdrs[i].sh_type == SHT_NOBITS; |
439 | 460 | ||
@@ -461,14 +482,26 @@ static int parse_elf(struct elf_info *info, const char *filename) | |||
461 | else if (strcmp(secname, "__ksymtab_gpl_future") == 0) | 482 | else if (strcmp(secname, "__ksymtab_gpl_future") == 0) |
462 | info->export_gpl_future_sec = i; | 483 | info->export_gpl_future_sec = i; |
463 | 484 | ||
464 | if (sechdrs[i].sh_type != SHT_SYMTAB) | 485 | if (sechdrs[i].sh_type == SHT_SYMTAB) { |
465 | continue; | 486 | unsigned int sh_link_idx; |
487 | symtab_idx = i; | ||
488 | info->symtab_start = (void *)hdr + | ||
489 | sechdrs[i].sh_offset; | ||
490 | info->symtab_stop = (void *)hdr + | ||
491 | sechdrs[i].sh_offset + sechdrs[i].sh_size; | ||
492 | sh_link_idx = shndx2secindex(sechdrs[i].sh_link); | ||
493 | info->strtab = (void *)hdr + | ||
494 | sechdrs[sh_link_idx].sh_offset; | ||
495 | } | ||
466 | 496 | ||
467 | info->symtab_start = (void *)hdr + sechdrs[i].sh_offset; | 497 | /* 32bit section no. table? ("more than 64k sections") */ |
468 | info->symtab_stop = (void *)hdr + sechdrs[i].sh_offset | 498 | if (sechdrs[i].sh_type == SHT_SYMTAB_SHNDX) { |
469 | + sechdrs[i].sh_size; | 499 | symtab_shndx_idx = i; |
470 | info->strtab = (void *)hdr + | 500 | info->symtab_shndx_start = (void *)hdr + |
471 | sechdrs[sechdrs[i].sh_link].sh_offset; | 501 | sechdrs[i].sh_offset; |
502 | info->symtab_shndx_stop = (void *)hdr + | ||
503 | sechdrs[i].sh_offset + sechdrs[i].sh_size; | ||
504 | } | ||
472 | } | 505 | } |
473 | if (!info->symtab_start) | 506 | if (!info->symtab_start) |
474 | fatal("%s has no symtab?\n", filename); | 507 | fatal("%s has no symtab?\n", filename); |
@@ -480,6 +513,21 @@ static int parse_elf(struct elf_info *info, const char *filename) | |||
480 | sym->st_value = TO_NATIVE(sym->st_value); | 513 | sym->st_value = TO_NATIVE(sym->st_value); |
481 | sym->st_size = TO_NATIVE(sym->st_size); | 514 | sym->st_size = TO_NATIVE(sym->st_size); |
482 | } | 515 | } |
516 | |||
517 | if (symtab_shndx_idx != ~0U) { | ||
518 | Elf32_Word *p; | ||
519 | if (symtab_idx != | ||
520 | shndx2secindex(sechdrs[symtab_shndx_idx].sh_link)) | ||
521 | fatal("%s: SYMTAB_SHNDX has bad sh_link: %u!=%u\n", | ||
522 | filename, | ||
523 | shndx2secindex(sechdrs[symtab_shndx_idx].sh_link), | ||
524 | symtab_idx); | ||
525 | /* Fix endianness */ | ||
526 | for (p = info->symtab_shndx_start; p < info->symtab_shndx_stop; | ||
527 | p++) | ||
528 | *p = TO_NATIVE(*p); | ||
529 | } | ||
530 | |||
483 | return 1; | 531 | return 1; |
484 | } | 532 | } |
485 | 533 | ||
@@ -503,6 +551,11 @@ static int ignore_undef_symbol(struct elf_info *info, const char *symname) | |||
503 | strncmp(symname, "_rest32gpr_", sizeof("_rest32gpr_") - 1) == 0 || | 551 | strncmp(symname, "_rest32gpr_", sizeof("_rest32gpr_") - 1) == 0 || |
504 | strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0) | 552 | strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0) |
505 | return 1; | 553 | return 1; |
554 | if (info->hdr->e_machine == EM_PPC64) | ||
555 | /* Special register function linked on all modules during final link of .ko */ | ||
556 | if (strncmp(symname, "_restgpr0_", sizeof("_restgpr0_") - 1) == 0 || | ||
557 | strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0) | ||
558 | return 1; | ||
506 | /* Do not ignore this symbol */ | 559 | /* Do not ignore this symbol */ |
507 | return 0; | 560 | return 0; |
508 | } | 561 | } |
@@ -514,7 +567,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info, | |||
514 | Elf_Sym *sym, const char *symname) | 567 | Elf_Sym *sym, const char *symname) |
515 | { | 568 | { |
516 | unsigned int crc; | 569 | unsigned int crc; |
517 | enum export export = export_from_sec(info, sym->st_shndx); | 570 | enum export export = export_from_sec(info, get_secindex(info, sym)); |
518 | 571 | ||
519 | switch (sym->st_shndx) { | 572 | switch (sym->st_shndx) { |
520 | case SHN_COMMON: | 573 | case SHN_COMMON: |
@@ -656,19 +709,19 @@ static const char *sym_name(struct elf_info *elf, Elf_Sym *sym) | |||
656 | return "(unknown)"; | 709 | return "(unknown)"; |
657 | } | 710 | } |
658 | 711 | ||
659 | static const char *sec_name(struct elf_info *elf, int shndx) | 712 | static const char *sec_name(struct elf_info *elf, int secindex) |
660 | { | 713 | { |
661 | Elf_Shdr *sechdrs = elf->sechdrs; | 714 | Elf_Shdr *sechdrs = elf->sechdrs; |
662 | return (void *)elf->hdr + | 715 | return (void *)elf->hdr + |
663 | elf->sechdrs[elf->hdr->e_shstrndx].sh_offset + | 716 | elf->sechdrs[elf->secindex_strings].sh_offset + |
664 | sechdrs[shndx].sh_name; | 717 | sechdrs[secindex].sh_name; |
665 | } | 718 | } |
666 | 719 | ||
667 | static const char *sech_name(struct elf_info *elf, Elf_Shdr *sechdr) | 720 | static const char *sech_name(struct elf_info *elf, Elf_Shdr *sechdr) |
668 | { | 721 | { |
669 | return (void *)elf->hdr + | 722 | return (void *)elf->hdr + |
670 | elf->sechdrs[elf->hdr->e_shstrndx].sh_offset + | 723 | elf->sechdrs[elf->secindex_strings].sh_offset + |
671 | sechdr->sh_name; | 724 | sechdr->sh_name; |
672 | } | 725 | } |
673 | 726 | ||
674 | /* if sym is empty or point to a string | 727 | /* if sym is empty or point to a string |
@@ -737,6 +790,8 @@ static const char *section_white_list[] = | |||
737 | { | 790 | { |
738 | ".comment*", | 791 | ".comment*", |
739 | ".debug*", | 792 | ".debug*", |
793 | ".zdebug*", /* Compressed debug sections. */ | ||
794 | ".GCC-command-line", /* mn10300 */ | ||
740 | ".mdebug*", /* alpha, score, mips etc. */ | 795 | ".mdebug*", /* alpha, score, mips etc. */ |
741 | ".pdr", /* alpha, score, mips etc. */ | 796 | ".pdr", /* alpha, score, mips etc. */ |
742 | ".stab*", | 797 | ".stab*", |
@@ -981,6 +1036,13 @@ static const struct sectioncheck *section_mismatch( | |||
981 | * fromsec = .data* | 1036 | * fromsec = .data* |
982 | * atsym =__param* | 1037 | * atsym =__param* |
983 | * | 1038 | * |
1039 | * Pattern 1a: | ||
1040 | * module_param_call() ops can refer to __init set function if permissions=0 | ||
1041 | * The pattern is identified by: | ||
1042 | * tosec = .init.text | ||
1043 | * fromsec = .data* | ||
1044 | * atsym = __param_ops_* | ||
1045 | * | ||
984 | * Pattern 2: | 1046 | * Pattern 2: |
985 | * Many drivers utilise a *driver container with references to | 1047 | * Many drivers utilise a *driver container with references to |
986 | * add, remove, probe functions etc. | 1048 | * add, remove, probe functions etc. |
@@ -1015,6 +1077,12 @@ static int secref_whitelist(const struct sectioncheck *mismatch, | |||
1015 | (strncmp(fromsym, "__param", strlen("__param")) == 0)) | 1077 | (strncmp(fromsym, "__param", strlen("__param")) == 0)) |
1016 | return 0; | 1078 | return 0; |
1017 | 1079 | ||
1080 | /* Check for pattern 1a */ | ||
1081 | if (strcmp(tosec, ".init.text") == 0 && | ||
1082 | match(fromsec, data_sections) && | ||
1083 | (strncmp(fromsym, "__param_ops_", strlen("__param_ops_")) == 0)) | ||
1084 | return 0; | ||
1085 | |||
1018 | /* Check for pattern 2 */ | 1086 | /* Check for pattern 2 */ |
1019 | if (match(tosec, init_exit_sections) && | 1087 | if (match(tosec, init_exit_sections) && |
1020 | match(fromsec, data_sections) && | 1088 | match(fromsec, data_sections) && |
@@ -1047,11 +1115,14 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr, | |||
1047 | Elf_Sym *near = NULL; | 1115 | Elf_Sym *near = NULL; |
1048 | Elf64_Sword distance = 20; | 1116 | Elf64_Sword distance = 20; |
1049 | Elf64_Sword d; | 1117 | Elf64_Sword d; |
1118 | unsigned int relsym_secindex; | ||
1050 | 1119 | ||
1051 | if (relsym->st_name != 0) | 1120 | if (relsym->st_name != 0) |
1052 | return relsym; | 1121 | return relsym; |
1122 | |||
1123 | relsym_secindex = get_secindex(elf, relsym); | ||
1053 | for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) { | 1124 | for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) { |
1054 | if (sym->st_shndx != relsym->st_shndx) | 1125 | if (get_secindex(elf, sym) != relsym_secindex) |
1055 | continue; | 1126 | continue; |
1056 | if (ELF_ST_TYPE(sym->st_info) == STT_SECTION) | 1127 | if (ELF_ST_TYPE(sym->st_info) == STT_SECTION) |
1057 | continue; | 1128 | continue; |
@@ -1113,9 +1184,9 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr, | |||
1113 | for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) { | 1184 | for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) { |
1114 | const char *symsec; | 1185 | const char *symsec; |
1115 | 1186 | ||
1116 | if (sym->st_shndx >= SHN_LORESERVE) | 1187 | if (is_shndx_special(sym->st_shndx)) |
1117 | continue; | 1188 | continue; |
1118 | symsec = sec_name(elf, sym->st_shndx); | 1189 | symsec = sec_name(elf, get_secindex(elf, sym)); |
1119 | if (strcmp(symsec, sec) != 0) | 1190 | if (strcmp(symsec, sec) != 0) |
1120 | continue; | 1191 | continue; |
1121 | if (!is_valid_name(elf, sym)) | 1192 | if (!is_valid_name(elf, sym)) |
@@ -1138,6 +1209,9 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr, | |||
1138 | * .cpuinit.data => __cpudata | 1209 | * .cpuinit.data => __cpudata |
1139 | * .memexitconst => __memconst | 1210 | * .memexitconst => __memconst |
1140 | * etc. | 1211 | * etc. |
1212 | * | ||
1213 | * The memory of returned value has been allocated on a heap. The user of this | ||
1214 | * method should free it after usage. | ||
1141 | */ | 1215 | */ |
1142 | static char *sec2annotation(const char *s) | 1216 | static char *sec2annotation(const char *s) |
1143 | { | 1217 | { |
@@ -1160,9 +1234,9 @@ static char *sec2annotation(const char *s) | |||
1160 | strcat(p, "data "); | 1234 | strcat(p, "data "); |
1161 | else | 1235 | else |
1162 | strcat(p, " "); | 1236 | strcat(p, " "); |
1163 | return r; /* we leak her but we do not care */ | 1237 | return r; |
1164 | } else { | 1238 | } else { |
1165 | return ""; | 1239 | return strdup(""); |
1166 | } | 1240 | } |
1167 | } | 1241 | } |
1168 | 1242 | ||
@@ -1190,6 +1264,8 @@ static void report_sec_mismatch(const char *modname, | |||
1190 | { | 1264 | { |
1191 | const char *from, *from_p; | 1265 | const char *from, *from_p; |
1192 | const char *to, *to_p; | 1266 | const char *to, *to_p; |
1267 | char *prl_from; | ||
1268 | char *prl_to; | ||
1193 | 1269 | ||
1194 | switch (from_is_func) { | 1270 | switch (from_is_func) { |
1195 | case 0: from = "variable"; from_p = ""; break; | 1271 | case 0: from = "variable"; from_p = ""; break; |
@@ -1213,16 +1289,21 @@ static void report_sec_mismatch(const char *modname, | |||
1213 | 1289 | ||
1214 | switch (mismatch->mismatch) { | 1290 | switch (mismatch->mismatch) { |
1215 | case TEXT_TO_ANY_INIT: | 1291 | case TEXT_TO_ANY_INIT: |
1292 | prl_from = sec2annotation(fromsec); | ||
1293 | prl_to = sec2annotation(tosec); | ||
1216 | fprintf(stderr, | 1294 | fprintf(stderr, |
1217 | "The function %s%s() references\n" | 1295 | "The function %s%s() references\n" |
1218 | "the %s %s%s%s.\n" | 1296 | "the %s %s%s%s.\n" |
1219 | "This is often because %s lacks a %s\n" | 1297 | "This is often because %s lacks a %s\n" |
1220 | "annotation or the annotation of %s is wrong.\n", | 1298 | "annotation or the annotation of %s is wrong.\n", |
1221 | sec2annotation(fromsec), fromsym, | 1299 | prl_from, fromsym, |
1222 | to, sec2annotation(tosec), tosym, to_p, | 1300 | to, prl_to, tosym, to_p, |
1223 | fromsym, sec2annotation(tosec), tosym); | 1301 | fromsym, prl_to, tosym); |
1302 | free(prl_from); | ||
1303 | free(prl_to); | ||
1224 | break; | 1304 | break; |
1225 | case DATA_TO_ANY_INIT: { | 1305 | case DATA_TO_ANY_INIT: { |
1306 | prl_to = sec2annotation(tosec); | ||
1226 | const char *const *s = mismatch->symbol_white_list; | 1307 | const char *const *s = mismatch->symbol_white_list; |
1227 | fprintf(stderr, | 1308 | fprintf(stderr, |
1228 | "The variable %s references\n" | 1309 | "The variable %s references\n" |
@@ -1230,20 +1311,24 @@ static void report_sec_mismatch(const char *modname, | |||
1230 | "If the reference is valid then annotate the\n" | 1311 | "If the reference is valid then annotate the\n" |
1231 | "variable with __init* or __refdata (see linux/init.h) " | 1312 | "variable with __init* or __refdata (see linux/init.h) " |
1232 | "or name the variable:\n", | 1313 | "or name the variable:\n", |
1233 | fromsym, to, sec2annotation(tosec), tosym, to_p); | 1314 | fromsym, to, prl_to, tosym, to_p); |
1234 | while (*s) | 1315 | while (*s) |
1235 | fprintf(stderr, "%s, ", *s++); | 1316 | fprintf(stderr, "%s, ", *s++); |
1236 | fprintf(stderr, "\n"); | 1317 | fprintf(stderr, "\n"); |
1318 | free(prl_to); | ||
1237 | break; | 1319 | break; |
1238 | } | 1320 | } |
1239 | case TEXT_TO_ANY_EXIT: | 1321 | case TEXT_TO_ANY_EXIT: |
1322 | prl_to = sec2annotation(tosec); | ||
1240 | fprintf(stderr, | 1323 | fprintf(stderr, |
1241 | "The function %s() references a %s in an exit section.\n" | 1324 | "The function %s() references a %s in an exit section.\n" |
1242 | "Often the %s %s%s has valid usage outside the exit section\n" | 1325 | "Often the %s %s%s has valid usage outside the exit section\n" |
1243 | "and the fix is to remove the %sannotation of %s.\n", | 1326 | "and the fix is to remove the %sannotation of %s.\n", |
1244 | fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym); | 1327 | fromsym, to, to, tosym, to_p, prl_to, tosym); |
1328 | free(prl_to); | ||
1245 | break; | 1329 | break; |
1246 | case DATA_TO_ANY_EXIT: { | 1330 | case DATA_TO_ANY_EXIT: { |
1331 | prl_to = sec2annotation(tosec); | ||
1247 | const char *const *s = mismatch->symbol_white_list; | 1332 | const char *const *s = mismatch->symbol_white_list; |
1248 | fprintf(stderr, | 1333 | fprintf(stderr, |
1249 | "The variable %s references\n" | 1334 | "The variable %s references\n" |
@@ -1251,24 +1336,31 @@ static void report_sec_mismatch(const char *modname, | |||
1251 | "If the reference is valid then annotate the\n" | 1336 | "If the reference is valid then annotate the\n" |
1252 | "variable with __exit* (see linux/init.h) or " | 1337 | "variable with __exit* (see linux/init.h) or " |
1253 | "name the variable:\n", | 1338 | "name the variable:\n", |
1254 | fromsym, to, sec2annotation(tosec), tosym, to_p); | 1339 | fromsym, to, prl_to, tosym, to_p); |
1255 | while (*s) | 1340 | while (*s) |
1256 | fprintf(stderr, "%s, ", *s++); | 1341 | fprintf(stderr, "%s, ", *s++); |
1257 | fprintf(stderr, "\n"); | 1342 | fprintf(stderr, "\n"); |
1343 | free(prl_to); | ||
1258 | break; | 1344 | break; |
1259 | } | 1345 | } |
1260 | case XXXINIT_TO_SOME_INIT: | 1346 | case XXXINIT_TO_SOME_INIT: |
1261 | case XXXEXIT_TO_SOME_EXIT: | 1347 | case XXXEXIT_TO_SOME_EXIT: |
1348 | prl_from = sec2annotation(fromsec); | ||
1349 | prl_to = sec2annotation(tosec); | ||
1262 | fprintf(stderr, | 1350 | fprintf(stderr, |
1263 | "The %s %s%s%s references\n" | 1351 | "The %s %s%s%s references\n" |
1264 | "a %s %s%s%s.\n" | 1352 | "a %s %s%s%s.\n" |
1265 | "If %s is only used by %s then\n" | 1353 | "If %s is only used by %s then\n" |
1266 | "annotate %s with a matching annotation.\n", | 1354 | "annotate %s with a matching annotation.\n", |
1267 | from, sec2annotation(fromsec), fromsym, from_p, | 1355 | from, prl_from, fromsym, from_p, |
1268 | to, sec2annotation(tosec), tosym, to_p, | 1356 | to, prl_to, tosym, to_p, |
1269 | tosym, fromsym, tosym); | 1357 | tosym, fromsym, tosym); |
1358 | free(prl_from); | ||
1359 | free(prl_to); | ||
1270 | break; | 1360 | break; |
1271 | case ANY_INIT_TO_ANY_EXIT: | 1361 | case ANY_INIT_TO_ANY_EXIT: |
1362 | prl_from = sec2annotation(fromsec); | ||
1363 | prl_to = sec2annotation(tosec); | ||
1272 | fprintf(stderr, | 1364 | fprintf(stderr, |
1273 | "The %s %s%s%s references\n" | 1365 | "The %s %s%s%s references\n" |
1274 | "a %s %s%s%s.\n" | 1366 | "a %s %s%s%s.\n" |
@@ -1277,11 +1369,15 @@ static void report_sec_mismatch(const char *modname, | |||
1277 | "uses functionality in the exit path.\n" | 1369 | "uses functionality in the exit path.\n" |
1278 | "The fix is often to remove the %sannotation of\n" | 1370 | "The fix is often to remove the %sannotation of\n" |
1279 | "%s%s so it may be used outside an exit section.\n", | 1371 | "%s%s so it may be used outside an exit section.\n", |
1280 | from, sec2annotation(fromsec), fromsym, from_p, | 1372 | from, prl_from, fromsym, from_p, |
1281 | to, sec2annotation(tosec), tosym, to_p, | 1373 | to, prl_to, tosym, to_p, |
1282 | sec2annotation(tosec), tosym, to_p); | 1374 | prl_to, tosym, to_p); |
1375 | free(prl_from); | ||
1376 | free(prl_to); | ||
1283 | break; | 1377 | break; |
1284 | case ANY_EXIT_TO_ANY_INIT: | 1378 | case ANY_EXIT_TO_ANY_INIT: |
1379 | prl_from = sec2annotation(fromsec); | ||
1380 | prl_to = sec2annotation(tosec); | ||
1285 | fprintf(stderr, | 1381 | fprintf(stderr, |
1286 | "The %s %s%s%s references\n" | 1382 | "The %s %s%s%s references\n" |
1287 | "a %s %s%s%s.\n" | 1383 | "a %s %s%s%s.\n" |
@@ -1290,16 +1386,20 @@ static void report_sec_mismatch(const char *modname, | |||
1290 | "uses functionality in the init path.\n" | 1386 | "uses functionality in the init path.\n" |
1291 | "The fix is often to remove the %sannotation of\n" | 1387 | "The fix is often to remove the %sannotation of\n" |
1292 | "%s%s so it may be used outside an init section.\n", | 1388 | "%s%s so it may be used outside an init section.\n", |
1293 | from, sec2annotation(fromsec), fromsym, from_p, | 1389 | from, prl_from, fromsym, from_p, |
1294 | to, sec2annotation(tosec), tosym, to_p, | 1390 | to, prl_to, tosym, to_p, |
1295 | sec2annotation(tosec), tosym, to_p); | 1391 | prl_to, tosym, to_p); |
1392 | free(prl_from); | ||
1393 | free(prl_to); | ||
1296 | break; | 1394 | break; |
1297 | case EXPORT_TO_INIT_EXIT: | 1395 | case EXPORT_TO_INIT_EXIT: |
1396 | prl_to = sec2annotation(tosec); | ||
1298 | fprintf(stderr, | 1397 | fprintf(stderr, |
1299 | "The symbol %s is exported and annotated %s\n" | 1398 | "The symbol %s is exported and annotated %s\n" |
1300 | "Fix this by removing the %sannotation of %s " | 1399 | "Fix this by removing the %sannotation of %s " |
1301 | "or drop the export.\n", | 1400 | "or drop the export.\n", |
1302 | tosym, sec2annotation(tosec), sec2annotation(tosec), tosym); | 1401 | tosym, prl_to, prl_to, tosym); |
1402 | free(prl_to); | ||
1303 | break; | 1403 | break; |
1304 | } | 1404 | } |
1305 | fprintf(stderr, "\n"); | 1405 | fprintf(stderr, "\n"); |
@@ -1311,7 +1411,7 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf, | |||
1311 | const char *tosec; | 1411 | const char *tosec; |
1312 | const struct sectioncheck *mismatch; | 1412 | const struct sectioncheck *mismatch; |
1313 | 1413 | ||
1314 | tosec = sec_name(elf, sym->st_shndx); | 1414 | tosec = sec_name(elf, get_secindex(elf, sym)); |
1315 | mismatch = section_mismatch(fromsec, tosec); | 1415 | mismatch = section_mismatch(fromsec, tosec); |
1316 | if (mismatch) { | 1416 | if (mismatch) { |
1317 | Elf_Sym *to; | 1417 | Elf_Sym *to; |
@@ -1339,10 +1439,10 @@ static unsigned int *reloc_location(struct elf_info *elf, | |||
1339 | Elf_Shdr *sechdr, Elf_Rela *r) | 1439 | Elf_Shdr *sechdr, Elf_Rela *r) |
1340 | { | 1440 | { |
1341 | Elf_Shdr *sechdrs = elf->sechdrs; | 1441 | Elf_Shdr *sechdrs = elf->sechdrs; |
1342 | int section = sechdr->sh_info; | 1442 | int section = shndx2secindex(sechdr->sh_info); |
1343 | 1443 | ||
1344 | return (void *)elf->hdr + sechdrs[section].sh_offset + | 1444 | return (void *)elf->hdr + sechdrs[section].sh_offset + |
1345 | (r->r_offset - sechdrs[section].sh_addr); | 1445 | r->r_offset; |
1346 | } | 1446 | } |
1347 | 1447 | ||
1348 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) | 1448 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) |
@@ -1447,7 +1547,7 @@ static void section_rela(const char *modname, struct elf_info *elf, | |||
1447 | r.r_addend = TO_NATIVE(rela->r_addend); | 1547 | r.r_addend = TO_NATIVE(rela->r_addend); |
1448 | sym = elf->symtab_start + r_sym; | 1548 | sym = elf->symtab_start + r_sym; |
1449 | /* Skip special sections */ | 1549 | /* Skip special sections */ |
1450 | if (sym->st_shndx >= SHN_LORESERVE) | 1550 | if (is_shndx_special(sym->st_shndx)) |
1451 | continue; | 1551 | continue; |
1452 | check_section_mismatch(modname, elf, &r, sym, fromsec); | 1552 | check_section_mismatch(modname, elf, &r, sym, fromsec); |
1453 | } | 1553 | } |
@@ -1505,7 +1605,7 @@ static void section_rel(const char *modname, struct elf_info *elf, | |||
1505 | } | 1605 | } |
1506 | sym = elf->symtab_start + r_sym; | 1606 | sym = elf->symtab_start + r_sym; |
1507 | /* Skip special sections */ | 1607 | /* Skip special sections */ |
1508 | if (sym->st_shndx >= SHN_LORESERVE) | 1608 | if (is_shndx_special(sym->st_shndx)) |
1509 | continue; | 1609 | continue; |
1510 | check_section_mismatch(modname, elf, &r, sym, fromsec); | 1610 | check_section_mismatch(modname, elf, &r, sym, fromsec); |
1511 | } | 1611 | } |
@@ -1515,7 +1615,7 @@ static void section_rel(const char *modname, struct elf_info *elf, | |||
1515 | * A module includes a number of sections that are discarded | 1615 | * A module includes a number of sections that are discarded |
1516 | * either when loaded or when used as built-in. | 1616 | * either when loaded or when used as built-in. |
1517 | * For loaded modules all functions marked __init and all data | 1617 | * For loaded modules all functions marked __init and all data |
1518 | * marked __initdata will be discarded when the module has been intialized. | 1618 | * marked __initdata will be discarded when the module has been initialized. |
1519 | * Likewise for modules used built-in the sections marked __exit | 1619 | * Likewise for modules used built-in the sections marked __exit |
1520 | * are discarded because __exit marked function are supposed to be called | 1620 | * are discarded because __exit marked function are supposed to be called |
1521 | * only when a module is unloaded which never happens for built-in modules. | 1621 | * only when a module is unloaded which never happens for built-in modules. |
@@ -1530,7 +1630,7 @@ static void check_sec_ref(struct module *mod, const char *modname, | |||
1530 | Elf_Shdr *sechdrs = elf->sechdrs; | 1630 | Elf_Shdr *sechdrs = elf->sechdrs; |
1531 | 1631 | ||
1532 | /* Walk through all sections */ | 1632 | /* Walk through all sections */ |
1533 | for (i = 0; i < elf->hdr->e_shnum; i++) { | 1633 | for (i = 0; i < elf->num_sections; i++) { |
1534 | check_section(modname, elf, &elf->sechdrs[i]); | 1634 | check_section(modname, elf, &elf->sechdrs[i]); |
1535 | /* We want to process only relocation sections and not .init */ | 1635 | /* We want to process only relocation sections and not .init */ |
1536 | if (sechdrs[i].sh_type == SHT_RELA) | 1636 | if (sechdrs[i].sh_type == SHT_RELA) |
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index be987a44f25..0388cfccac8 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h | |||
@@ -129,8 +129,51 @@ struct elf_info { | |||
129 | const char *strtab; | 129 | const char *strtab; |
130 | char *modinfo; | 130 | char *modinfo; |
131 | unsigned int modinfo_len; | 131 | unsigned int modinfo_len; |
132 | |||
133 | /* support for 32bit section numbers */ | ||
134 | |||
135 | unsigned int num_sections; /* max_secindex + 1 */ | ||
136 | unsigned int secindex_strings; | ||
137 | /* if Nth symbol table entry has .st_shndx = SHN_XINDEX, | ||
138 | * take shndx from symtab_shndx_start[N] instead */ | ||
139 | Elf32_Word *symtab_shndx_start; | ||
140 | Elf32_Word *symtab_shndx_stop; | ||
132 | }; | 141 | }; |
133 | 142 | ||
143 | static inline int is_shndx_special(unsigned int i) | ||
144 | { | ||
145 | return i != SHN_XINDEX && i >= SHN_LORESERVE && i <= SHN_HIRESERVE; | ||
146 | } | ||
147 | |||
148 | /* shndx is in [0..SHN_LORESERVE) U (SHN_HIRESERVE, 0xfffffff], thus: | ||
149 | * shndx == 0 <=> sechdrs[0] | ||
150 | * ...... | ||
151 | * shndx == SHN_LORESERVE-1 <=> sechdrs[SHN_LORESERVE-1] | ||
152 | * shndx == SHN_HIRESERVE+1 <=> sechdrs[SHN_LORESERVE] | ||
153 | * shndx == SHN_HIRESERVE+2 <=> sechdrs[SHN_LORESERVE+1] | ||
154 | * ...... | ||
155 | * fyi: sym->st_shndx is uint16, SHN_LORESERVE = ff00, SHN_HIRESERVE = ffff, | ||
156 | * so basically we map 0000..feff -> 0000..feff | ||
157 | * ff00..ffff -> (you are a bad boy, dont do it) | ||
158 | * 10000..xxxx -> ff00..(xxxx-0x100) | ||
159 | */ | ||
160 | static inline unsigned int shndx2secindex(unsigned int i) | ||
161 | { | ||
162 | if (i <= SHN_HIRESERVE) | ||
163 | return i; | ||
164 | return i - (SHN_HIRESERVE + 1 - SHN_LORESERVE); | ||
165 | } | ||
166 | |||
167 | /* Accessor for sym->st_shndx, hides ugliness of "64k sections" */ | ||
168 | static inline unsigned int get_secindex(const struct elf_info *info, | ||
169 | const Elf_Sym *sym) | ||
170 | { | ||
171 | if (sym->st_shndx != SHN_XINDEX) | ||
172 | return sym->st_shndx; | ||
173 | return shndx2secindex(info->symtab_shndx_start[sym - | ||
174 | info->symtab_start]); | ||
175 | } | ||
176 | |||
134 | /* file2alias.c */ | 177 | /* file2alias.c */ |
135 | extern unsigned int cross_build; | 178 | extern unsigned int cross_build; |
136 | void handle_moddevtable(struct module *mod, struct elf_info *info, | 179 | void handle_moddevtable(struct module *mod, struct elf_info *info, |
diff --git a/scripts/namespace.pl b/scripts/namespace.pl index 361d0f71184..a71be6b7cde 100755 --- a/scripts/namespace.pl +++ b/scripts/namespace.pl | |||
@@ -84,6 +84,64 @@ my %ksymtab = (); # names that appear in __ksymtab_ | |||
84 | my %ref = (); # $ref{$name} exists if there is a true external reference to $name | 84 | my %ref = (); # $ref{$name} exists if there is a true external reference to $name |
85 | my %export = (); # $export{$name} exists if there is an EXPORT_... of $name | 85 | my %export = (); # $export{$name} exists if there is an EXPORT_... of $name |
86 | 86 | ||
87 | my %nmexception = ( | ||
88 | 'fs/ext3/bitmap' => 1, | ||
89 | 'fs/ext4/bitmap' => 1, | ||
90 | 'arch/x86/lib/thunk_32' => 1, | ||
91 | 'arch/x86/lib/cmpxchg' => 1, | ||
92 | 'arch/x86/vdso/vdso32/note' => 1, | ||
93 | 'lib/irq_regs' => 1, | ||
94 | 'usr/initramfs_data' => 1, | ||
95 | 'drivers/scsi/aic94xx/aic94xx_dump' => 1, | ||
96 | 'drivers/scsi/libsas/sas_dump' => 1, | ||
97 | 'lib/dec_and_lock' => 1, | ||
98 | 'drivers/ide/ide-probe-mini' => 1, | ||
99 | 'usr/initramfs_data' => 1, | ||
100 | 'drivers/acpi/acpia/exdump' => 1, | ||
101 | 'drivers/acpi/acpia/rsdump' => 1, | ||
102 | 'drivers/acpi/acpia/nsdumpdv' => 1, | ||
103 | 'drivers/acpi/acpia/nsdump' => 1, | ||
104 | 'arch/ia64/sn/kernel/sn2/io' => 1, | ||
105 | 'arch/ia64/kernel/gate-data' => 1, | ||
106 | 'security/capability' => 1, | ||
107 | 'fs/ntfs/sysctl' => 1, | ||
108 | 'fs/jfs/jfs_debug' => 1, | ||
109 | ); | ||
110 | |||
111 | my %nameexception = ( | ||
112 | 'mod_use_count_' => 1, | ||
113 | '__initramfs_end' => 1, | ||
114 | '__initramfs_start' => 1, | ||
115 | '_einittext' => 1, | ||
116 | '_sinittext' => 1, | ||
117 | 'kallsyms_names' => 1, | ||
118 | 'kallsyms_num_syms' => 1, | ||
119 | 'kallsyms_addresses'=> 1, | ||
120 | '__this_module' => 1, | ||
121 | '_etext' => 1, | ||
122 | '_edata' => 1, | ||
123 | '_end' => 1, | ||
124 | '__bss_start' => 1, | ||
125 | '_text' => 1, | ||
126 | '_stext' => 1, | ||
127 | '__gp' => 1, | ||
128 | 'ia64_unw_start' => 1, | ||
129 | 'ia64_unw_end' => 1, | ||
130 | '__init_begin' => 1, | ||
131 | '__init_end' => 1, | ||
132 | '__bss_stop' => 1, | ||
133 | '__nosave_begin' => 1, | ||
134 | '__nosave_end' => 1, | ||
135 | 'pg0' => 1, | ||
136 | 'vdso_enabled' => 1, | ||
137 | '__stack_chk_fail' => 1, | ||
138 | 'VDSO32_PRELINK' => 1, | ||
139 | 'VDSO32_vsyscall' => 1, | ||
140 | 'VDSO32_rt_sigreturn'=>1, | ||
141 | 'VDSO32_sigreturn' => 1, | ||
142 | ); | ||
143 | |||
144 | |||
87 | &find(\&linux_objects, '.'); # find the objects and do_nm on them | 145 | &find(\&linux_objects, '.'); # find the objects and do_nm on them |
88 | &list_multiply_defined(); | 146 | &list_multiply_defined(); |
89 | &resolve_external_references(); | 147 | &resolve_external_references(); |
@@ -105,7 +163,8 @@ sub linux_objects | |||
105 | if (/.*\.o$/ && | 163 | if (/.*\.o$/ && |
106 | ! ( | 164 | ! ( |
107 | m:/built-in.o$: | 165 | m:/built-in.o$: |
108 | || m:arch/x86/kernel/vsyscall-syms.o$: | 166 | || m:arch/x86/vdso/: |
167 | || m:arch/x86/boot/: | ||
109 | || m:arch/ia64/ia32/ia32.o$: | 168 | || m:arch/ia64/ia32/ia32.o$: |
110 | || m:arch/ia64/kernel/gate-syms.o$: | 169 | || m:arch/ia64/kernel/gate-syms.o$: |
111 | || m:arch/ia64/lib/__divdi3.o$: | 170 | || m:arch/ia64/lib/__divdi3.o$: |
@@ -148,6 +207,7 @@ sub linux_objects | |||
148 | || m:^.*/\.tmp_: | 207 | || m:^.*/\.tmp_: |
149 | || m:^\.tmp_: | 208 | || m:^\.tmp_: |
150 | || m:/vmlinux-obj.o$: | 209 | || m:/vmlinux-obj.o$: |
210 | || m:^tools/: | ||
151 | ) | 211 | ) |
152 | ) { | 212 | ) { |
153 | do_nm($basename, $_); | 213 | do_nm($basename, $_); |
@@ -167,11 +227,11 @@ sub do_nm | |||
167 | printf STDERR "$fullname is not an object file\n"; | 227 | printf STDERR "$fullname is not an object file\n"; |
168 | return; | 228 | return; |
169 | } | 229 | } |
170 | ($source = $fullname) =~ s/\.o$//; | 230 | ($source = $basename) =~ s/\.o$//; |
171 | if (-e "$objtree$source.c" || -e "$objtree$source.S") { | 231 | if (-e "$source.c" || -e "$source.S") { |
172 | $source = "$objtree$source"; | 232 | $source = "$objtree$File::Find::dir/$source"; |
173 | } else { | 233 | } else { |
174 | $source = "$srctree$source"; | 234 | $source = "$srctree$File::Find::dir/$source"; |
175 | } | 235 | } |
176 | if (! -e "$source.c" && ! -e "$source.S") { | 236 | if (! -e "$source.c" && ! -e "$source.S") { |
177 | # No obvious source, exclude the object if it is conglomerate | 237 | # No obvious source, exclude the object if it is conglomerate |
@@ -214,6 +274,7 @@ sub do_nm | |||
214 | # T global label/procedure | 274 | # T global label/procedure |
215 | # U external reference | 275 | # U external reference |
216 | # W weak external reference to text that has been resolved | 276 | # W weak external reference to text that has been resolved |
277 | # V similar to W, but the value of the weak symbol becomes zero with no error. | ||
217 | # a assembler equate | 278 | # a assembler equate |
218 | # b static variable, uninitialised | 279 | # b static variable, uninitialised |
219 | # d static variable, initialised | 280 | # d static variable, initialised |
@@ -222,8 +283,9 @@ sub do_nm | |||
222 | # s static variable, uninitialised, small bss | 283 | # s static variable, uninitialised, small bss |
223 | # t static label/procedures | 284 | # t static label/procedures |
224 | # w weak external reference to text that has not been resolved | 285 | # w weak external reference to text that has not been resolved |
286 | # v similar to w | ||
225 | # ? undefined type, used a lot by modules | 287 | # ? undefined type, used a lot by modules |
226 | if ($type !~ /^[ABCDGRSTUWabdgrstw?]$/) { | 288 | if ($type !~ /^[ABCDGRSTUWVabdgrstwv?]$/) { |
227 | printf STDERR "nm output for $fullname contains unknown type '$_'\n"; | 289 | printf STDERR "nm output for $fullname contains unknown type '$_'\n"; |
228 | } | 290 | } |
229 | elsif ($name =~ /\./) { | 291 | elsif ($name =~ /\./) { |
@@ -234,7 +296,7 @@ sub do_nm | |||
234 | # binutils keeps changing the type for exported symbols, force it to R | 296 | # binutils keeps changing the type for exported symbols, force it to R |
235 | $type = 'R' if ($name =~ /^__ksymtab/ || $name =~ /^__kstrtab/); | 297 | $type = 'R' if ($name =~ /^__ksymtab/ || $name =~ /^__kstrtab/); |
236 | $name =~ s/_R[a-f0-9]{8}$//; # module versions adds this | 298 | $name =~ s/_R[a-f0-9]{8}$//; # module versions adds this |
237 | if ($type =~ /[ABCDGRSTW]/ && | 299 | if ($type =~ /[ABCDGRSTWV]/ && |
238 | $name ne 'init_module' && | 300 | $name ne 'init_module' && |
239 | $name ne 'cleanup_module' && | 301 | $name ne 'cleanup_module' && |
240 | $name ne 'Using_Versions' && | 302 | $name ne 'Using_Versions' && |
@@ -270,27 +332,9 @@ sub do_nm | |||
270 | close($nmdata); | 332 | close($nmdata); |
271 | 333 | ||
272 | if ($#nmdata < 0) { | 334 | if ($#nmdata < 0) { |
273 | if ( | 335 | printf "No nm data for $fullname\n" |
274 | $fullname ne "lib/brlock.o" | 336 | unless $nmexception{$fullname}; |
275 | && $fullname ne "lib/dec_and_lock.o" | 337 | return; |
276 | && $fullname ne "fs/xfs/xfs_macros.o" | ||
277 | && $fullname ne "drivers/ide/ide-probe-mini.o" | ||
278 | && $fullname ne "usr/initramfs_data.o" | ||
279 | && $fullname ne "drivers/acpi/executer/exdump.o" | ||
280 | && $fullname ne "drivers/acpi/resources/rsdump.o" | ||
281 | && $fullname ne "drivers/acpi/namespace/nsdumpdv.o" | ||
282 | && $fullname ne "drivers/acpi/namespace/nsdump.o" | ||
283 | && $fullname ne "arch/ia64/sn/kernel/sn2/io.o" | ||
284 | && $fullname ne "arch/ia64/kernel/gate-data.o" | ||
285 | && $fullname ne "drivers/ieee1394/oui.o" | ||
286 | && $fullname ne "security/capability.o" | ||
287 | && $fullname ne "sound/core/wrappers.o" | ||
288 | && $fullname ne "fs/ntfs/sysctl.o" | ||
289 | && $fullname ne "fs/jfs/jfs_debug.o" | ||
290 | ) { | ||
291 | printf "No nm data for $fullname\n"; | ||
292 | } | ||
293 | return; | ||
294 | } | 338 | } |
295 | $nmdata{$fullname} = \@nmdata; | 339 | $nmdata{$fullname} = \@nmdata; |
296 | } | 340 | } |
@@ -319,18 +363,14 @@ sub list_multiply_defined | |||
319 | foreach my $name (keys(%def)) { | 363 | foreach my $name (keys(%def)) { |
320 | if ($#{$def{$name}} > 0) { | 364 | if ($#{$def{$name}} > 0) { |
321 | # Special case for cond_syscall | 365 | # Special case for cond_syscall |
322 | if ($#{$def{$name}} == 1 && $name =~ /^sys_/ && | 366 | if ($#{$def{$name}} == 1 && |
323 | ($def{$name}[0] eq "kernel/sys.o" || | 367 | ($name =~ /^sys_/ || $name =~ /^compat_sys_/ || |
324 | $def{$name}[1] eq "kernel/sys.o")) { | 368 | $name =~ /^sys32_/)) { |
325 | &drop_def("kernel/sys.o", $name); | 369 | if($def{$name}[0] eq "kernel/sys_ni.o" || |
326 | next; | 370 | $def{$name}[1] eq "kernel/sys_ni.o") { |
327 | } | 371 | &drop_def("kernel/sys_ni.o", $name); |
328 | # Special case for i386 entry code | 372 | next; |
329 | if ($#{$def{$name}} == 1 && $name =~ /^__kernel_/ && | 373 | } |
330 | $def{$name}[0] eq "arch/x86/kernel/vsyscall-int80_32.o" && | ||
331 | $def{$name}[1] eq "arch/x86/kernel/vsyscall-sysenter_32.o") { | ||
332 | &drop_def("arch/x86/kernel/vsyscall-sysenter_32.o", $name); | ||
333 | next; | ||
334 | } | 374 | } |
335 | 375 | ||
336 | printf "$name is multiply defined in :-\n"; | 376 | printf "$name is multiply defined in :-\n"; |
@@ -372,31 +412,7 @@ sub resolve_external_references | |||
372 | $ref{$name} = "" | 412 | $ref{$name} = "" |
373 | } | 413 | } |
374 | } | 414 | } |
375 | elsif ( $name ne "mod_use_count_" | 415 | elsif ( ! $nameexception{$name} |
376 | && $name ne "__initramfs_end" | ||
377 | && $name ne "__initramfs_start" | ||
378 | && $name ne "_einittext" | ||
379 | && $name ne "_sinittext" | ||
380 | && $name ne "kallsyms_names" | ||
381 | && $name ne "kallsyms_num_syms" | ||
382 | && $name ne "kallsyms_addresses" | ||
383 | && $name ne "__this_module" | ||
384 | && $name ne "_etext" | ||
385 | && $name ne "_edata" | ||
386 | && $name ne "_end" | ||
387 | && $name ne "__bss_start" | ||
388 | && $name ne "_text" | ||
389 | && $name ne "_stext" | ||
390 | && $name ne "__gp" | ||
391 | && $name ne "ia64_unw_start" | ||
392 | && $name ne "ia64_unw_end" | ||
393 | && $name ne "__init_begin" | ||
394 | && $name ne "__init_end" | ||
395 | && $name ne "__bss_stop" | ||
396 | && $name ne "__nosave_begin" | ||
397 | && $name ne "__nosave_end" | ||
398 | && $name ne "pg0" | ||
399 | && $name ne "__module_text_address" | ||
400 | && $name !~ /^__sched_text_/ | 416 | && $name !~ /^__sched_text_/ |
401 | && $name !~ /^__start_/ | 417 | && $name !~ /^__start_/ |
402 | && $name !~ /^__end_/ | 418 | && $name !~ /^__end_/ |
@@ -407,7 +423,6 @@ sub resolve_external_references | |||
407 | && $name !~ /^__.*per_cpu_end/ | 423 | && $name !~ /^__.*per_cpu_end/ |
408 | && $name !~ /^__alt_instructions/ | 424 | && $name !~ /^__alt_instructions/ |
409 | && $name !~ /^__setup_/ | 425 | && $name !~ /^__setup_/ |
410 | && $name !~ /^jiffies/ | ||
411 | && $name !~ /^__mod_timer/ | 426 | && $name !~ /^__mod_timer/ |
412 | && $name !~ /^__mod_page_state/ | 427 | && $name !~ /^__mod_page_state/ |
413 | && $name !~ /^init_module/ | 428 | && $name !~ /^init_module/ |
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 62fcc3a7f4d..d0b931b994f 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile | |||
@@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE | |||
44 | fi | 44 | fi |
45 | $(MAKE) clean | 45 | $(MAKE) clean |
46 | $(PREV) ln -sf $(srctree) $(KERNELPATH) | 46 | $(PREV) ln -sf $(srctree) $(KERNELPATH) |
47 | $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion > $(objtree)/.scmversion | 47 | $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion |
48 | $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. | 48 | $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. |
49 | $(PREV) rm $(KERNELPATH) | 49 | $(PREV) rm $(KERNELPATH) |
50 | rm -f $(objtree)/.scmversion | 50 | rm -f $(objtree)/.scmversion |
@@ -111,13 +111,38 @@ tar%pkg: FORCE | |||
111 | clean-dirs += $(objtree)/tar-install/ | 111 | clean-dirs += $(objtree)/tar-install/ |
112 | 112 | ||
113 | 113 | ||
114 | # perf-pkg - generate a source tarball with perf source | ||
115 | # --------------------------------------------------------------------------- | ||
116 | |||
117 | perf-tar=perf-$(KERNELVERSION) | ||
118 | |||
119 | quiet_cmd_perf_tar = TAR | ||
120 | cmd_perf_tar = \ | ||
121 | git archive --prefix=$(perf-tar)/ HEAD^{tree} \ | ||
122 | $$(cat $(srctree)/tools/perf/MANIFEST) -o $(perf-tar).tar; \ | ||
123 | mkdir -p $(perf-tar); \ | ||
124 | git rev-parse HEAD > $(perf-tar)/HEAD; \ | ||
125 | tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ | ||
126 | rm -r $(perf-tar); \ | ||
127 | $(if $(findstring tar-src,$@),, \ | ||
128 | $(if $(findstring bz2,$@),bzip2, \ | ||
129 | $(if $(findstring gz,$@),gzip, \ | ||
130 | $(error unknown target $@))) \ | ||
131 | -f -9 $(perf-tar).tar) | ||
132 | |||
133 | perf-%pkg: FORCE | ||
134 | $(call cmd,perf_tar) | ||
135 | |||
114 | # Help text displayed when executing 'make help' | 136 | # Help text displayed when executing 'make help' |
115 | # --------------------------------------------------------------------------- | 137 | # --------------------------------------------------------------------------- |
116 | help: FORCE | 138 | help: FORCE |
117 | @echo ' rpm-pkg - Build both source and binary RPM kernel packages' | 139 | @echo ' rpm-pkg - Build both source and binary RPM kernel packages' |
118 | @echo ' binrpm-pkg - Build only the binary kernel package' | 140 | @echo ' binrpm-pkg - Build only the binary kernel package' |
119 | @echo ' deb-pkg - Build the kernel as an deb package' | 141 | @echo ' deb-pkg - Build the kernel as an deb package' |
120 | @echo ' tar-pkg - Build the kernel as an uncompressed tarball' | 142 | @echo ' tar-pkg - Build the kernel as an uncompressed tarball' |
121 | @echo ' targz-pkg - Build the kernel as a gzip compressed tarball' | 143 | @echo ' targz-pkg - Build the kernel as a gzip compressed tarball' |
122 | @echo ' tarbz2-pkg - Build the kernel as a bzip2 compressed tarball' | 144 | @echo ' tarbz2-pkg - Build the kernel as a bzip2 compressed tarball' |
145 | @echo ' perf-tar-src-pkg - Build $(perf-tar).tar source tarball' | ||
146 | @echo ' perf-targz-src-pkg - Build $(perf-tar).tar.gz source tarball' | ||
147 | @echo ' perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball' | ||
123 | 148 | ||
diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 186344266c3..e1c1d5b8ca7 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | # Output a simple RPM spec file that uses no fancy features requring | 3 | # Output a simple RPM spec file that uses no fancy features requiring |
4 | # RPM v4. This is intended to work with any RPM distro. | 4 | # RPM v4. This is intended to work with any RPM distro. |
5 | # | 5 | # |
6 | # The only gothic bit here is redefining install_post to avoid | 6 | # The only gothic bit here is redefining install_post to avoid |
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c new file mode 100644 index 00000000000..038b3d1e298 --- /dev/null +++ b/scripts/recordmcount.c | |||
@@ -0,0 +1,410 @@ | |||
1 | /* | ||
2 | * recordmcount.c: construct a table of the locations of calls to 'mcount' | ||
3 | * so that ftrace can find them quickly. | ||
4 | * Copyright 2009 John F. Reiser <jreiser@BitWagon.com>. All rights reserved. | ||
5 | * Licensed under the GNU General Public License, version 2 (GPLv2). | ||
6 | * | ||
7 | * Restructured to fit Linux format, as well as other updates: | ||
8 | * Copyright 2010 Steven Rostedt <srostedt@redhat.com>, Red Hat Inc. | ||
9 | */ | ||
10 | |||
11 | /* | ||
12 | * Strategy: alter the .o file in-place. | ||
13 | * | ||
14 | * Append a new STRTAB that has the new section names, followed by a new array | ||
15 | * ElfXX_Shdr[] that has the new section headers, followed by the section | ||
16 | * contents for __mcount_loc and its relocations. The old shstrtab strings, | ||
17 | * and the old ElfXX_Shdr[] array, remain as "garbage" (commonly, a couple | ||
18 | * kilobytes.) Subsequent processing by /bin/ld (or the kernel module loader) | ||
19 | * will ignore the garbage regions, because they are not designated by the | ||
20 | * new .e_shoff nor the new ElfXX_Shdr[]. [In order to remove the garbage, | ||
21 | * then use "ld -r" to create a new file that omits the garbage.] | ||
22 | */ | ||
23 | |||
24 | #include <sys/types.h> | ||
25 | #include <sys/mman.h> | ||
26 | #include <sys/stat.h> | ||
27 | #include <elf.h> | ||
28 | #include <fcntl.h> | ||
29 | #include <setjmp.h> | ||
30 | #include <stdio.h> | ||
31 | #include <stdlib.h> | ||
32 | #include <string.h> | ||
33 | #include <unistd.h> | ||
34 | |||
35 | static int fd_map; /* File descriptor for file being modified. */ | ||
36 | static int mmap_failed; /* Boolean flag. */ | ||
37 | static void *ehdr_curr; /* current ElfXX_Ehdr * for resource cleanup */ | ||
38 | static char gpfx; /* prefix for global symbol name (sometimes '_') */ | ||
39 | static struct stat sb; /* Remember .st_size, etc. */ | ||
40 | static jmp_buf jmpenv; /* setjmp/longjmp per-file error escape */ | ||
41 | static const char *altmcount; /* alternate mcount symbol name */ | ||
42 | |||
43 | /* setjmp() return values */ | ||
44 | enum { | ||
45 | SJ_SETJMP = 0, /* hardwired first return */ | ||
46 | SJ_FAIL, | ||
47 | SJ_SUCCEED | ||
48 | }; | ||
49 | |||
50 | /* Per-file resource cleanup when multiple files. */ | ||
51 | static void | ||
52 | cleanup(void) | ||
53 | { | ||
54 | if (!mmap_failed) | ||
55 | munmap(ehdr_curr, sb.st_size); | ||
56 | else | ||
57 | free(ehdr_curr); | ||
58 | close(fd_map); | ||
59 | } | ||
60 | |||
61 | static void __attribute__((noreturn)) | ||
62 | fail_file(void) | ||
63 | { | ||
64 | cleanup(); | ||
65 | longjmp(jmpenv, SJ_FAIL); | ||
66 | } | ||
67 | |||
68 | static void __attribute__((noreturn)) | ||
69 | succeed_file(void) | ||
70 | { | ||
71 | cleanup(); | ||
72 | longjmp(jmpenv, SJ_SUCCEED); | ||
73 | } | ||
74 | |||
75 | /* ulseek, uread, ...: Check return value for errors. */ | ||
76 | |||
77 | static off_t | ||
78 | ulseek(int const fd, off_t const offset, int const whence) | ||
79 | { | ||
80 | off_t const w = lseek(fd, offset, whence); | ||
81 | if ((off_t)-1 == w) { | ||
82 | perror("lseek"); | ||
83 | fail_file(); | ||
84 | } | ||
85 | return w; | ||
86 | } | ||
87 | |||
88 | static size_t | ||
89 | uread(int const fd, void *const buf, size_t const count) | ||
90 | { | ||
91 | size_t const n = read(fd, buf, count); | ||
92 | if (n != count) { | ||
93 | perror("read"); | ||
94 | fail_file(); | ||
95 | } | ||
96 | return n; | ||
97 | } | ||
98 | |||
99 | static size_t | ||
100 | uwrite(int const fd, void const *const buf, size_t const count) | ||
101 | { | ||
102 | size_t const n = write(fd, buf, count); | ||
103 | if (n != count) { | ||
104 | perror("write"); | ||
105 | fail_file(); | ||
106 | } | ||
107 | return n; | ||
108 | } | ||
109 | |||
110 | static void * | ||
111 | umalloc(size_t size) | ||
112 | { | ||
113 | void *const addr = malloc(size); | ||
114 | if (0 == addr) { | ||
115 | fprintf(stderr, "malloc failed: %zu bytes\n", size); | ||
116 | fail_file(); | ||
117 | } | ||
118 | return addr; | ||
119 | } | ||
120 | |||
121 | /* | ||
122 | * Get the whole file as a programming convenience in order to avoid | ||
123 | * malloc+lseek+read+free of many pieces. If successful, then mmap | ||
124 | * avoids copying unused pieces; else just read the whole file. | ||
125 | * Open for both read and write; new info will be appended to the file. | ||
126 | * Use MAP_PRIVATE so that a few changes to the in-memory ElfXX_Ehdr | ||
127 | * do not propagate to the file until an explicit overwrite at the last. | ||
128 | * This preserves most aspects of consistency (all except .st_size) | ||
129 | * for simultaneous readers of the file while we are appending to it. | ||
130 | * However, multiple writers still are bad. We choose not to use | ||
131 | * locking because it is expensive and the use case of kernel build | ||
132 | * makes multiple writers unlikely. | ||
133 | */ | ||
134 | static void *mmap_file(char const *fname) | ||
135 | { | ||
136 | void *addr; | ||
137 | |||
138 | fd_map = open(fname, O_RDWR); | ||
139 | if (0 > fd_map || 0 > fstat(fd_map, &sb)) { | ||
140 | perror(fname); | ||
141 | fail_file(); | ||
142 | } | ||
143 | if (!S_ISREG(sb.st_mode)) { | ||
144 | fprintf(stderr, "not a regular file: %s\n", fname); | ||
145 | fail_file(); | ||
146 | } | ||
147 | addr = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, | ||
148 | fd_map, 0); | ||
149 | mmap_failed = 0; | ||
150 | if (MAP_FAILED == addr) { | ||
151 | mmap_failed = 1; | ||
152 | addr = umalloc(sb.st_size); | ||
153 | uread(fd_map, addr, sb.st_size); | ||
154 | } | ||
155 | return addr; | ||
156 | } | ||
157 | |||
158 | /* w8rev, w8nat, ...: Handle endianness. */ | ||
159 | |||
160 | static uint64_t w8rev(uint64_t const x) | ||
161 | { | ||
162 | return ((0xff & (x >> (0 * 8))) << (7 * 8)) | ||
163 | | ((0xff & (x >> (1 * 8))) << (6 * 8)) | ||
164 | | ((0xff & (x >> (2 * 8))) << (5 * 8)) | ||
165 | | ((0xff & (x >> (3 * 8))) << (4 * 8)) | ||
166 | | ((0xff & (x >> (4 * 8))) << (3 * 8)) | ||
167 | | ((0xff & (x >> (5 * 8))) << (2 * 8)) | ||
168 | | ((0xff & (x >> (6 * 8))) << (1 * 8)) | ||
169 | | ((0xff & (x >> (7 * 8))) << (0 * 8)); | ||
170 | } | ||
171 | |||
172 | static uint32_t w4rev(uint32_t const x) | ||
173 | { | ||
174 | return ((0xff & (x >> (0 * 8))) << (3 * 8)) | ||
175 | | ((0xff & (x >> (1 * 8))) << (2 * 8)) | ||
176 | | ((0xff & (x >> (2 * 8))) << (1 * 8)) | ||
177 | | ((0xff & (x >> (3 * 8))) << (0 * 8)); | ||
178 | } | ||
179 | |||
180 | static uint32_t w2rev(uint16_t const x) | ||
181 | { | ||
182 | return ((0xff & (x >> (0 * 8))) << (1 * 8)) | ||
183 | | ((0xff & (x >> (1 * 8))) << (0 * 8)); | ||
184 | } | ||
185 | |||
186 | static uint64_t w8nat(uint64_t const x) | ||
187 | { | ||
188 | return x; | ||
189 | } | ||
190 | |||
191 | static uint32_t w4nat(uint32_t const x) | ||
192 | { | ||
193 | return x; | ||
194 | } | ||
195 | |||
196 | static uint32_t w2nat(uint16_t const x) | ||
197 | { | ||
198 | return x; | ||
199 | } | ||
200 | |||
201 | static uint64_t (*w8)(uint64_t); | ||
202 | static uint32_t (*w)(uint32_t); | ||
203 | static uint32_t (*w2)(uint16_t); | ||
204 | |||
205 | /* Names of the sections that could contain calls to mcount. */ | ||
206 | static int | ||
207 | is_mcounted_section_name(char const *const txtname) | ||
208 | { | ||
209 | return 0 == strcmp(".text", txtname) || | ||
210 | 0 == strcmp(".sched.text", txtname) || | ||
211 | 0 == strcmp(".spinlock.text", txtname) || | ||
212 | 0 == strcmp(".irqentry.text", txtname) || | ||
213 | 0 == strcmp(".text.unlikely", txtname); | ||
214 | } | ||
215 | |||
216 | /* 32 bit and 64 bit are very similar */ | ||
217 | #include "recordmcount.h" | ||
218 | #define RECORD_MCOUNT_64 | ||
219 | #include "recordmcount.h" | ||
220 | |||
221 | /* 64-bit EM_MIPS has weird ELF64_Rela.r_info. | ||
222 | * http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf | ||
223 | * We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40] | ||
224 | * to imply the order of the members; the spec does not say so. | ||
225 | * typedef unsigned char Elf64_Byte; | ||
226 | * fails on MIPS64 because their <elf.h> already has it! | ||
227 | */ | ||
228 | |||
229 | typedef uint8_t myElf64_Byte; /* Type for a 8-bit quantity. */ | ||
230 | |||
231 | union mips_r_info { | ||
232 | Elf64_Xword r_info; | ||
233 | struct { | ||
234 | Elf64_Word r_sym; /* Symbol index. */ | ||
235 | myElf64_Byte r_ssym; /* Special symbol. */ | ||
236 | myElf64_Byte r_type3; /* Third relocation. */ | ||
237 | myElf64_Byte r_type2; /* Second relocation. */ | ||
238 | myElf64_Byte r_type; /* First relocation. */ | ||
239 | } r_mips; | ||
240 | }; | ||
241 | |||
242 | static uint64_t MIPS64_r_sym(Elf64_Rel const *rp) | ||
243 | { | ||
244 | return w(((union mips_r_info){ .r_info = rp->r_info }).r_mips.r_sym); | ||
245 | } | ||
246 | |||
247 | static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type) | ||
248 | { | ||
249 | rp->r_info = ((union mips_r_info){ | ||
250 | .r_mips = { .r_sym = w(sym), .r_type = type } | ||
251 | }).r_info; | ||
252 | } | ||
253 | |||
254 | static void | ||
255 | do_file(char const *const fname) | ||
256 | { | ||
257 | Elf32_Ehdr *const ehdr = mmap_file(fname); | ||
258 | unsigned int reltype = 0; | ||
259 | |||
260 | ehdr_curr = ehdr; | ||
261 | w = w4nat; | ||
262 | w2 = w2nat; | ||
263 | w8 = w8nat; | ||
264 | switch (ehdr->e_ident[EI_DATA]) { | ||
265 | static unsigned int const endian = 1; | ||
266 | default: { | ||
267 | fprintf(stderr, "unrecognized ELF data encoding %d: %s\n", | ||
268 | ehdr->e_ident[EI_DATA], fname); | ||
269 | fail_file(); | ||
270 | } break; | ||
271 | case ELFDATA2LSB: { | ||
272 | if (1 != *(unsigned char const *)&endian) { | ||
273 | /* main() is big endian, file.o is little endian. */ | ||
274 | w = w4rev; | ||
275 | w2 = w2rev; | ||
276 | w8 = w8rev; | ||
277 | } | ||
278 | } break; | ||
279 | case ELFDATA2MSB: { | ||
280 | if (0 != *(unsigned char const *)&endian) { | ||
281 | /* main() is little endian, file.o is big endian. */ | ||
282 | w = w4rev; | ||
283 | w2 = w2rev; | ||
284 | w8 = w8rev; | ||
285 | } | ||
286 | } break; | ||
287 | } /* end switch */ | ||
288 | if (0 != memcmp(ELFMAG, ehdr->e_ident, SELFMAG) | ||
289 | || ET_REL != w2(ehdr->e_type) | ||
290 | || EV_CURRENT != ehdr->e_ident[EI_VERSION]) { | ||
291 | fprintf(stderr, "unrecognized ET_REL file %s\n", fname); | ||
292 | fail_file(); | ||
293 | } | ||
294 | |||
295 | gpfx = 0; | ||
296 | switch (w2(ehdr->e_machine)) { | ||
297 | default: { | ||
298 | fprintf(stderr, "unrecognized e_machine %d %s\n", | ||
299 | w2(ehdr->e_machine), fname); | ||
300 | fail_file(); | ||
301 | } break; | ||
302 | case EM_386: reltype = R_386_32; break; | ||
303 | case EM_ARM: reltype = R_ARM_ABS32; | ||
304 | altmcount = "__gnu_mcount_nc"; | ||
305 | break; | ||
306 | case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break; | ||
307 | case EM_MIPS: /* reltype: e_class */ gpfx = '_'; break; | ||
308 | case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break; | ||
309 | case EM_PPC64: reltype = R_PPC64_ADDR64; gpfx = '_'; break; | ||
310 | case EM_S390: /* reltype: e_class */ gpfx = '_'; break; | ||
311 | case EM_SH: reltype = R_SH_DIR32; break; | ||
312 | case EM_SPARCV9: reltype = R_SPARC_64; gpfx = '_'; break; | ||
313 | case EM_X86_64: reltype = R_X86_64_64; break; | ||
314 | } /* end switch */ | ||
315 | |||
316 | switch (ehdr->e_ident[EI_CLASS]) { | ||
317 | default: { | ||
318 | fprintf(stderr, "unrecognized ELF class %d %s\n", | ||
319 | ehdr->e_ident[EI_CLASS], fname); | ||
320 | fail_file(); | ||
321 | } break; | ||
322 | case ELFCLASS32: { | ||
323 | if (sizeof(Elf32_Ehdr) != w2(ehdr->e_ehsize) | ||
324 | || sizeof(Elf32_Shdr) != w2(ehdr->e_shentsize)) { | ||
325 | fprintf(stderr, | ||
326 | "unrecognized ET_REL file: %s\n", fname); | ||
327 | fail_file(); | ||
328 | } | ||
329 | if (EM_S390 == w2(ehdr->e_machine)) | ||
330 | reltype = R_390_32; | ||
331 | if (EM_MIPS == w2(ehdr->e_machine)) { | ||
332 | reltype = R_MIPS_32; | ||
333 | is_fake_mcount32 = MIPS32_is_fake_mcount; | ||
334 | } | ||
335 | do32(ehdr, fname, reltype); | ||
336 | } break; | ||
337 | case ELFCLASS64: { | ||
338 | Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr; | ||
339 | if (sizeof(Elf64_Ehdr) != w2(ghdr->e_ehsize) | ||
340 | || sizeof(Elf64_Shdr) != w2(ghdr->e_shentsize)) { | ||
341 | fprintf(stderr, | ||
342 | "unrecognized ET_REL file: %s\n", fname); | ||
343 | fail_file(); | ||
344 | } | ||
345 | if (EM_S390 == w2(ghdr->e_machine)) | ||
346 | reltype = R_390_64; | ||
347 | if (EM_MIPS == w2(ghdr->e_machine)) { | ||
348 | reltype = R_MIPS_64; | ||
349 | Elf64_r_sym = MIPS64_r_sym; | ||
350 | Elf64_r_info = MIPS64_r_info; | ||
351 | is_fake_mcount64 = MIPS64_is_fake_mcount; | ||
352 | } | ||
353 | do64(ghdr, fname, reltype); | ||
354 | } break; | ||
355 | } /* end switch */ | ||
356 | |||
357 | cleanup(); | ||
358 | } | ||
359 | |||
360 | int | ||
361 | main(int argc, char const *argv[]) | ||
362 | { | ||
363 | const char ftrace[] = "/ftrace.o"; | ||
364 | int ftrace_size = sizeof(ftrace) - 1; | ||
365 | int n_error = 0; /* gcc-4.3.0 false positive complaint */ | ||
366 | |||
367 | if (argc <= 1) { | ||
368 | fprintf(stderr, "usage: recordmcount file.o...\n"); | ||
369 | return 0; | ||
370 | } | ||
371 | |||
372 | /* Process each file in turn, allowing deep failure. */ | ||
373 | for (--argc, ++argv; 0 < argc; --argc, ++argv) { | ||
374 | int const sjval = setjmp(jmpenv); | ||
375 | int len; | ||
376 | |||
377 | /* | ||
378 | * The file kernel/trace/ftrace.o references the mcount | ||
379 | * function but does not call it. Since ftrace.o should | ||
380 | * not be traced anyway, we just skip it. | ||
381 | */ | ||
382 | len = strlen(argv[0]); | ||
383 | if (len >= ftrace_size && | ||
384 | strcmp(argv[0] + (len - ftrace_size), ftrace) == 0) | ||
385 | continue; | ||
386 | |||
387 | switch (sjval) { | ||
388 | default: { | ||
389 | fprintf(stderr, "internal error: %s\n", argv[0]); | ||
390 | exit(1); | ||
391 | } break; | ||
392 | case SJ_SETJMP: { /* normal sequence */ | ||
393 | /* Avoid problems if early cleanup() */ | ||
394 | fd_map = -1; | ||
395 | ehdr_curr = NULL; | ||
396 | mmap_failed = 1; | ||
397 | do_file(argv[0]); | ||
398 | } break; | ||
399 | case SJ_FAIL: { /* error in do_file or below */ | ||
400 | ++n_error; | ||
401 | } break; | ||
402 | case SJ_SUCCEED: { /* premature success */ | ||
403 | /* do nothing */ | ||
404 | } break; | ||
405 | } /* end switch */ | ||
406 | } | ||
407 | return !!n_error; | ||
408 | } | ||
409 | |||
410 | |||
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h new file mode 100644 index 00000000000..baf187bee98 --- /dev/null +++ b/scripts/recordmcount.h | |||
@@ -0,0 +1,443 @@ | |||
1 | /* | ||
2 | * recordmcount.h | ||
3 | * | ||
4 | * This code was taken out of recordmcount.c written by | ||
5 | * Copyright 2009 John F. Reiser <jreiser@BitWagon.com>. All rights reserved. | ||
6 | * | ||
7 | * The original code had the same algorithms for both 32bit | ||
8 | * and 64bit ELF files, but the code was duplicated to support | ||
9 | * the difference in structures that were used. This | ||
10 | * file creates a macro of everything that is different between | ||
11 | * the 64 and 32 bit code, such that by including this header | ||
12 | * twice we can create both sets of functions by including this | ||
13 | * header once with RECORD_MCOUNT_64 undefined, and again with | ||
14 | * it defined. | ||
15 | * | ||
16 | * This conversion to macros was done by: | ||
17 | * Copyright 2010 Steven Rostedt <srostedt@redhat.com>, Red Hat Inc. | ||
18 | * | ||
19 | * Licensed under the GNU General Public License, version 2 (GPLv2). | ||
20 | */ | ||
21 | #undef append_func | ||
22 | #undef is_fake_mcount | ||
23 | #undef fn_is_fake_mcount | ||
24 | #undef MIPS_is_fake_mcount | ||
25 | #undef sift_rel_mcount | ||
26 | #undef find_secsym_ndx | ||
27 | #undef __has_rel_mcount | ||
28 | #undef has_rel_mcount | ||
29 | #undef tot_relsize | ||
30 | #undef do_func | ||
31 | #undef Elf_Addr | ||
32 | #undef Elf_Ehdr | ||
33 | #undef Elf_Shdr | ||
34 | #undef Elf_Rel | ||
35 | #undef Elf_Rela | ||
36 | #undef Elf_Sym | ||
37 | #undef ELF_R_SYM | ||
38 | #undef Elf_r_sym | ||
39 | #undef ELF_R_INFO | ||
40 | #undef Elf_r_info | ||
41 | #undef ELF_ST_BIND | ||
42 | #undef fn_ELF_R_SYM | ||
43 | #undef fn_ELF_R_INFO | ||
44 | #undef uint_t | ||
45 | #undef _w | ||
46 | #undef _align | ||
47 | #undef _size | ||
48 | |||
49 | #ifdef RECORD_MCOUNT_64 | ||
50 | # define append_func append64 | ||
51 | # define sift_rel_mcount sift64_rel_mcount | ||
52 | # define find_secsym_ndx find64_secsym_ndx | ||
53 | # define __has_rel_mcount __has64_rel_mcount | ||
54 | # define has_rel_mcount has64_rel_mcount | ||
55 | # define tot_relsize tot64_relsize | ||
56 | # define do_func do64 | ||
57 | # define is_fake_mcount is_fake_mcount64 | ||
58 | # define fn_is_fake_mcount fn_is_fake_mcount64 | ||
59 | # define MIPS_is_fake_mcount MIPS64_is_fake_mcount | ||
60 | # define Elf_Addr Elf64_Addr | ||
61 | # define Elf_Ehdr Elf64_Ehdr | ||
62 | # define Elf_Shdr Elf64_Shdr | ||
63 | # define Elf_Rel Elf64_Rel | ||
64 | # define Elf_Rela Elf64_Rela | ||
65 | # define Elf_Sym Elf64_Sym | ||
66 | # define ELF_R_SYM ELF64_R_SYM | ||
67 | # define Elf_r_sym Elf64_r_sym | ||
68 | # define ELF_R_INFO ELF64_R_INFO | ||
69 | # define Elf_r_info Elf64_r_info | ||
70 | # define ELF_ST_BIND ELF64_ST_BIND | ||
71 | # define fn_ELF_R_SYM fn_ELF64_R_SYM | ||
72 | # define fn_ELF_R_INFO fn_ELF64_R_INFO | ||
73 | # define uint_t uint64_t | ||
74 | # define _w w8 | ||
75 | # define _align 7u | ||
76 | # define _size 8 | ||
77 | #else | ||
78 | # define append_func append32 | ||
79 | # define sift_rel_mcount sift32_rel_mcount | ||
80 | # define find_secsym_ndx find32_secsym_ndx | ||
81 | # define __has_rel_mcount __has32_rel_mcount | ||
82 | # define has_rel_mcount has32_rel_mcount | ||
83 | # define tot_relsize tot32_relsize | ||
84 | # define do_func do32 | ||
85 | # define is_fake_mcount is_fake_mcount32 | ||
86 | # define fn_is_fake_mcount fn_is_fake_mcount32 | ||
87 | # define MIPS_is_fake_mcount MIPS32_is_fake_mcount | ||
88 | # define Elf_Addr Elf32_Addr | ||
89 | # define Elf_Ehdr Elf32_Ehdr | ||
90 | # define Elf_Shdr Elf32_Shdr | ||
91 | # define Elf_Rel Elf32_Rel | ||
92 | # define Elf_Rela Elf32_Rela | ||
93 | # define Elf_Sym Elf32_Sym | ||
94 | # define ELF_R_SYM ELF32_R_SYM | ||
95 | # define Elf_r_sym Elf32_r_sym | ||
96 | # define ELF_R_INFO ELF32_R_INFO | ||
97 | # define Elf_r_info Elf32_r_info | ||
98 | # define ELF_ST_BIND ELF32_ST_BIND | ||
99 | # define fn_ELF_R_SYM fn_ELF32_R_SYM | ||
100 | # define fn_ELF_R_INFO fn_ELF32_R_INFO | ||
101 | # define uint_t uint32_t | ||
102 | # define _w w | ||
103 | # define _align 3u | ||
104 | # define _size 4 | ||
105 | #endif | ||
106 | |||
107 | /* Functions and pointers that do_file() may override for specific e_machine. */ | ||
108 | static int fn_is_fake_mcount(Elf_Rel const *rp) | ||
109 | { | ||
110 | return 0; | ||
111 | } | ||
112 | static int (*is_fake_mcount)(Elf_Rel const *rp) = fn_is_fake_mcount; | ||
113 | |||
114 | static uint_t fn_ELF_R_SYM(Elf_Rel const *rp) | ||
115 | { | ||
116 | return ELF_R_SYM(_w(rp->r_info)); | ||
117 | } | ||
118 | static uint_t (*Elf_r_sym)(Elf_Rel const *rp) = fn_ELF_R_SYM; | ||
119 | |||
120 | static void fn_ELF_R_INFO(Elf_Rel *const rp, unsigned sym, unsigned type) | ||
121 | { | ||
122 | rp->r_info = _w(ELF_R_INFO(sym, type)); | ||
123 | } | ||
124 | static void (*Elf_r_info)(Elf_Rel *const rp, unsigned sym, unsigned type) = fn_ELF_R_INFO; | ||
125 | |||
126 | /* | ||
127 | * MIPS mcount long call has 2 _mcount symbols, only the position of the 1st | ||
128 | * _mcount symbol is needed for dynamic function tracer, with it, to disable | ||
129 | * tracing(ftrace_make_nop), the instruction in the position is replaced with | ||
130 | * the "b label" instruction, to enable tracing(ftrace_make_call), replace the | ||
131 | * instruction back. So, here, we set the 2nd one as fake and filter it. | ||
132 | * | ||
133 | * c: 3c030000 lui v1,0x0 <--> b label | ||
134 | * c: R_MIPS_HI16 _mcount | ||
135 | * c: R_MIPS_NONE *ABS* | ||
136 | * c: R_MIPS_NONE *ABS* | ||
137 | * 10: 64630000 daddiu v1,v1,0 | ||
138 | * 10: R_MIPS_LO16 _mcount | ||
139 | * 10: R_MIPS_NONE *ABS* | ||
140 | * 10: R_MIPS_NONE *ABS* | ||
141 | * 14: 03e0082d move at,ra | ||
142 | * 18: 0060f809 jalr v1 | ||
143 | * label: | ||
144 | */ | ||
145 | #define MIPS_FAKEMCOUNT_OFFSET 4 | ||
146 | |||
147 | static int MIPS_is_fake_mcount(Elf_Rel const *rp) | ||
148 | { | ||
149 | static Elf_Addr old_r_offset; | ||
150 | Elf_Addr current_r_offset = _w(rp->r_offset); | ||
151 | int is_fake; | ||
152 | |||
153 | is_fake = old_r_offset && | ||
154 | (current_r_offset - old_r_offset == MIPS_FAKEMCOUNT_OFFSET); | ||
155 | old_r_offset = current_r_offset; | ||
156 | |||
157 | return is_fake; | ||
158 | } | ||
159 | |||
160 | /* Append the new shstrtab, Elf_Shdr[], __mcount_loc and its relocations. */ | ||
161 | static void append_func(Elf_Ehdr *const ehdr, | ||
162 | Elf_Shdr *const shstr, | ||
163 | uint_t const *const mloc0, | ||
164 | uint_t const *const mlocp, | ||
165 | Elf_Rel const *const mrel0, | ||
166 | Elf_Rel const *const mrelp, | ||
167 | unsigned int const rel_entsize, | ||
168 | unsigned int const symsec_sh_link) | ||
169 | { | ||
170 | /* Begin constructing output file */ | ||
171 | Elf_Shdr mcsec; | ||
172 | char const *mc_name = (sizeof(Elf_Rela) == rel_entsize) | ||
173 | ? ".rela__mcount_loc" | ||
174 | : ".rel__mcount_loc"; | ||
175 | unsigned const old_shnum = w2(ehdr->e_shnum); | ||
176 | uint_t const old_shoff = _w(ehdr->e_shoff); | ||
177 | uint_t const old_shstr_sh_size = _w(shstr->sh_size); | ||
178 | uint_t const old_shstr_sh_offset = _w(shstr->sh_offset); | ||
179 | uint_t t = 1 + strlen(mc_name) + _w(shstr->sh_size); | ||
180 | uint_t new_e_shoff; | ||
181 | |||
182 | shstr->sh_size = _w(t); | ||
183 | shstr->sh_offset = _w(sb.st_size); | ||
184 | t += sb.st_size; | ||
185 | t += (_align & -t); /* word-byte align */ | ||
186 | new_e_shoff = t; | ||
187 | |||
188 | /* body for new shstrtab */ | ||
189 | ulseek(fd_map, sb.st_size, SEEK_SET); | ||
190 | uwrite(fd_map, old_shstr_sh_offset + (void *)ehdr, old_shstr_sh_size); | ||
191 | uwrite(fd_map, mc_name, 1 + strlen(mc_name)); | ||
192 | |||
193 | /* old(modified) Elf_Shdr table, word-byte aligned */ | ||
194 | ulseek(fd_map, t, SEEK_SET); | ||
195 | t += sizeof(Elf_Shdr) * old_shnum; | ||
196 | uwrite(fd_map, old_shoff + (void *)ehdr, | ||
197 | sizeof(Elf_Shdr) * old_shnum); | ||
198 | |||
199 | /* new sections __mcount_loc and .rel__mcount_loc */ | ||
200 | t += 2*sizeof(mcsec); | ||
201 | mcsec.sh_name = w((sizeof(Elf_Rela) == rel_entsize) + strlen(".rel") | ||
202 | + old_shstr_sh_size); | ||
203 | mcsec.sh_type = w(SHT_PROGBITS); | ||
204 | mcsec.sh_flags = _w(SHF_ALLOC); | ||
205 | mcsec.sh_addr = 0; | ||
206 | mcsec.sh_offset = _w(t); | ||
207 | mcsec.sh_size = _w((void *)mlocp - (void *)mloc0); | ||
208 | mcsec.sh_link = 0; | ||
209 | mcsec.sh_info = 0; | ||
210 | mcsec.sh_addralign = _w(_size); | ||
211 | mcsec.sh_entsize = _w(_size); | ||
212 | uwrite(fd_map, &mcsec, sizeof(mcsec)); | ||
213 | |||
214 | mcsec.sh_name = w(old_shstr_sh_size); | ||
215 | mcsec.sh_type = (sizeof(Elf_Rela) == rel_entsize) | ||
216 | ? w(SHT_RELA) | ||
217 | : w(SHT_REL); | ||
218 | mcsec.sh_flags = 0; | ||
219 | mcsec.sh_addr = 0; | ||
220 | mcsec.sh_offset = _w((void *)mlocp - (void *)mloc0 + t); | ||
221 | mcsec.sh_size = _w((void *)mrelp - (void *)mrel0); | ||
222 | mcsec.sh_link = w(symsec_sh_link); | ||
223 | mcsec.sh_info = w(old_shnum); | ||
224 | mcsec.sh_addralign = _w(_size); | ||
225 | mcsec.sh_entsize = _w(rel_entsize); | ||
226 | uwrite(fd_map, &mcsec, sizeof(mcsec)); | ||
227 | |||
228 | uwrite(fd_map, mloc0, (void *)mlocp - (void *)mloc0); | ||
229 | uwrite(fd_map, mrel0, (void *)mrelp - (void *)mrel0); | ||
230 | |||
231 | ehdr->e_shoff = _w(new_e_shoff); | ||
232 | ehdr->e_shnum = w2(2 + w2(ehdr->e_shnum)); /* {.rel,}__mcount_loc */ | ||
233 | ulseek(fd_map, 0, SEEK_SET); | ||
234 | uwrite(fd_map, ehdr, sizeof(*ehdr)); | ||
235 | } | ||
236 | |||
237 | /* | ||
238 | * Look at the relocations in order to find the calls to mcount. | ||
239 | * Accumulate the section offsets that are found, and their relocation info, | ||
240 | * onto the end of the existing arrays. | ||
241 | */ | ||
242 | static uint_t *sift_rel_mcount(uint_t *mlocp, | ||
243 | unsigned const offbase, | ||
244 | Elf_Rel **const mrelpp, | ||
245 | Elf_Shdr const *const relhdr, | ||
246 | Elf_Ehdr const *const ehdr, | ||
247 | unsigned const recsym, | ||
248 | uint_t const recval, | ||
249 | unsigned const reltype) | ||
250 | { | ||
251 | uint_t *const mloc0 = mlocp; | ||
252 | Elf_Rel *mrelp = *mrelpp; | ||
253 | Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff) | ||
254 | + (void *)ehdr); | ||
255 | unsigned const symsec_sh_link = w(relhdr->sh_link); | ||
256 | Elf_Shdr const *const symsec = &shdr0[symsec_sh_link]; | ||
257 | Elf_Sym const *const sym0 = (Elf_Sym const *)(_w(symsec->sh_offset) | ||
258 | + (void *)ehdr); | ||
259 | |||
260 | Elf_Shdr const *const strsec = &shdr0[w(symsec->sh_link)]; | ||
261 | char const *const str0 = (char const *)(_w(strsec->sh_offset) | ||
262 | + (void *)ehdr); | ||
263 | |||
264 | Elf_Rel const *const rel0 = (Elf_Rel const *)(_w(relhdr->sh_offset) | ||
265 | + (void *)ehdr); | ||
266 | unsigned rel_entsize = _w(relhdr->sh_entsize); | ||
267 | unsigned const nrel = _w(relhdr->sh_size) / rel_entsize; | ||
268 | Elf_Rel const *relp = rel0; | ||
269 | |||
270 | unsigned mcountsym = 0; | ||
271 | unsigned t; | ||
272 | |||
273 | for (t = nrel; t; --t) { | ||
274 | if (!mcountsym) { | ||
275 | Elf_Sym const *const symp = | ||
276 | &sym0[Elf_r_sym(relp)]; | ||
277 | char const *symname = &str0[w(symp->st_name)]; | ||
278 | char const *mcount = '_' == gpfx ? "_mcount" : "mcount"; | ||
279 | |||
280 | if ('.' == symname[0]) | ||
281 | ++symname; /* ppc64 hack */ | ||
282 | if (0 == strcmp(mcount, symname) || | ||
283 | (altmcount && 0 == strcmp(altmcount, symname))) | ||
284 | mcountsym = Elf_r_sym(relp); | ||
285 | } | ||
286 | |||
287 | if (mcountsym == Elf_r_sym(relp) && !is_fake_mcount(relp)) { | ||
288 | uint_t const addend = _w(_w(relp->r_offset) - recval); | ||
289 | |||
290 | mrelp->r_offset = _w(offbase | ||
291 | + ((void *)mlocp - (void *)mloc0)); | ||
292 | Elf_r_info(mrelp, recsym, reltype); | ||
293 | if (sizeof(Elf_Rela) == rel_entsize) { | ||
294 | ((Elf_Rela *)mrelp)->r_addend = addend; | ||
295 | *mlocp++ = 0; | ||
296 | } else | ||
297 | *mlocp++ = addend; | ||
298 | |||
299 | mrelp = (Elf_Rel *)(rel_entsize + (void *)mrelp); | ||
300 | } | ||
301 | relp = (Elf_Rel const *)(rel_entsize + (void *)relp); | ||
302 | } | ||
303 | *mrelpp = mrelp; | ||
304 | return mlocp; | ||
305 | } | ||
306 | |||
307 | |||
308 | /* | ||
309 | * Find a symbol in the given section, to be used as the base for relocating | ||
310 | * the table of offsets of calls to mcount. A local or global symbol suffices, | ||
311 | * but avoid a Weak symbol because it may be overridden; the change in value | ||
312 | * would invalidate the relocations of the offsets of the calls to mcount. | ||
313 | * Often the found symbol will be the unnamed local symbol generated by | ||
314 | * GNU 'as' for the start of each section. For example: | ||
315 | * Num: Value Size Type Bind Vis Ndx Name | ||
316 | * 2: 00000000 0 SECTION LOCAL DEFAULT 1 | ||
317 | */ | ||
318 | static unsigned find_secsym_ndx(unsigned const txtndx, | ||
319 | char const *const txtname, | ||
320 | uint_t *const recvalp, | ||
321 | Elf_Shdr const *const symhdr, | ||
322 | Elf_Ehdr const *const ehdr) | ||
323 | { | ||
324 | Elf_Sym const *const sym0 = (Elf_Sym const *)(_w(symhdr->sh_offset) | ||
325 | + (void *)ehdr); | ||
326 | unsigned const nsym = _w(symhdr->sh_size) / _w(symhdr->sh_entsize); | ||
327 | Elf_Sym const *symp; | ||
328 | unsigned t; | ||
329 | |||
330 | for (symp = sym0, t = nsym; t; --t, ++symp) { | ||
331 | unsigned int const st_bind = ELF_ST_BIND(symp->st_info); | ||
332 | |||
333 | if (txtndx == w2(symp->st_shndx) | ||
334 | /* avoid STB_WEAK */ | ||
335 | && (STB_LOCAL == st_bind || STB_GLOBAL == st_bind)) { | ||
336 | *recvalp = _w(symp->st_value); | ||
337 | return symp - sym0; | ||
338 | } | ||
339 | } | ||
340 | fprintf(stderr, "Cannot find symbol for section %d: %s.\n", | ||
341 | txtndx, txtname); | ||
342 | fail_file(); | ||
343 | } | ||
344 | |||
345 | |||
346 | /* Evade ISO C restriction: no declaration after statement in has_rel_mcount. */ | ||
347 | static char const * | ||
348 | __has_rel_mcount(Elf_Shdr const *const relhdr, /* is SHT_REL or SHT_RELA */ | ||
349 | Elf_Shdr const *const shdr0, | ||
350 | char const *const shstrtab, | ||
351 | char const *const fname) | ||
352 | { | ||
353 | /* .sh_info depends on .sh_type == SHT_REL[,A] */ | ||
354 | Elf_Shdr const *const txthdr = &shdr0[w(relhdr->sh_info)]; | ||
355 | char const *const txtname = &shstrtab[w(txthdr->sh_name)]; | ||
356 | |||
357 | if (0 == strcmp("__mcount_loc", txtname)) { | ||
358 | fprintf(stderr, "warning: __mcount_loc already exists: %s\n", | ||
359 | fname); | ||
360 | succeed_file(); | ||
361 | } | ||
362 | if (SHT_PROGBITS != w(txthdr->sh_type) || | ||
363 | !is_mcounted_section_name(txtname)) | ||
364 | return NULL; | ||
365 | return txtname; | ||
366 | } | ||
367 | |||
368 | static char const *has_rel_mcount(Elf_Shdr const *const relhdr, | ||
369 | Elf_Shdr const *const shdr0, | ||
370 | char const *const shstrtab, | ||
371 | char const *const fname) | ||
372 | { | ||
373 | if (SHT_REL != w(relhdr->sh_type) && SHT_RELA != w(relhdr->sh_type)) | ||
374 | return NULL; | ||
375 | return __has_rel_mcount(relhdr, shdr0, shstrtab, fname); | ||
376 | } | ||
377 | |||
378 | |||
379 | static unsigned tot_relsize(Elf_Shdr const *const shdr0, | ||
380 | unsigned nhdr, | ||
381 | const char *const shstrtab, | ||
382 | const char *const fname) | ||
383 | { | ||
384 | unsigned totrelsz = 0; | ||
385 | Elf_Shdr const *shdrp = shdr0; | ||
386 | |||
387 | for (; nhdr; --nhdr, ++shdrp) { | ||
388 | if (has_rel_mcount(shdrp, shdr0, shstrtab, fname)) | ||
389 | totrelsz += _w(shdrp->sh_size); | ||
390 | } | ||
391 | return totrelsz; | ||
392 | } | ||
393 | |||
394 | |||
395 | /* Overall supervision for Elf32 ET_REL file. */ | ||
396 | static void | ||
397 | do_func(Elf_Ehdr *const ehdr, char const *const fname, unsigned const reltype) | ||
398 | { | ||
399 | Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff) | ||
400 | + (void *)ehdr); | ||
401 | unsigned const nhdr = w2(ehdr->e_shnum); | ||
402 | Elf_Shdr *const shstr = &shdr0[w2(ehdr->e_shstrndx)]; | ||
403 | char const *const shstrtab = (char const *)(_w(shstr->sh_offset) | ||
404 | + (void *)ehdr); | ||
405 | |||
406 | Elf_Shdr const *relhdr; | ||
407 | unsigned k; | ||
408 | |||
409 | /* Upper bound on space: assume all relevant relocs are for mcount. */ | ||
410 | unsigned const totrelsz = tot_relsize(shdr0, nhdr, shstrtab, fname); | ||
411 | Elf_Rel *const mrel0 = umalloc(totrelsz); | ||
412 | Elf_Rel * mrelp = mrel0; | ||
413 | |||
414 | /* 2*sizeof(address) <= sizeof(Elf_Rel) */ | ||
415 | uint_t *const mloc0 = umalloc(totrelsz>>1); | ||
416 | uint_t * mlocp = mloc0; | ||
417 | |||
418 | unsigned rel_entsize = 0; | ||
419 | unsigned symsec_sh_link = 0; | ||
420 | |||
421 | for (relhdr = shdr0, k = nhdr; k; --k, ++relhdr) { | ||
422 | char const *const txtname = has_rel_mcount(relhdr, shdr0, | ||
423 | shstrtab, fname); | ||
424 | if (txtname) { | ||
425 | uint_t recval = 0; | ||
426 | unsigned const recsym = find_secsym_ndx( | ||
427 | w(relhdr->sh_info), txtname, &recval, | ||
428 | &shdr0[symsec_sh_link = w(relhdr->sh_link)], | ||
429 | ehdr); | ||
430 | |||
431 | rel_entsize = _w(relhdr->sh_entsize); | ||
432 | mlocp = sift_rel_mcount(mlocp, | ||
433 | (void *)mlocp - (void *)mloc0, &mrelp, | ||
434 | relhdr, ehdr, recsym, recval, reltype); | ||
435 | } | ||
436 | } | ||
437 | if (mloc0 != mlocp) { | ||
438 | append_func(ehdr, shstr, mloc0, mlocp, mrel0, mrelp, | ||
439 | rel_entsize, symsec_sh_link); | ||
440 | } | ||
441 | free(mrel0); | ||
442 | free(mloc0); | ||
443 | } | ||
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index ea6f6e3adae..1d7963f4ee7 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl | |||
@@ -136,13 +136,14 @@ my %text_sections = ( | |||
136 | ".text.unlikely" => 1, | 136 | ".text.unlikely" => 1, |
137 | ); | 137 | ); |
138 | 138 | ||
139 | $objdump = "objdump" if ((length $objdump) == 0); | 139 | # Note: we are nice to C-programmers here, thus we skip the '||='-idiom. |
140 | $objcopy = "objcopy" if ((length $objcopy) == 0); | 140 | $objdump = 'objdump' if (!$objdump); |
141 | $cc = "gcc" if ((length $cc) == 0); | 141 | $objcopy = 'objcopy' if (!$objcopy); |
142 | $ld = "ld" if ((length $ld) == 0); | 142 | $cc = 'gcc' if (!$cc); |
143 | $nm = "nm" if ((length $nm) == 0); | 143 | $ld = 'ld' if (!$ld); |
144 | $rm = "rm" if ((length $rm) == 0); | 144 | $nm = 'nm' if (!$nm); |
145 | $mv = "mv" if ((length $mv) == 0); | 145 | $rm = 'rm' if (!$rm); |
146 | $mv = 'mv' if (!$mv); | ||
146 | 147 | ||
147 | #print STDERR "running: $P '$arch' '$objdump' '$objcopy' '$cc' '$ld' " . | 148 | #print STDERR "running: $P '$arch' '$objdump' '$objcopy' '$cc' '$ld' " . |
148 | # "'$nm' '$rm' '$mv' '$inputfile'\n"; | 149 | # "'$nm' '$rm' '$mv' '$inputfile'\n"; |
@@ -158,6 +159,7 @@ my $section_regex; # Find the start of a section | |||
158 | my $function_regex; # Find the name of a function | 159 | my $function_regex; # Find the name of a function |
159 | # (return offset and func name) | 160 | # (return offset and func name) |
160 | my $mcount_regex; # Find the call site to mcount (return offset) | 161 | my $mcount_regex; # Find the call site to mcount (return offset) |
162 | my $mcount_adjust; # Address adjustment to mcount offset | ||
161 | my $alignment; # The .align value to use for $mcount_section | 163 | my $alignment; # The .align value to use for $mcount_section |
162 | my $section_type; # Section header plus possible alignment command | 164 | my $section_type; # Section header plus possible alignment command |
163 | my $can_use_local = 0; # If we can use local function references | 165 | my $can_use_local = 0; # If we can use local function references |
@@ -212,6 +214,7 @@ $section_regex = "Disassembly of section\\s+(\\S+):"; | |||
212 | $function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:"; | 214 | $function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:"; |
213 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$"; | 215 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$"; |
214 | $section_type = '@progbits'; | 216 | $section_type = '@progbits'; |
217 | $mcount_adjust = 0; | ||
215 | $type = ".long"; | 218 | $type = ".long"; |
216 | 219 | ||
217 | if ($arch eq "x86_64") { | 220 | if ($arch eq "x86_64") { |
@@ -267,6 +270,8 @@ if ($arch eq "x86_64") { | |||
267 | } elsif ($arch eq "arm") { | 270 | } elsif ($arch eq "arm") { |
268 | $alignment = 2; | 271 | $alignment = 2; |
269 | $section_type = '%progbits'; | 272 | $section_type = '%progbits'; |
273 | $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_ARM_(CALL|PC24|THM_CALL)" . | ||
274 | "\\s+(__gnu_mcount_nc|mcount)\$"; | ||
270 | 275 | ||
271 | } elsif ($arch eq "ia64") { | 276 | } elsif ($arch eq "ia64") { |
272 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; | 277 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; |
@@ -325,7 +330,7 @@ if ($arch eq "x86_64") { | |||
325 | # 14: R_MIPS_NONE *ABS* | 330 | # 14: R_MIPS_NONE *ABS* |
326 | # 18: 00020021 nop | 331 | # 18: 00020021 nop |
327 | if ($is_module eq "0") { | 332 | if ($is_module eq "0") { |
328 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; | 333 | $mcount_regex = "^\\s*([0-9a-fA-F]+): R_MIPS_26\\s+_mcount\$"; |
329 | } else { | 334 | } else { |
330 | $mcount_regex = "^\\s*([0-9a-fA-F]+): R_MIPS_HI16\\s+_mcount\$"; | 335 | $mcount_regex = "^\\s*([0-9a-fA-F]+): R_MIPS_HI16\\s+_mcount\$"; |
331 | } | 336 | } |
@@ -350,6 +355,9 @@ if ($arch eq "x86_64") { | |||
350 | } elsif ($arch eq "microblaze") { | 355 | } elsif ($arch eq "microblaze") { |
351 | # Microblaze calls '_mcount' instead of plain 'mcount'. | 356 | # Microblaze calls '_mcount' instead of plain 'mcount'. |
352 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; | 357 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; |
358 | } elsif ($arch eq "blackfin") { | ||
359 | $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$"; | ||
360 | $mcount_adjust = -4; | ||
353 | } else { | 361 | } else { |
354 | die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD"; | 362 | die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD"; |
355 | } | 363 | } |
@@ -432,14 +440,14 @@ sub update_funcs | |||
432 | 440 | ||
433 | # Loop through all the mcount caller offsets and print a reference | 441 | # Loop through all the mcount caller offsets and print a reference |
434 | # to the caller based from the ref_func. | 442 | # to the caller based from the ref_func. |
435 | for (my $i=0; $i <= $#offsets; $i++) { | 443 | if (!$opened) { |
436 | if (!$opened) { | 444 | open(FILE, ">$mcount_s") || die "can't create $mcount_s\n"; |
437 | open(FILE, ">$mcount_s") || die "can't create $mcount_s\n"; | 445 | $opened = 1; |
438 | $opened = 1; | 446 | print FILE "\t.section $mcount_section,\"a\",$section_type\n"; |
439 | print FILE "\t.section $mcount_section,\"a\",$section_type\n"; | 447 | print FILE "\t.align $alignment\n" if (defined($alignment)); |
440 | print FILE "\t.align $alignment\n" if (defined($alignment)); | 448 | } |
441 | } | 449 | foreach my $cur_offset (@offsets) { |
442 | printf FILE "\t%s %s + %d\n", $type, $ref_func, $offsets[$i] - $offset; | 450 | printf FILE "\t%s %s + %d\n", $type, $ref_func, $cur_offset - $offset; |
443 | } | 451 | } |
444 | } | 452 | } |
445 | 453 | ||
@@ -476,11 +484,7 @@ while (<IN>) { | |||
476 | $read_headers = 0; | 484 | $read_headers = 0; |
477 | 485 | ||
478 | # Only record text sections that we know are safe | 486 | # Only record text sections that we know are safe |
479 | if (defined($text_sections{$1})) { | 487 | $read_function = defined($text_sections{$1}); |
480 | $read_function = 1; | ||
481 | } else { | ||
482 | $read_function = 0; | ||
483 | } | ||
484 | # print out any recorded offsets | 488 | # print out any recorded offsets |
485 | update_funcs(); | 489 | update_funcs(); |
486 | 490 | ||
@@ -514,7 +518,7 @@ while (<IN>) { | |||
514 | } | 518 | } |
515 | # is this a call site to mcount? If so, record it to print later | 519 | # is this a call site to mcount? If so, record it to print later |
516 | if ($text_found && /$mcount_regex/) { | 520 | if ($text_found && /$mcount_regex/) { |
517 | $offsets[$#offsets + 1] = hex $1; | 521 | push(@offsets, (hex $1) + $mcount_adjust); |
518 | } | 522 | } |
519 | } | 523 | } |
520 | 524 | ||
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c index 24626968055..58a12c27870 100644 --- a/scripts/selinux/genheaders/genheaders.c +++ b/scripts/selinux/genheaders/genheaders.c | |||
@@ -81,7 +81,7 @@ int main(int argc, char *argv[]) | |||
81 | fprintf(fout, "\n"); | 81 | fprintf(fout, "\n"); |
82 | 82 | ||
83 | for (i = 1; i < isids_len; i++) { | 83 | for (i = 1; i < isids_len; i++) { |
84 | char *s = initial_sid_to_string[i]; | 84 | const char *s = initial_sid_to_string[i]; |
85 | fprintf(fout, "#define SECINITSID_%s", s); | 85 | fprintf(fout, "#define SECINITSID_%s", s); |
86 | for (j = 0; j < max(1, 40 - strlen(s)); j++) | 86 | for (j = 0; j < max(1, 40 - strlen(s)); j++) |
87 | fprintf(fout, " "); | 87 | fprintf(fout, " "); |
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 46989b88d73..ef8729f4858 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion | |||
@@ -10,73 +10,164 @@ | |||
10 | # | 10 | # |
11 | 11 | ||
12 | usage() { | 12 | usage() { |
13 | echo "Usage: $0 [srctree]" >&2 | 13 | echo "Usage: $0 [--save-scmversion] [srctree]" >&2 |
14 | exit 1 | 14 | exit 1 |
15 | } | 15 | } |
16 | 16 | ||
17 | cd "${1:-.}" || usage | 17 | scm_only=false |
18 | srctree=. | ||
19 | if test "$1" = "--save-scmversion"; then | ||
20 | scm_only=true | ||
21 | shift | ||
22 | fi | ||
23 | if test $# -gt 0; then | ||
24 | srctree=$1 | ||
25 | shift | ||
26 | fi | ||
27 | if test $# -gt 0 -o ! -d "$srctree"; then | ||
28 | usage | ||
29 | fi | ||
18 | 30 | ||
19 | # Check for git and a git repo. | 31 | scm_version() |
20 | if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then | 32 | { |
33 | local short | ||
34 | short=false | ||
21 | 35 | ||
22 | # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it, | 36 | cd "$srctree" |
23 | # because this version is defined in the top level Makefile. | 37 | if test -e .scmversion; then |
24 | if [ -z "`git describe --exact-match 2>/dev/null`" ]; then | 38 | cat .scmversion |
39 | return | ||
40 | fi | ||
41 | if test "$1" = "--short"; then | ||
42 | short=true | ||
43 | fi | ||
25 | 44 | ||
26 | # If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"), | 45 | # Check for git and a git repo. |
27 | # we pretty print it. | 46 | if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then |
28 | if atag="`git describe 2>/dev/null`"; then | 47 | |
29 | echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' | 48 | # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore |
49 | # it, because this version is defined in the top level Makefile. | ||
50 | if [ -z "`git describe --exact-match 2>/dev/null`" ]; then | ||
51 | |||
52 | # If only the short version is requested, don't bother | ||
53 | # running further git commands | ||
54 | if $short; then | ||
55 | echo "+" | ||
56 | return | ||
57 | fi | ||
58 | # If we are past a tagged commit (like | ||
59 | # "v2.6.30-rc5-302-g72357d5"), we pretty print it. | ||
60 | if atag="`git describe 2>/dev/null`"; then | ||
61 | echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' | ||
62 | |||
63 | # If we don't have a tag at all we print -g{commitish}. | ||
64 | else | ||
65 | printf '%s%s' -g $head | ||
66 | fi | ||
67 | fi | ||
30 | 68 | ||
31 | # If we don't have a tag at all we print -g{commitish}. | 69 | # Is this git on svn? |
32 | else | 70 | if git config --get svn-remote.svn.url >/dev/null; then |
33 | printf '%s%s' -g $head | 71 | printf -- '-svn%s' "`git svn find-rev $head`" |
34 | fi | 72 | fi |
35 | fi | ||
36 | 73 | ||
37 | # Is this git on svn? | 74 | # Update index only on r/w media |
38 | if git config --get svn-remote.svn.url >/dev/null; then | 75 | [ -w . ] && git update-index --refresh --unmerged > /dev/null |
39 | printf -- '-svn%s' "`git svn find-rev $head`" | ||
40 | fi | ||
41 | 76 | ||
42 | # Update index only on r/w media | 77 | # Check for uncommitted changes |
43 | [ -w . ] && git update-index --refresh --unmerged > /dev/null | 78 | if git diff-index --name-only HEAD | grep -v "^scripts/package" \ |
79 | | read dummy; then | ||
80 | printf '%s' -dirty | ||
81 | fi | ||
44 | 82 | ||
45 | # Check for uncommitted changes | 83 | # All done with git |
46 | if git diff-index --name-only HEAD | grep -v "^scripts/package" \ | 84 | return |
47 | | read dummy; then | ||
48 | printf '%s' -dirty | ||
49 | fi | 85 | fi |
50 | 86 | ||
51 | # All done with git | 87 | # Check for mercurial and a mercurial repo. |
52 | exit | 88 | if test -d .hg && hgid=`hg id 2>/dev/null`; then |
53 | fi | 89 | tag=`printf '%s' "$hgid" | cut -s -d' ' -f2` |
54 | 90 | ||
55 | # Check for mercurial and a mercurial repo. | 91 | # Do we have an untagged version? |
56 | if hgid=`hg id 2>/dev/null`; then | 92 | if [ -z "$tag" -o "$tag" = tip ]; then |
57 | tag=`printf '%s' "$hgid" | cut -d' ' -f2` | 93 | id=`printf '%s' "$hgid" | sed 's/[+ ].*//'` |
94 | printf '%s%s' -hg "$id" | ||
95 | fi | ||
96 | |||
97 | # Are there uncommitted changes? | ||
98 | # These are represented by + after the changeset id. | ||
99 | case "$hgid" in | ||
100 | *+|*+\ *) printf '%s' -dirty ;; | ||
101 | esac | ||
58 | 102 | ||
59 | # Do we have an untagged version? | 103 | # All done with mercurial |
60 | if [ -z "$tag" -o "$tag" = tip ]; then | 104 | return |
61 | id=`printf '%s' "$hgid" | sed 's/[+ ].*//'` | ||
62 | printf '%s%s' -hg "$id" | ||
63 | fi | 105 | fi |
64 | 106 | ||
65 | # Are there uncommitted changes? | 107 | # Check for svn and a svn repo. |
66 | # These are represented by + after the changeset id. | 108 | if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then |
67 | case "$hgid" in | 109 | rev=`echo $rev | awk '{print $NF}'` |
68 | *+|*+\ *) printf '%s' -dirty ;; | 110 | printf -- '-svn%s' "$rev" |
69 | esac | ||
70 | 111 | ||
71 | # All done with mercurial | 112 | # All done with svn |
113 | return | ||
114 | fi | ||
115 | } | ||
116 | |||
117 | collect_files() | ||
118 | { | ||
119 | local file res | ||
120 | |||
121 | for file; do | ||
122 | case "$file" in | ||
123 | *\~*) | ||
124 | continue | ||
125 | ;; | ||
126 | esac | ||
127 | if test -e "$file"; then | ||
128 | res="$res$(cat "$file")" | ||
129 | fi | ||
130 | done | ||
131 | echo "$res" | ||
132 | } | ||
133 | |||
134 | if $scm_only; then | ||
135 | if test ! -e .scmversion; then | ||
136 | res=$(scm_version) | ||
137 | echo "$res" >.scmversion | ||
138 | fi | ||
72 | exit | 139 | exit |
73 | fi | 140 | fi |
74 | 141 | ||
75 | # Check for svn and a svn repo. | 142 | if test -e include/config/auto.conf; then |
76 | if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then | 143 | . include/config/auto.conf |
77 | rev=`echo $rev | awk '{print $NF}'` | 144 | else |
78 | printf -- '-svn%s' "$rev" | 145 | echo "Error: kernelrelease not valid - run 'make prepare' to update it" |
146 | exit 1 | ||
147 | fi | ||
79 | 148 | ||
80 | # All done with svn | 149 | # localversion* files in the build and source directory |
81 | exit | 150 | res="$(collect_files localversion*)" |
151 | if test ! "$srctree" -ef .; then | ||
152 | res="$res$(collect_files "$srctree"/localversion*)" | ||
153 | fi | ||
154 | |||
155 | # CONFIG_LOCALVERSION and LOCALVERSION (if set) | ||
156 | res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}" | ||
157 | |||
158 | # scm version string if not at a tagged commit | ||
159 | if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then | ||
160 | # full scm version string | ||
161 | res="$res$(scm_version)" | ||
162 | else | ||
163 | # append a plus sign if the repository is not in a clean | ||
164 | # annotated or signed tagged state (as git describe only | ||
165 | # looks at signed or annotated tags - git tag -a/-s) and | ||
166 | # LOCALVERSION= is not specified | ||
167 | if test "${LOCALVERSION+set}" != "set"; then | ||
168 | scm=$(scm_version --short) | ||
169 | res="$res${scm:++}" | ||
170 | fi | ||
82 | fi | 171 | fi |
172 | |||
173 | echo "$res" | ||
diff --git a/scripts/tags.sh b/scripts/tags.sh index 8509bb51293..92fdc454614 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh | |||
@@ -123,9 +123,11 @@ exuberant() | |||
123 | -I ____cacheline_internodealigned_in_smp \ | 123 | -I ____cacheline_internodealigned_in_smp \ |
124 | -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \ | 124 | -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \ |
125 | -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \ | 125 | -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \ |
126 | --extra=+f --c-kinds=-px \ | 126 | --extra=+f --c-kinds=+px \ |
127 | --regex-asm='/^ENTRY\(([^)]*)\).*/\1/' \ | 127 | --regex-asm='/^ENTRY\(([^)]*)\).*/\1/' \ |
128 | --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' | 128 | --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \ |
129 | --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/' \ | ||
130 | --regex-c++='/^DEFINE_EVENT\(([^,)]*).*/trace_\1/' | ||
129 | 131 | ||
130 | all_kconfigs | xargs $1 -a \ | 132 | all_kconfigs | xargs $1 -a \ |
131 | --langdef=kconfig --language-force=kconfig \ | 133 | --langdef=kconfig --language-force=kconfig \ |
diff --git a/scripts/xz_wrap.sh b/scripts/xz_wrap.sh new file mode 100644 index 00000000000..17a5798c29d --- /dev/null +++ b/scripts/xz_wrap.sh | |||
@@ -0,0 +1,23 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # This is a wrapper for xz to compress the kernel image using appropriate | ||
4 | # compression options depending on the architecture. | ||
5 | # | ||
6 | # Author: Lasse Collin <lasse.collin@tukaani.org> | ||
7 | # | ||
8 | # This file has been put into the public domain. | ||
9 | # You can do whatever you want with this file. | ||
10 | # | ||
11 | |||
12 | BCJ= | ||
13 | LZMA2OPTS= | ||
14 | |||
15 | case $ARCH in | ||
16 | x86|x86_64) BCJ=--x86 ;; | ||
17 | powerpc) BCJ=--powerpc ;; | ||
18 | ia64) BCJ=--ia64; LZMA2OPTS=pb=4 ;; | ||
19 | arm) BCJ=--arm ;; | ||
20 | sparc) BCJ=--sparc ;; | ||
21 | esac | ||
22 | |||
23 | exec xz --check=crc32 $BCJ --lzma2=$LZMA2OPTS,dict=32MiB | ||