Changeset 147a066 in mainline

Timestamp:

2016-05-10T06:32:18Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2889634

Parents:

7ba16eb

Message:

Generate dependency rules between autogenerated headers automatically

Files:

• kernel/Makefile (modified) (5 diffs)
• kernel/genarch/Makefile.inc (modified) (1 diff)
• kernel/genarch/include/genarch/multiboot/multiboot_memmap_struct.ag (modified) (1 diff)
• tools/autogen.py (modified) (2 diffs)

kernel/Makefile

@@ -48 +48 @@
 #
 
+AGDEPEND = Makefile.ag.depend
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
@@ -138 +139 @@
 -include genarch/Makefile.inc
 -include $(DEPEND)
+-include $(AGDEPEND)
 
 ## The at-sign
@@ -385 +387 @@
 ARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(ARCH_AUTOGENS_AG)))
 
+AUTOGENS_H := $(ARCH_AUTOGENS_H) $(GENARCH_AUTOGENS_H)
+AUTOGENS_AG := $(ARCH_AUTOGENS_AG) $(GENARCH_AUTOGENS_AG)
+
 LFLAGS_LTO := $(addprefix -Xlinker ,$(LFLAGS))
 
@@ -464 +469 @@
         $(GENMAP) $(MAP_PREV) $(DUMP) $@
 
-$(DEPEND): $(COMMON_HEADER_ARCH) $(ARCH_AUTOGENS_H) $(GENARCH_AUTOGENS_H)
+$(AUTOGENS_H): $(AGDEPEND)
+
+$(AGDEPEND): $(AUTOGENS_AG)
+        touch $@
+        for g in $?; do \
+                h=`dirname $$g`/`basename $$g .ag`.h; \
+                for l in `$(AUTOGEN) depend $$g`; do \
+                        echo "$$h: $$l" >>$@; \
+                done \
+        done
+
+$(DEPEND): $(COMMON_HEADER_ARCH) $(AUTOGENS_H)
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
@@ -474 +490 @@
         -rm $(ARCH_AUTOGENS_H) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)
         -rm $(GENARCH_AUTOGENS_H) $(GENARCH_AUTOGENS_PROBE_C) $(GENARCH_AUTOGENS_PROBE_S)
+        -rm $(AGDEPEND)

kernel/genarch/Makefile.inc

@@ -178 +178 @@
         genarch/include/genarch/multiboot/multiboot_memmap_struct.ag \
         genarch/include/genarch/multiboot/multiboot_info_struct.ag 
-
-#
-# Currently there is no automated way to describe dependencies between two autogenerated headers,
-# so we need to do it manually
-genarch/include/genarch/multiboot/multiboot_memmap_struct.h: arch/$(KARCH)/include/arch/boot/memmap_struct.h
-
 endif
 

kernel/genarch/include/genarch/multiboot/multiboot_memmap_struct.ag

@@ -35 +35 @@
                 },
                 {
-                        include : <arch/boot/memmap_struct.h>
+                        include : <arch/boot/memmap_struct.h>,
+                        depends: arch/$(KARCH)/include/arch/boot/memmap_struct.h,
                 }
         ],

tools/autogen.py

@@ -34 +34 @@
 def usage():
         print("%s - Automated structure and offsets generator" % sys.argv[0])
-        print("%s file.ag probe|generate struct.ag" % sys.argv[0])
+        print("%s file.ag depend|probe|generate struct.ag" % sys.argv[0])
         sys.exit()
+
+def depend(struct):
+        deps = ""
+        for include in struct['includes']:
+                if 'depends' in include.keys():
+                        deps = deps + include['depends'] + "\n"
+        return deps.strip()
 
 def generate_includes(struct):
@@ -160 +167 @@
                 struct = yaml.load(fp)
 
-        if sys.argv[1] == "probe":
+        if sys.argv[1] == "depend":
+                deps = depend(struct)
+                print(deps)
+        elif sys.argv[1] == "probe":
                 code = probe(struct)
                 print(code)