From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>
Subject: [PATCH v3 07/10] disas: Configure capstone for aarch64 host without libvixl
Date: Thu, 17 Sep 2020 16:57:17 -0700 [thread overview]
Message-ID: <20200917235720.2685978-8-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200917235720.2685978-1-richard.henderson@linaro.org>
The ifdef tangle failed to set cap_arch if libvixl itself
was not configured (e.g. due to lack of c++ compiler).
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
disas.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/disas.c b/disas.c
index d0ccd4b727..01c8bc6c9e 100644
--- a/disas.c
+++ b/disas.c
@@ -428,9 +428,11 @@ static void initialize_debug_host(CPUDebug *s)
#else
#error unsupported RISC-V ABI
#endif
-#elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS)
- s->info.print_insn = print_insn_arm_a64;
+#elif defined(__aarch64__)
s->info.cap_arch = CS_ARCH_ARM64;
+# ifdef CONFIG_ARM_A64_DIS
+ s->info.print_insn = print_insn_arm_a64;
+# endif
#elif defined(__alpha__)
s->info.print_insn = print_insn_alpha;
#elif defined(__sparc__)
--
2.25.1
next prev parent reply other threads:[~2020-09-18 0:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 23:57 [PATCH v3 00/10] capstone + disassembler patches Richard Henderson
2020-09-17 23:57 ` [PATCH v3 01/10] capstone: Convert Makefile bits to meson bits Richard Henderson
2020-09-18 8:12 ` 罗勇刚(Yonggang Luo)
2020-09-18 8:13 ` Paolo Bonzini
2020-09-18 8:42 ` 罗勇刚(Yonggang Luo)
2020-09-18 12:58 ` Paolo Bonzini
2020-09-18 13:02 ` 罗勇刚(Yonggang Luo)
2020-09-21 10:54 ` Alex Bennée
2020-09-21 11:05 ` Alex Bennée
2020-09-21 12:50 ` 罗勇刚(Yonggang Luo)
2020-09-21 13:12 ` Paolo Bonzini
2020-09-17 23:57 ` [PATCH v3 02/10] capstone: Update to upstream "next" branch Richard Henderson
2020-09-17 23:57 ` [PATCH v3 03/10] disas: Move host asm annotations to tb_gen_code Richard Henderson
2020-09-17 23:57 ` [PATCH v3 04/10] disas: Clean up CPUDebug initialization Richard Henderson
2020-09-17 23:57 ` [PATCH v3 05/10] disas: Use qemu/bswap.h for bfd endian loads Richard Henderson
2020-09-17 23:57 ` [PATCH v3 06/10] disas: Cleanup plugin_disas Richard Henderson
2020-09-17 23:57 ` Richard Henderson [this message]
2020-09-18 8:08 ` [PATCH v3 07/10] disas: Configure capstone for aarch64 host without libvixl Philippe Mathieu-Daudé
2020-09-17 23:57 ` [PATCH v3 08/10] disas: Split out capstone code to disas/capstone.c Richard Henderson
2020-09-17 23:57 ` [PATCH v3 09/10] disas: Enable capstone disassembly for s390x Richard Henderson
2020-09-17 23:57 ` [PATCH v3 10/10] disas/capstone: Add skipdata hook " Richard Henderson
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=20200917235720.2685978-8-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.