From patchwork Thu Sep 17 23:57:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 273444 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3A2DC43464 for ; Thu, 17 Sep 2020 23:58:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97D3B20770 for ; Thu, 17 Sep 2020 23:58:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="l30gwEIF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97D3B20770 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJ3na-0005Im-JG for qemu-devel@archiver.kernel.org; Thu, 17 Sep 2020 19:58:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJ3mL-0003kf-Vc for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:29 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:45130) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJ3mK-0006du-8z for qemu-devel@nongnu.org; Thu, 17 Sep 2020 19:57:29 -0400 Received: by mail-pl1-x641.google.com with SMTP id q12so1981938plr.12 for ; Thu, 17 Sep 2020 16:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uTrm0sdq7gARiBpxaC3cYgqckLUxE92nb3e9fV7DsLA=; b=l30gwEIFVxytLmJeEP0GRYF9BTHFlcbeB568YVbbigVaClybqQxlk78bHOdltWILne aMEHpVicYHW4pyL+aWBnU4SC/0m10IisRILhuITrKu/4b6ltIFm0K7YqQrZjZVczYdiN SN8an7OzmDTc7GGzz7GbjMzk4UvPza9lEFAWRFAYMrtkHSZriklcsINIykyk/jtbs49Z weYTtCGA6reruFPgHl8QX7BwFh2kFezej+bWcD17Y+KE2yZhpO0AyJmq3OtASYLAYW37 kBHsr9lFKYGMbIW3M51iQCKO/GxUYxpoqvRq5yVYWT0yPxCW4+RS4WejkgiN4VocmHhv b80Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uTrm0sdq7gARiBpxaC3cYgqckLUxE92nb3e9fV7DsLA=; b=fH2NsZCwnzpODCUI6ENmQz/kBxeRytCYg7LbY+B+9zvZkyx7JMVuafKmktlsLMfR3m Jg5T4uXWyFJeFoLUnO48m6SunEePRjy1Xzjeum2KKRvlcywKwS5TcpkrgfL/ZnfaL/oJ rkZT3k3BB0ZAw+3eTdJ3ect+0lR87WqKvBoqPWPAP2SIaTWmhSC1lay5EXFOM2Eg0j+2 zXLHswQfVsN0umZUGfJJca4pogr2BxZNr+lJhIulEr5CQUzlT7HeUUoAA3axzsx0hosm a0De9ChF2RD2PfdQkHRj4RN0+UG9UiztwmN1+P5Cj0VzI/O+vUynw4uyVTPoZSbcvl/i de0A== X-Gm-Message-State: AOAM532DuTllCRZAGkL70gFYhP23z4OJeEhyZ0S1v84j7uSZAmfetnEz g9vMUshC6SHYWEMsAXZ0dqW5I/8eUJBGPg== X-Google-Smtp-Source: ABdhPJw/1/230V1gHJFq9r09RNJbzyy4VR/lRPsXyRY5XBZLCzCIapqVIgyEbfeoe81C2f/QyT4Afg== X-Received: by 2002:a17:902:fe84:b029:d1:e598:3ff6 with SMTP id x4-20020a170902fe84b02900d1e5983ff6mr13364654plm.48.1600387044921; Thu, 17 Sep 2020 16:57:24 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m13sm772699pfk.103.2020.09.17.16.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 16:57:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 02/10] capstone: Update to upstream "next" branch Date: Thu, 17 Sep 2020 16:57:12 -0700 Message-Id: <20200917235720.2685978-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org> References: <20200917235720.2685978-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::641; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This branch contains a number of improvements over master, including making all of the disassembler data constant. We are skipping past the 4.0 branchpoint, which changed the location of the includes within the source directory. Tested-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- capstone | 2 +- meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/capstone b/capstone index 22ead3e0bf..f8b1b83301 160000 --- a/capstone +++ b/capstone @@ -1 +1 @@ -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf +Subproject commit f8b1b833015a4ae47110ed068e0deb7106ced66d diff --git a/meson.build b/meson.build index f23273693d..4c92b43fe5 100644 --- a/meson.build +++ b/meson.build @@ -677,6 +677,7 @@ if capstone_opt == 'internal' 'capstone/arch/X86/X86DisassemblerDecoder.c', 'capstone/arch/X86/X86ATTInstPrinter.c', 'capstone/arch/X86/X86IntelInstPrinter.c', + 'capstone/arch/X86/X86InstPrinterCommon.c', 'capstone/arch/X86/X86Mapping.c', 'capstone/arch/X86/X86Module.c' ) @@ -701,7 +702,7 @@ if capstone_opt == 'internal' c_args: capstone_cargs, include_directories: 'capstone/include') capstone = declare_dependency(link_with: libcapstone, - include_directories: 'capstone/include') + include_directories: 'capstone/include/capstone') endif config_host_data.set('CONFIG_CAPSTONE', capstone.found())