[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/11] disas: Configure capstone for aarch64 host without libvixl
From: |
Richard Henderson |
Subject: |
[PULL 08/11] disas: Configure capstone for aarch64 host without libvixl |
Date: |
Tue, 22 Sep 2020 10:47:38 -0700 |
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
- [PULL 00/11] capstone + disassembler patch queue, Richard Henderson, 2020/09/22
- [PULL 05/11] disas: Clean up CPUDebug initialization, Richard Henderson, 2020/09/22
- [PULL 01/11] capstone: Convert Makefile bits to meson bits, Richard Henderson, 2020/09/22
- [PULL 04/11] disas: Move host asm annotations to tb_gen_code, Richard Henderson, 2020/09/22
- [PULL 03/11] capstone: Require version 4.0 from a system library, Richard Henderson, 2020/09/22
- [PULL 02/11] capstone: Update to upstream "next" branch, Richard Henderson, 2020/09/22
- [PULL 06/11] disas: Use qemu/bswap.h for bfd endian loads, Richard Henderson, 2020/09/22
- [PULL 08/11] disas: Configure capstone for aarch64 host without libvixl,
Richard Henderson <=
- [PULL 11/11] disas/capstone: Add skipdata hook for s390x, Richard Henderson, 2020/09/22
- [PULL 10/11] disas: Enable capstone disassembly for s390x, Richard Henderson, 2020/09/22
- [PULL 07/11] disas: Cleanup plugin_disas, Richard Henderson, 2020/09/22
- [PULL 09/11] disas: Split out capstone code to disas/capstone.c, Richard Henderson, 2020/09/22
- Re: [PULL 00/11] capstone + disassembler patch queue, Paolo Bonzini, 2020/09/24
- Re: [PULL 00/11] capstone + disassembler patch queue, Peter Maydell, 2020/09/25