From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 08/11] disas: Configure capstone for aarch64 host without libvixl
Date: Tue, 22 Sep 2020 10:47:38 -0700 [thread overview]
Message-ID: <20200922174741.475876-9-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200922174741.475876-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: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
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 54a540180f..cafd063d42 100644
--- a/disas.c
+++ b/disas.c
@@ -430,9 +430,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-22 17:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 17:47 [PULL 00/11] capstone + disassembler patch queue Richard Henderson
2020-09-22 17:47 ` [PULL 01/11] capstone: Convert Makefile bits to meson bits Richard Henderson
2020-09-22 17:47 ` [PULL 02/11] capstone: Update to upstream "next" branch Richard Henderson
2020-09-22 17:47 ` [PULL 03/11] capstone: Require version 4.0 from a system library Richard Henderson
2020-09-22 17:47 ` [PULL 04/11] disas: Move host asm annotations to tb_gen_code Richard Henderson
2020-09-22 17:47 ` [PULL 05/11] disas: Clean up CPUDebug initialization Richard Henderson
2020-09-22 17:47 ` [PULL 06/11] disas: Use qemu/bswap.h for bfd endian loads Richard Henderson
2020-09-22 17:47 ` [PULL 07/11] disas: Cleanup plugin_disas Richard Henderson
2020-09-22 17:47 ` Richard Henderson [this message]
2020-09-22 17:47 ` [PULL 09/11] disas: Split out capstone code to disas/capstone.c Richard Henderson
2020-09-22 17:47 ` [PULL 10/11] disas: Enable capstone disassembly for s390x Richard Henderson
2020-09-22 17:47 ` [PULL 11/11] disas/capstone: Add skipdata hook " Richard Henderson
2020-09-24 5:38 ` [PULL 00/11] capstone + disassembler patch queue Paolo Bonzini
2020-09-25 10:03 ` Peter Maydell
2020-09-25 12:33 ` Paolo Bonzini
2020-09-25 14:30 ` 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=20200922174741.475876-9-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=peter.maydell@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 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).