From patchwork Tue Jun 10 11:08:11 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Paolo Bonzini <pbonzini@redhat.com>
X-Patchwork-Id: 357857
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by ozlabs.org (Postfix) with ESMTPS id 31433140082
	for <incoming@patchwork.ozlabs.org>;
	Tue, 10 Jun 2014 21:09:38 +1000 (EST)
Received: from localhost ([::1]:38291 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)
	id 1WuJvs-0006x0-2G
	for incoming@patchwork.ozlabs.org; Tue, 10 Jun 2014 07:09:36 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40290)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1WuJui-0005f2-PI
	for qemu-devel@nongnu.org; Tue, 10 Jun 2014 07:08:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1WuJub-0006uC-T9
	for qemu-devel@nongnu.org; Tue, 10 Jun 2014 07:08:24 -0400
Received: from mail-wg0-x22d.google.com ([2a00:1450:400c:c00::22d]:37531)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1WuJub-0006u0-Iv
	for qemu-devel@nongnu.org; Tue, 10 Jun 2014 07:08:17 -0400
Received: by mail-wg0-f45.google.com with SMTP id l18so1260653wgh.4
	for <qemu-devel@nongnu.org>; Tue, 10 Jun 2014 04:08:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=sender:from:to:cc:subject:date:message-id:in-reply-to:references
	:mime-version:content-type:content-transfer-encoding;
	bh=peQu95Gco2rGiYiGZMgdQl5Cc6n//+WGnfyT7uvJumk=;
	b=dzFh7c1iQTBH+pnNQkG83GvN3cpMVXQKBpNOrFZcVgah8m2O0j1UfS/UIpyqBRSXXk
	6lJMlwASiSPOabvUlmRGgQcGUpRijWLtYgFQAmqkEFr2cVWtwKkylRDYT/ZGe4kN4Gka
	9RdHOCf1z4J2oWm2pXPlu5T2ZundwrsDCJpSEd4H8YY9ZetUu3uAgjmeJH3n+Sv++eH2
	p7SxfCwCo6kX6bvL0yHkgW7sgwBcFyM1+7v5K5pjMde9VZBG8Jmwo6ke09BW/bsig7HM
	fFtt6SoCHkpmpwoli1MnKO00cyQI5/N+krRdDmhFOr7NrPYIejXJQ8OeD4/TUPmOtOhr
	jiBQ==
X-Received: by 10.194.92.148 with SMTP id cm20mr38716554wjb.53.1402398496857;
	Tue, 10 Jun 2014 04:08:16 -0700 (PDT)
Received: from playground.station (net-37-117-132-7.cust.vodafonedsl.it.
	[37.117.132.7]) by mx.google.com with ESMTPSA id
	gb6sm20169018wic.6.2014.06.10.04.08.15 for <multiple recipients>
	(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Tue, 10 Jun 2014 04:08:16 -0700 (PDT)
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Date: Tue, 10 Jun 2014 13:08:11 +0200
Message-Id: <1402398491-19097-2-git-send-email-pbonzini@redhat.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1402398491-19097-1-git-send-email-pbonzini@redhat.com>
References: <1402398491-19097-1-git-send-email-pbonzini@redhat.com>
MIME-Version: 1.0
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-Received-From: 2a00:1450:400c:c00::22d
Cc: Fam Zheng <famz@redhat.com>
Subject: [Qemu-devel] [PULL v2 8/8] rules.mak: Rewrite unnest-vars
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org

From: Fam Zheng <famz@redhat.com>

The macro unnest-vars is the most important, complicated but hard to
track magic in QEMU's build system.

Rewrite it in a (hopefully) clearer way, with more comments, to make it
easier to understand and maintain.

Remove DSO_CFLAGS and module-objs-m that are not used.

A bonus fix of this version is, per object variables are properly
protected in save-objs and load-objs, before including sub-dir
Makefile.objs, just as nested variables are. So the occasional same
object name from different directory levels won't step on each other's
foot.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 rules.mak | 237 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 158 insertions(+), 79 deletions(-)

diff --git a/rules.mak b/rules.mak
index b12d312..5598d3f 100644
--- a/rules.mak
+++ b/rules.mak
@@ -22,9 +22,7 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
 # Same as -I$(SRC_PATH) -I., but for the nested source/object directories
 QEMU_INCLUDES += -I$(<D) -I$(@D)
 
-maybe-add = $(filter-out $1, $2) $1
-extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs))) \
-                  $(foreach o,$(call expand-objs,$1),$($o-libs)))
+extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs))))
 expand-objs = $(strip $(sort $(filter %.o,$1)) \
                   $(foreach o,$(filter %.mo,$1),$($o-objs)) \
                   $(filter-out %.o %.mo,$1))
@@ -39,9 +37,8 @@ expand-objs = $(strip $(sort $(filter %.o,$1)) \
 LINKPROG = $(or $(CXX),$(CC))
 
 ifeq ($(LIBTOOL),)
-LINK = $(call quiet-command,$(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
-       $(call expand-objs,$1) $(version-obj-y) \
-       $(call extract-libs,$1) $(LIBS),"  LINK  $(TARGET_DIR)$@")
+LINK = $(call quiet-command, $(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+       $1 $(version-obj-y) $(call extract-libs,$1) $(LIBS),"  LINK  $(TARGET_DIR)$@")
 else
 LIBTOOL += $(if $(V),,--quiet)
 %.lo: %.c
@@ -53,8 +50,7 @@ LIBTOOL += $(if $(V),,--quiet)
 
 LINK = $(call quiet-command,\
        $(if $(filter %.lo %.la,$1),$(LIBTOOL) --mode=link --tag=CC \
-       )$(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
-       $(call expand-objs,$1) \
+       )$(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $1 \
        $(if $(filter %.lo %.la,$1),$(version-lobj-y),$(version-obj-y)) \
        $(if $(filter %.lo %.la,$1),$(LIBTOOLFLAGS)) \
        $(call extract-libs,$(1:.lo=.o)) $(LIBS),$(if $(filter %.lo %.la,$1),"lt LINK ", "  LINK  ")"$(TARGET_DIR)$@")
@@ -78,9 +74,9 @@ endif
 %.o: %.dtrace
 	$(call quiet-command,dtrace -o $@ -G -s $<, "  GEN   $(TARGET_DIR)$@")
 
-DSO_CFLAGS := -fPIC -DBUILD_DSO
+%$(DSOSUF): CFLAGS += -fPIC -DBUILD_DSO
 %$(DSOSUF): LDFLAGS += $(LDFLAGS_SHARED)
-%$(DSOSUF): %.mo libqemustub.a
+%$(DSOSUF):
 	$(call LINK,$^)
 	@# Copy to build root so modules can be loaded when program started without install
 	$(if $(findstring /,$@),$(call quiet-command,cp $@ $(subst /,-,$@), "  CP    $(subst /,-,$@)"))
@@ -161,82 +157,165 @@ clean: clean-timestamp
 # will delete the target of a rule if commands exit with a nonzero exit status
 .DELETE_ON_ERROR:
 
-# magic to descend into other directories
-
-define push-var
-$(eval save-$2-$1 = $(value $1))
-$(eval $1 :=)
-endef
-
-define pop-var
-$(eval subdir-$2-$1 := $(if $(filter $2,$(save-$2-$1)),$(addprefix $2,$($1))))
-$(eval $1 = $(value save-$2-$1) $$(subdir-$2-$1))
-$(eval save-$2-$1 :=)
-endef
-
-define fix-obj-vars
-$(if $2, $(foreach v,$($1), \
-	$(if $($v-cflags), \
-		$(eval $2/$v-cflags := $($v-cflags)) \
-		$(eval $v-cflags := )) \
-	$(if $($v-libs), \
-		$(eval $2/$v-libs := $($v-libs)) \
-		$(eval $v-libs := )) \
-	$(if $($v-objs), \
-		$(eval $2/$v-objs := $(addprefix $2/,$($v-objs))) \
-		$(eval $v-objs := ))))
+# save-vars
+# Usage: $(call save-vars, vars)
+# Save each variable $v in $vars as save-vars-$v, save their object's
+# variables, then clear $v.
+define save-vars
+    $(foreach v,$1,
+        $(eval save-vars-$v := $(value $v))
+        $(foreach o,$($v),
+            $(foreach k,cflags libs objs,
+                $(if $($o-$k),
+                    $(eval save-vars-$o-$k := $($o-$k))
+                    $(eval $o-$k := ))))
+        $(eval $v := ))
 endef
 
-define unnest-dir
-$(foreach var,$(nested-vars),$(call push-var,$(var),$1/))
-$(eval obj-parent-$1 := $(obj))
-$(eval obj := $(if $(obj),$(obj)/$1,$1))
-$(eval include $(SRC_PATH)/$1/Makefile.objs)
-$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(obj)))
-$(eval obj := $(obj-parent-$1))
-$(eval obj-parent-$1 := )
-$(foreach var,$(nested-vars),$(call pop-var,$(var),$1/))
+# load-vars
+# Usage: $(call load-vars, vars, add_var)
+# Load the saved value for each variable in @vars, and the per object
+# variables.
+# Append @add_var's current value to the loaded value.
+define load-vars
+    $(eval $2-new-value := $(value $2))
+    $(foreach v,$1,
+        $(eval $v := $(value save-vars-$v))
+        $(foreach o,$($v),
+            $(foreach k,cflags libs objs,
+                $(if $(save-vars-$o-$k),
+                    $(eval $o-$k := $(save-vars-$o-$k))
+                    $(eval save-vars-$o-$k := ))))
+        $(eval save-vars-$v := ))
+    $(eval $2 := $(value $2) $($2-new-value))
 endef
 
-define unnest-vars-1
-$(eval nested-dirs := $(filter-out \
-    $(old-nested-dirs), \
-    $(sort $(foreach var,$(nested-vars), $(filter %/, $($(var)))))))
-$(if $(nested-dirs),
-  $(foreach dir,$(nested-dirs),$(call unnest-dir,$(patsubst %/,%,$(dir))))
-  $(eval old-nested-dirs := $(old-nested-dirs) $(nested-dirs))
-  $(call unnest-vars-1))
+# fix-paths
+# Usage: $(call fix-paths, obj_path, src_path, vars)
+# Add prefix @obj_path to all objects in @vars, and add prefix @src_path to all
+# directories in @vars.
+define fix-paths
+    $(foreach v,$3,
+        $(foreach o,$($v),
+            $(if $($o-libs),
+                $(eval $1$o-libs := $($o-libs)))
+            $(if $($o-cflags),
+                $(eval $1$o-cflags := $($o-cflags)))
+            $(if $($o-objs),
+                $(eval $1$o-objs := $(addprefix $1,$($o-objs)))))
+        $(eval $v := $(addprefix $1,$(filter-out %/,$($v))) \
+                     $(addprefix $2,$(filter %/,$($v)))))
 endef
 
-define process-modules
-$(foreach o,$(filter %.o,$($1)),
-	$(eval $(patsubst %.o,%.mo,$o): $o) \
-	$(eval $(patsubst %.o,%.mo,$o)-objs := $o))
-$(foreach o,$(filter-out $(modules-m), $(patsubst %.o,%.mo,$($1))), \
-    $(eval $o-objs += module-common.o)
-    $(eval $o: $($o-objs))
-    $(eval modules-objs-m += $($o-objs))
-    $(eval modules-m += $o)
-    $(eval $o:; $$(call quiet-command,touch $$@,"  GEN   $$(TARGET_DIR)$$@"))
-    $(if $(CONFIG_MODULES),$(eval modules: $(patsubst %.mo,%$(DSOSUF),$o)))) \
-$(eval modules-objs-m := $(sort $(modules-objs-m)))
-$(foreach o,$(modules-objs-m), \
-    $(if $(CONFIG_MODULES),$(eval $o-cflags := $(call maybe-add, $(DSO_CFLAGS), $($o-cflags)))))
-$(eval $(patsubst %-m,%-$(call lnot,$(CONFIG_MODULES)),$1) += $($1))
+# unnest-var-recursive
+# Usage: $(call unnest-var-recursive, obj_prefix, vars, var)
+#
+# Unnest @var by including subdir Makefile.objs, while protect others in @vars
+# unchanged.
+#
+# @obj_prefix is the starting point of object path prefix.
+#
+define unnest-var-recursive
+    $(eval dirs := $(sort $(filter %/,$($3))))
+    $(eval $3 := $(filter-out %/,$($3)))
+    $(foreach d,$(dirs:%/=%),
+            $(call save-vars,$2)
+            $(eval obj := $(if $1,$1/)$d)
+            $(eval -include $(SRC_PATH)/$d/Makefile.objs)
+            $(call fix-paths,$(if $1,$1/)$d/,$d/,$2)
+            $(call load-vars,$2,$3)
+            $(call unnest-var-recursive,$1,$2,$3))
 endef
 
+# unnest-vars
+# Usage: $(call unnest-vars, obj_prefix, vars)
+#
+# @obj_prefix: object path prefix, can be empty, or '..', etc. Don't include
+# ending '/'.
+#
+# @vars: the list of variable names to unnest.
+#
+# This macro will scan subdirectories's Makefile.objs, include them, to build
+# up each variable listed in @vars.
+#
+# Per object and per module cflags and libs are saved with relative path fixed
+# as well, those variables include -libs, -cflags and -objs. Items in -objs are
+# also fixed to relative path against SRC_PATH plus the prefix @obj_prefix.
+#
+# All nested variables postfixed by -m in names are treated as DSO variables,
+# and will be built as modules, if enabled.
+#
+# A simple example of the unnest:
+#
+#     obj_prefix = ..
+#     vars = hot cold
+#     hot  = fire.o sun.o season/
+#     cold = snow.o water/ season/
+#
+# Unnest through a faked source directory structure:
+#
+#     SRC_PATH
+#        ├── water
+#        │   └── Makefile.objs──────────────────┐
+#        │       │ hot += steam.o               │
+#        │       │ cold += ice.mo               │
+#        │       │ ice.mo-libs := -licemaker    │
+#        │       │ ice.mo-objs := ice1.o ice2.o │
+#        │       └──────────────────────────────┘
+#        │
+#        └── season
+#            └── Makefile.objs──────┐
+#                │ hot += summer.o  │
+#                │ cold += winter.o │
+#                └──────────────────┘
+#
+# In the end, the result will be:
+#
+#     hot  = ../fire.o ../sun.o ../season/summer.o
+#     cold = ../snow.o ../water/ice.mo ../season/winter.o
+#     ../water/ice.mo-libs = -licemaker
+#     ../water/ice.mo-objs = ../water/ice1.o ../water/ice2.o
+#
+# Note that 'hot' didn't include 'season/' in the input, so 'summer.o' is not
+# included.
+#
 define unnest-vars
-$(eval obj := $1)
-$(eval nested-vars := $2)
-$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(obj)))
-$(eval old-nested-dirs := )
-$(call unnest-vars-1)
-$(if $1,$(foreach v,$(nested-vars),$(eval \
-	$v := $(addprefix $1/,$($v)))))
-$(foreach var,$(nested-vars),$(eval $(var) := $(filter-out %/, $($(var)))))
-$(shell mkdir -p $(sort $(foreach var,$(nested-vars),$(dir $($(var))))))
-$(foreach var,$(nested-vars), $(eval \
-  -include $(addsuffix *.d, $(sort $(dir $($(var)))))))
-$(foreach v,$(filter %-m,$(nested-vars)), \
-    $(call process-modules,$v))
+    # In the case of target build (i.e. $1 == ..), fix path for top level
+    # Makefile.objs objects
+    $(if $1,$(call fix-paths,$1/,,$2))
+
+    # Descend and include every subdir Makefile.objs
+    $(foreach v, $2, $(call unnest-var-recursive,$1,$2,$v))
+
+    $(foreach v,$(filter %-m,$2),
+        # All .o found in *-m variables are single object modules, create .mo
+        # for them
+        $(foreach o,$(filter %.o,$($v)),
+            $(eval $(o:%.o=%.mo)-objs := $o))
+        # Now unify .o in -m variable to .mo
+        $(eval $v := $($v:%.o=%.mo))
+        $(eval modules-m += $($v))
+
+        # For module build, build shared libraries during "make modules"
+        # For non-module build, add -m to -y
+        $(if $(CONFIG_MODULES),
+             $(eval modules: $($v:%.mo=%$(DSOSUF))),
+             $(eval $(patsubst %-m,%-y,$v) += $(call expand-objs, $($v)))))
+
+    # Post-process all the unnested vars
+    $(foreach v,$2,
+        $(foreach o, $(filter %.mo,$($v)),
+            # Find all the .mo objects in variables and add dependency rules
+            # according to .mo-objs. Report error if not set
+            $(if $($o-objs),
+                $(eval $(o:%.mo=%$(DSOSUF)): module-common.o $($o-objs)),
+                $(error $o added in $v but $o-objs is not set))
+            # Pass the .mo-cflags and .mo-libs along to member objects
+            $(foreach p,$($o-objs),
+                $(if $($o-cflags), $(eval $p-cflags += $($o-cflags)))
+                $(if $($o-libs), $(eval $p-libs += $($o-libs)))))
+        $(shell mkdir -p ./ $(sort $(dir $($v))))
+        # Include all the .d files
+        $(eval -include $(addsuffix *.d, $(sort $(dir $($v)))))
+        $(eval $v := $(filter-out %/,$($v))))
 endef