qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: luoyonggang@gmail.com, alex.bennee@linaro.org, thuth@redhat.com
Subject: [PATCH 02/11] capstone: Update to upstream "next" branch
Date: Sun, 13 Sep 2020 17:01:44 -0700	[thread overview]
Message-ID: <20200914000153.1725632-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200914000153.1725632-1-richard.henderson@linaro.org>

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.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 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 4417de1e14..00e2b8cc29 100644
--- a/meson.build
+++ b/meson.build
@@ -668,6 +668,7 @@ else
       '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'
     )
@@ -692,7 +693,7 @@ else
                                c_args: capstone_cargs,
                                include_directories: 'capstone/include')
   capstone = declare_dependency(link_with: libcapstone,
-                                include_directories: 'capstone/include')
+                                include_directories: 'capstone/include/capstone')
 endif
 
 # Generators
-- 
2.25.1



  parent reply	other threads:[~2020-09-14  0:06 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-14  0:01 [PATCH 00/11] capstone + disassembler patches Richard Henderson
2020-09-14  0:01 ` [PATCH 01/11] capstone: Convert Makefile bits to meson bits Richard Henderson
2020-09-14  1:37   ` Richard Henderson
2020-09-14 13:28   ` Paolo Bonzini
2020-09-14 16:23     ` Richard Henderson
2020-09-14 16:43       ` Paolo Bonzini
2020-09-14 13:31   ` Peter Maydell
2020-09-14  0:01 ` Richard Henderson [this message]
2020-09-14  6:07   ` [PATCH 02/11] capstone: Update to upstream "next" branch Philippe Mathieu-Daudé
2020-09-14  0:01 ` [PATCH 03/11] disas: Move host asm annotations to tb_gen_code Richard Henderson
2020-09-14  0:01 ` [PATCH 04/11] disas: Clean up CPUDebug initialization Richard Henderson
2020-09-14  0:01 ` [PATCH 05/11] disas: Use qemu/bswap.h for bfd endian loads Richard Henderson
2020-09-14  5:49   ` Philippe Mathieu-Daudé
2020-09-14  0:01 ` [PATCH 06/11] disas: Cleanup plugin_disas Richard Henderson
2020-09-14  0:01 ` [PATCH 07/11] disas: Configure capstone for aarch64 host without libvixl Richard Henderson
2020-09-14  0:01 ` [PATCH 08/11] disas: Split out capstone code to disas/capstone.c Richard Henderson
2020-09-14  0:01 ` [PATCH 09/11] disas: Enable capstone disassembly for s390x Richard Henderson
2020-09-14  0:01 ` [PATCH 10/11] disas/capstone: Add skipdata hook " Richard Henderson
2020-09-14  5:54   ` Philippe Mathieu-Daudé
2020-09-14  0:01 ` [PATCH 11/11] disas: Enable capstone disassembly for sparc Richard Henderson
2020-09-14  6:23   ` Philippe Mathieu-Daudé
2020-09-14 21:07     ` Richard Henderson
2020-09-15  6:20       ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200914000153.1725632-3-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=luoyonggang@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).