From nobody Tue Feb 10 10:55:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597686594; cv=none; d=zohomail.com; s=zohoarc; b=f5fEqSE27cHUggQYZsD53cIFQ8gtTn45I+bWuBDhOYtSwhaVs76l5RsmdRvKSOI/ONePEaLIlNt4y+LSXGea/RCEqXtr39keBYNKDlb0D9dKMvlz7AmNi1mG5NFNkf0911YN+45Flp8Ifn/GN2953+DBwJvcCCw3T7AmzZE2F+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597686594; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Dg2JWI65NOsNjS/YwjpdPhY7QCsZlisOKNHsoupPru8=; b=j5x54cTMSk7WllS3do7+oufKLbuW777DBQzcLn3tanC6NDfarqUCLfedxsZsQd87Zg0fzqz6o//dcMnn5yYPhayZ8mPfa97kD6UU5Y5/rwxhcY5sWEg7vvP2txV49xNgXwsRYf3KAuvKAyL9B4rxmAa80UuSG/u1BFAIXqbhUwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15976865945911002.5758401154293; Mon, 17 Aug 2020 10:49:54 -0700 (PDT) Received: from localhost ([::1]:43916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7hGs-0006IP-Ee for importer@patchew.org; Mon, 17 Aug 2020 11:42:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gL9-0003Wz-2s for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46757 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gL1-0006v2-D0 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:22 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-52-RlY2frIWMpyFOYNKvx8AVw-1; Mon, 17 Aug 2020 10:42:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7565381F000 for ; Mon, 17 Aug 2020 14:42:10 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C15E70C3D; Mon, 17 Aug 2020 14:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dg2JWI65NOsNjS/YwjpdPhY7QCsZlisOKNHsoupPru8=; b=ejavc9jOWD0/J6kRKtA23vIdJz0pJH7LAJq3yPPUsQeYc+zN5MuNQD7rBED0l7bqm0VlNQ FWwhQc++AbX8MUOTRcmJ0gym1Dgei+jXJ5BPDux6kCVI45pX7+NADbvUOeM4l4HW4IKiy2 wCGhH6Fk3BIZcOawC75M1OFL3aENrW8= X-MC-Unique: RlY2frIWMpyFOYNKvx8AVw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 131/150] meson: cpu-emu Date: Mon, 17 Aug 2020 16:40:34 +0200 Message-Id: <20200817144053.345107-36-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/17 05:13:21 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.target | 12 ------------ configure | 10 +++++++++- meson.build | 37 +++++++++++++++++++++++++++++++++++++ scripts/feature_to_c.sh | 24 ++++++++---------------- 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/Makefile.target b/Makefile.target index 5c099fa79f..c180b4cb38 100644 --- a/Makefile.target +++ b/Makefile.target @@ -108,15 +108,6 @@ obj-y +=3D $(LIBQEMU) obj-y +=3D trace/ =20 ######################################################### -# cpu emulator library -obj-y +=3D exec.o exec-vary.o -obj-$(CONFIG_TCG) +=3D tcg/tcg.o tcg/tcg-op.o tcg/tcg-op-vec.o tcg/tcg-op-= gvec.o -obj-$(CONFIG_TCG) +=3D tcg/tcg-common.o tcg/optimize.o -obj-$(CONFIG_TCG_INTERPRETER) +=3D tcg/tci.o -obj-$(CONFIG_TCG_INTERPRETER) +=3D disas/tci.o -obj-$(CONFIG_TCG) +=3D fpu/softfloat.o -obj-y +=3D disas.o -obj-$(call notempty,$(TARGET_XML_FILES)) +=3D gdbstub-xml.o LIBS :=3D $(libs_cpu) $(LIBS) =20 obj-$(CONFIG_PLUGIN) +=3D plugins/ @@ -200,9 +191,6 @@ ifdef CONFIG_DARWIN $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") endif =20 -gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh - $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_= c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@") - clean: clean-target rm -f *.a *~ $(PROGS) rm -f $(shell find . -name '*.[od]') diff --git a/configure b/configure index 82dbdd50e3..1da66ee537 100755 --- a/configure +++ b/configure @@ -5429,9 +5429,13 @@ case "$capstone" in LIBCAPSTONE=3Dlibcapstone.a fi libs_cpu=3D"-L$PWD/capstone -lcapstone $libs_cpu" + capstone_libs=3D"-L$PWD/capstone -lcapstone" + capstone_cflags=3D"-I${source_path}/capstone/include" ;; =20 system) + capstone_libs=3D"$($pkg_config --libs capstone)" + capstone_cflags=3D"$($pkg_config --cflags capstone)" QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags capstone)" libs_cpu=3D"$($pkg_config --libs capstone) $libs_cpu" ;; @@ -7663,6 +7667,8 @@ if test "$ivshmem" =3D "yes" ; then fi if test "$capstone" !=3D "no" ; then echo "CONFIG_CAPSTONE=3Dy" >> $config_host_mak + echo "CAPSTONE_CFLAGS=3D$capstone_cflags" >> $config_host_mak + echo "CAPSTONE_LIBS=3D$capstone_libs" >> $config_host_mak fi if test "$debug_mutex" =3D "yes" ; then echo "CONFIG_DEBUG_MUTEX=3Dy" >> $config_host_mak @@ -7683,6 +7689,8 @@ fi =20 if test "$libpmem" =3D "yes" ; then echo "CONFIG_LIBPMEM=3Dy" >> $config_host_mak + echo "LIBPMEM_LIBS=3D$libpmem_libs" >> $config_host_mak + echo "LIBPMEM_CFLAGS=3D$libpmem_cflags" >> $config_host_mak fi =20 if test "$libdaxctl" =3D "yes" ; then @@ -8181,7 +8189,7 @@ fi list=3D"" if test ! -z "$gdb_xml_files" ; then for x in $gdb_xml_files; do - list=3D"$list $source_path/gdb-xml/$x" + list=3D"$list gdb-xml/$x" done echo "TARGET_XML_FILES=3D$list" >> $config_target_mak fi diff --git a/meson.build b/meson.build index 10e06acff0..2cfc183e92 100644 --- a/meson.build +++ b/meson.build @@ -341,6 +341,16 @@ if 'CONFIG_USB_LIBUSB' in config_host libusb =3D declare_dependency(compile_args: config_host['LIBUSB_CFLAGS']= .split(), link_args: config_host['LIBUSB_LIBS'].split(= )) endif +capstone =3D not_found +if 'CONFIG_CAPSTONE' in config_host + capstone =3D declare_dependency(compile_args: config_host['CAPSTONE_CFLA= GS'].split(), + link_args: config_host['CAPSTONE_LIBS'].sp= lit()) +endif +libpmem =3D not_found +if 'CONFIG_LIBPMEM' in config_host + libpmem =3D declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS= '].split(), + link_args: config_host['LIBPMEM_LIBS'].spli= t()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -525,6 +535,8 @@ target_softmmu_arch =3D {} # Trace files # ############### =20 +# TODO: add each directory to the subdirs from its own meson.build, once +# we have those trace_events_subdirs =3D [ 'accel/kvm', 'accel/tcg', @@ -693,6 +705,20 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [f= iles('device_tree.c')]) common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') + +specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem) +specific_ss.add(files('exec-vary.c')) +specific_ss.add(when: 'CONFIG_TCG', if_true: files( + 'fpu/softfloat.c', + 'tcg/optimize.c', + 'tcg/tcg-common.c', + 'tcg/tcg-op-gvec.c', + 'tcg/tcg-op-vec.c', + 'tcg/tcg-op.c', + 'tcg/tcg.c', +)) +specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('disas/tci.= c', 'tcg/tci.c')) + subdir('backends') subdir('disas') subdir('migration') @@ -784,6 +810,8 @@ common_all =3D static_library('common', dependencies: common_all.dependencies(), name_suffix: 'fa') =20 +feature_to_c =3D find_program('scripts/feature_to_c.sh') + foreach target : target_dirs config_target =3D config_target_mak[target] target_name =3D config_target['TARGET_NAME'] @@ -830,6 +858,15 @@ foreach target : target_dirs endif endif =20 + if 'TARGET_XML_FILES' in config_target + gdbstub_xml =3D custom_target(target + '-gdbstub-xml.c', + output: target + '-gdbstub-xml.c', + input: files(config_target['TARGET_XML_FIL= ES'].split()), + command: [feature_to_c, '@INPUT@'], + capture: true) + arch_srcs +=3D gdbstub_xml + endif + t =3D target_arch[arch].apply(config_target, strict: false) arch_srcs +=3D t.sources() =20 diff --git a/scripts/feature_to_c.sh b/scripts/feature_to_c.sh index c8ce9b88f6..b1169899c1 100644 --- a/scripts/feature_to_c.sh +++ b/scripts/feature_to_c.sh @@ -19,16 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . =20 -output=3D$1 -shift - -if test -z "$output" || test -z "$1"; then - echo "Usage: $0 OUTPUTFILE INPUTFILE..." - exit 1 -fi - -if test -e "$output"; then - echo "Output file \"$output\" already exists; refusing to overwrite." +if test -z "$1"; then + echo "Usage: $0 INPUTFILE..." exit 1 fi =20 @@ -60,17 +52,17 @@ for input; do printf "'\''\\n'\'', \n" } END { print " 0 };" - }' < $input >> $output + }' < $input done =20 -echo >> $output -echo "const char *const xml_builtin[][2] =3D {" >> $output +echo +echo "const char *const xml_builtin[][2] =3D {" =20 for input; do basename=3D$(echo $input | sed 's,.*/,,') arrayname=3Dxml_feature_$(echo $input | sed 's,.*/,,; s/[-.]/_/g') - echo " { \"$basename\", $arrayname }," >> $output + echo " { \"$basename\", $arrayname }," done =20 -echo " { (char *)0, (char *)0 }" >> $output -echo "};" >> $output +echo " { (char *)0, (char *)0 }" +echo "};" --=20 2.26.2