From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Cc: "Thomas Huth" <thuth@redhat.com>, alex.bennee@linaro.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org> Subject: [PATCH v4 08/11] disas: Configure capstone for aarch64 host without libvixl Date: Mon, 21 Sep 2020 10:41:15 -0700 Message-ID: <20200921174118.39352-9-richard.henderson@linaro.org> (raw) In-Reply-To: <20200921174118.39352-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> 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 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 index Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-21 17:41 [PATCH v4 00/11] capstone + disassembler patches Richard Henderson 2020-09-21 17:41 ` [PATCH v4 01/11] capstone: Convert Makefile bits to meson bits Richard Henderson 2020-09-21 19:17 ` Alex Bennée 2020-09-21 17:41 ` [PATCH v4 02/11] capstone: Update to upstream "next" branch Richard Henderson 2020-09-21 19:18 ` Alex Bennée 2020-09-21 17:41 ` [PATCH v4 03/11] capstone: Require version 4.0 from a system library Richard Henderson 2020-09-21 19:19 ` Alex Bennée 2020-09-22 10:33 ` Philippe Mathieu-Daudé 2020-09-21 17:41 ` [PATCH v4 04/11] disas: Move host asm annotations to tb_gen_code Richard Henderson 2020-09-21 19:29 ` Alex Bennée 2020-09-21 19:53 ` Richard Henderson 2020-09-22 8:26 ` Philippe Mathieu-Daudé 2020-09-22 9:50 ` Alex Bennée 2020-09-21 17:41 ` [PATCH v4 05/11] disas: Clean up CPUDebug initialization Richard Henderson 2020-09-21 19:32 ` Alex Bennée 2020-09-21 17:41 ` [PATCH v4 06/11] disas: Use qemu/bswap.h for bfd endian loads Richard Henderson 2020-09-21 19:33 ` Alex Bennée 2020-09-21 17:41 ` [PATCH v4 07/11] disas: Cleanup plugin_disas Richard Henderson 2020-09-22 10:38 ` Alex Bennée 2020-09-21 17:41 ` Richard Henderson [this message] 2020-09-22 10:48 ` [PATCH v4 08/11] disas: Configure capstone for aarch64 host without libvixl Alex Bennée 2020-09-21 17:41 ` [PATCH v4 09/11] disas: Split out capstone code to disas/capstone.c Richard Henderson 2020-09-22 10:50 ` Alex Bennée 2020-09-21 17:41 ` [PATCH v4 10/11] disas: Enable capstone disassembly for s390x Richard Henderson 2020-09-22 10:58 ` Alex Bennée 2020-09-21 17:41 ` [PATCH v4 11/11] disas/capstone: Add skipdata hook " Richard Henderson 2020-09-22 10:59 ` Alex Bennée 2020-09-22 0:50 ` [PATCH v4 00/11] capstone + disassembler patches no-reply
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=20200921174118.39352-9-richard.henderson@linaro.org \ --to=richard.henderson@linaro.org \ --cc=alex.bennee@linaro.org \ --cc=f4bug@amsat.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
QEMU-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \ qemu-devel@nongnu.org public-inbox-index qemu-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git