From nobody Mon Feb 9 15:30:18 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=1596743421; cv=none; d=zohomail.com; s=zohoarc; b=cuGIvrcEqoHdHP/0UswqIlirU/vJFx/YHN3jpVdvFUnOowTkZLdCUhgMDwf2nX8zxWyCtfUjMCkzAOxxtvw3/cnhuqX/WGdOcRsIpu7r9il98MshB4h41rV+8eMVFHMLp+wKXK9ZQChXqaZuMvIydSzdg65Ya9AeUKfvNoaHI2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596743421; 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=91OItYP/674zgCX7co+pRrjp/sdnITV13JhLErxi4mM=; b=DjOygxOpYx2hL6q1zmvx+Gbw5aAvUaa0EYc4xbxBhwxVIfell0C3HtWyVV0d+oAwyJQZWomPbUkV9g8uZEWwFSmpwfhT63FQG4KfrfV3EiOh8Uyh56IbczSItW2Cqvaj+ygKbEM78OxpHzyueQSzrx+k3AwLqXtcsqNoG+DqQNk= 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 1596743421991329.3317753783365; Thu, 6 Aug 2020 12:50:21 -0700 (PDT) Received: from localhost ([::1]:54806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3lu7-0005W6-MK for importer@patchew.org; Thu, 06 Aug 2020 15:50:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3lPb-0007ZO-TG for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:20476 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 1k3lPY-0006g7-T7 for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:47 -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-170-LSRaATNyPgyodttLG3K81w-1; Thu, 06 Aug 2020 15:18:41 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 61973800685 for ; Thu, 6 Aug 2020 19:18:40 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 732CD5F9DC; Thu, 6 Aug 2020 19:18:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596741524; 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=91OItYP/674zgCX7co+pRrjp/sdnITV13JhLErxi4mM=; b=Q4GneUB8cF7AvFzeOFZnnpTAOykBDBwG3h9DJxTa3GOmh+tb6u6m5/1uGxYDH2/WrMLgfp HMAdQoILvmJmcciRhao+VBJ/XPhFPLn43dtQiRwydz6of3ensBUq2rTHKpmkpWou9bSZD6 n1eCdxo8bNxhTgEXFcC5dIJb4RUTlUM= X-MC-Unique: LSRaATNyPgyodttLG3K81w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 079/143] meson: convert disas directory to Meson Date: Thu, 6 Aug 2020 21:15:15 +0200 Message-Id: <1596741379-12902-80-git-send-email-pbonzini@redhat.com> In-Reply-To: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> References: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 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/06 00:24:10 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.objs | 2 -- disas/Makefile.objs | 30 ------------------------------ disas/libvixl/Makefile.objs | 5 ----- disas/libvixl/meson.build | 7 +++++++ disas/meson.build | 27 +++++++++++++++++++++++++++ meson.build | 1 + 6 files changed, 35 insertions(+), 37 deletions(-) delete mode 100644 disas/Makefile.objs delete mode 100644 disas/libvixl/Makefile.objs create mode 100644 disas/libvixl/meson.build create mode 100644 disas/meson.build diff --git a/Makefile.objs b/Makefile.objs index 79812c4..4959d62 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -73,8 +73,6 @@ endif # CONFIG_SOFTMMU # Target-independent parts used in system and user emulation =20 common-obj-y +=3D hw/ -common-obj-y +=3D qom/ -common-obj-y +=3D disas/ =20 ###################################################################### # Resource file for Windows executables diff --git a/disas/Makefile.objs b/disas/Makefile.objs deleted file mode 100644 index 3c1cdce..0000000 --- a/disas/Makefile.objs +++ /dev/null @@ -1,30 +0,0 @@ - -common-obj-$(CONFIG_ALPHA_DIS) +=3D alpha.o -common-obj-$(CONFIG_ARM_DIS) +=3D arm.o -common-obj-$(CONFIG_ARM_A64_DIS) +=3D arm-a64.o -common-obj-$(CONFIG_ARM_A64_DIS) +=3D libvixl/ -libvixldir =3D $(SRC_PATH)/disas/libvixl -# The -Wno-sign-compare is needed only for gcc 4.6, which complains about -# some signed-unsigned equality comparisons in libvixl which later gcc -# versions do not. -arm-a64.o-cflags :=3D -I$(libvixldir) -Wno-sign-compare -common-obj-$(CONFIG_CRIS_DIS) +=3D cris.o -common-obj-$(CONFIG_HPPA_DIS) +=3D hppa.o -common-obj-$(CONFIG_I386_DIS) +=3D i386.o -common-obj-$(CONFIG_M68K_DIS) +=3D m68k.o -common-obj-$(CONFIG_MICROBLAZE_DIS) +=3D microblaze.o -common-obj-$(CONFIG_MIPS_DIS) +=3D mips.o -common-obj-$(CONFIG_NANOMIPS_DIS) +=3D nanomips.o -common-obj-$(CONFIG_NIOS2_DIS) +=3D nios2.o -common-obj-$(CONFIG_MOXIE_DIS) +=3D moxie.o -common-obj-$(CONFIG_PPC_DIS) +=3D ppc.o -common-obj-$(CONFIG_RISCV_DIS) +=3D riscv.o -common-obj-$(CONFIG_S390_DIS) +=3D s390.o -common-obj-$(CONFIG_SH4_DIS) +=3D sh4.o -common-obj-$(CONFIG_SPARC_DIS) +=3D sparc.o -common-obj-$(CONFIG_LM32_DIS) +=3D lm32.o -common-obj-$(CONFIG_XTENSA_DIS) +=3D xtensa.o - -# TODO: As long as the TCG interpreter and its generated code depend -# on the QEMU target, we cannot compile the disassembler here. -#common-obj-$(CONFIG_TCI_DIS) +=3D tci.o diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs deleted file mode 100644 index 99a637f..0000000 --- a/disas/libvixl/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -common-obj-$(CONFIG_ARM_A64_DIS) =3D vixl/utils.o \ - vixl/compiler-intrinsics.o \ - vixl/a64/instructions-a64.o \ - vixl/a64/decoder-a64.o \ - vixl/a64/disasm-a64.o diff --git a/disas/libvixl/meson.build b/disas/libvixl/meson.build new file mode 100644 index 0000000..5e2eb33 --- /dev/null +++ b/disas/libvixl/meson.build @@ -0,0 +1,7 @@ +libvixl_ss.add(files( + 'vixl/a64/decoder-a64.cc', + 'vixl/a64/disasm-a64.cc', + 'vixl/a64/instructions-a64.cc', + 'vixl/compiler-intrinsics.cc', + 'vixl/utils.cc', +)) diff --git a/disas/meson.build b/disas/meson.build new file mode 100644 index 0000000..0527d69 --- /dev/null +++ b/disas/meson.build @@ -0,0 +1,27 @@ +libvixl_ss =3D ss.source_set() +subdir('libvixl') + +common_ss.add(when: 'CONFIG_ALPHA_DIS', if_true: files('alpha.c')) +common_ss.add(when: 'CONFIG_ARM_A64_DIS', if_true: files('arm-a64.cc')) +common_ss.add_all(when: 'CONFIG_ARM_A64_DIS', if_true: libvixl_ss) +common_ss.add(when: 'CONFIG_ARM_DIS', if_true: files('arm.c')) +common_ss.add(when: 'CONFIG_CRIS_DIS', if_true: files('cris.c')) +common_ss.add(when: 'CONFIG_HPPA_DIS', if_true: files('hppa.c')) +common_ss.add(when: 'CONFIG_I386_DIS', if_true: files('i386.c')) +common_ss.add(when: 'CONFIG_LM32_DIS', if_true: files('lm32.c')) +common_ss.add(when: 'CONFIG_M68K_DIS', if_true: files('m68k.c')) +common_ss.add(when: 'CONFIG_MICROBLAZE_DIS', if_true: files('microblaze.c'= )) +common_ss.add(when: 'CONFIG_MIPS_DIS', if_true: files('mips.c')) +common_ss.add(when: 'CONFIG_MOXIE_DIS', if_true: files('moxie.c')) +common_ss.add(when: 'CONFIG_NANOMIPS_DIS', if_true: files('nanomips.cpp')) +common_ss.add(when: 'CONFIG_NIOS2_DIS', if_true: files('nios2.c')) +common_ss.add(when: 'CONFIG_PPC_DIS', if_true: files('ppc.c')) +common_ss.add(when: 'CONFIG_RISCV_DIS', if_true: files('riscv.c')) +common_ss.add(when: 'CONFIG_S390_DIS', if_true: files('s390.c')) +common_ss.add(when: 'CONFIG_SH4_DIS', if_true: files('sh4.c')) +common_ss.add(when: 'CONFIG_SPARC_DIS', if_true: files('sparc.c')) +common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c')) + +# TODO: As long as the TCG interpreter and its generated code depend +# on the QEMU target, we cannot compile the disassembler here. +#common_ss.add(when: 'CONFIG_TCI_DIS', if_true: files('tci.c')) diff --git a/meson.build b/meson.build index 77c0df6..fb444ad 100644 --- a/meson.build +++ b/meson.build @@ -646,6 +646,7 @@ common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') subdir('backends') +subdir('disas') subdir('migration') subdir('monitor') subdir('net') --=20 1.8.3.1