[v1] capstone + disassembler patches

[PATCH 07/11] disas: Configure capstone for aarch64 host without libvixl

Richard Henderson posted 11 patches 5 years, 4 months ago

Diff against v2 v3 v4
Download mbox

Maintainers: David Hildenbrand <david@redhat.com>, Thomas Huth <thuth@redhat.com>, Artyom Tarasenko <atar4qemu@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Cornelia Huck <cohuck@redhat.com>, Richard Henderson <rth@twiddle.net>

There is a newer version of this series

Expand all Fold all

[PATCH 07/11] disas: Configure capstone for aarch64 host without libvixl

Posted by Richard Henderson 5 years, 4 months ago

The ifdef tangle failed to set cap_arch if libvixl itself
was not configured (e.g. due to lack of c++ compiler).

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 ed9965c32f..5d81403125 100644
--- a/disas.c
+++ b/disas.c
@@ -435,9 +435,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