[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 6/8] arm: Support Capstone in disas_set_info
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH v2 6/8] arm: Support Capstone in disas_set_info |
Date: |
Tue, 26 Sep 2017 01:08:27 +0100 |
User-agent: |
mu4e 0.9.19; emacs 26.0.60 |
Richard Henderson <address@hidden> writes:
> Cc: address@hidden
> Signed-off-by: Richard Henderson <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Tested-by: Alex Bennée <address@hidden>
And BTW better than libvixl at least w.r.t wfi.
> ---
> disas.c | 3 +++
> target/arm/cpu.c | 21 ++++++++++++++++++---
> 2 files changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/disas.c b/disas.c
> index 42fae735ee..ea295f9cfc 100644
> --- a/disas.c
> +++ b/disas.c
> @@ -451,6 +451,7 @@ void disas(FILE *out, void *code, unsigned long size)
> print_insn = print_insn_ppc;
> #elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS)
> print_insn = print_insn_arm_a64;
> + s.info.cap_arch = CS_ARCH_ARM64;
> #elif defined(__alpha__)
> print_insn = print_insn_alpha;
> #elif defined(__sparc__)
> @@ -458,6 +459,8 @@ void disas(FILE *out, void *code, unsigned long size)
> s.info.mach = bfd_mach_sparc_v9b;
> #elif defined(__arm__)
> print_insn = print_insn_arm;
> + s.info.cap_arch = CS_ARCH_ARM;
> + /* TCG only generates code for arm mode. */
> #elif defined(__MIPSEB__)
> print_insn = print_insn_big_mips;
> #elif defined(__MIPSEL__)
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index 412e94c7ad..53320709ac 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -33,6 +33,7 @@
> #include "sysemu/sysemu.h"
> #include "sysemu/hw_accel.h"
> #include "kvm_arm.h"
> +#include "disas/capstone.h"
>
> static void arm_cpu_set_pc(CPUState *cs, vaddr value)
> {
> @@ -482,10 +483,24 @@ static void arm_disas_set_info(CPUState *cpu,
> disassemble_info *info)
> #if defined(CONFIG_ARM_A64_DIS)
> info->print_insn = print_insn_arm_a64;
> #endif
> - } else if (env->thumb) {
> - info->print_insn = print_insn_thumb1;
> + info->cap_arch = CS_ARCH_ARM64;
> } else {
> - info->print_insn = print_insn_arm;
> + int cap_mode;
> + if (env->thumb) {
> + info->print_insn = print_insn_thumb1;
> + cap_mode = CS_MODE_THUMB;
> + } else {
> + info->print_insn = print_insn_arm;
> + cap_mode = CS_MODE_ARM;
> + }
> + if (arm_feature(env, ARM_FEATURE_V8)) {
> + cap_mode |= CS_MODE_V8;
> + }
> + if (arm_feature(env, ARM_FEATURE_M)) {
> + cap_mode |= CS_MODE_MCLASS;
> + }
> + info->cap_arch = CS_ARCH_ARM;
> + info->cap_mode = cap_mode;
> }
> if (bswap_code(arm_sctlr_b(env))) {
> #ifdef TARGET_WORDS_BIGENDIAN
--
Alex Bennée
- [Qemu-devel] [PATCH v2 0/8] Support the Capstone disassembler, Richard Henderson, 2017/09/19
- [Qemu-devel] [PATCH v2 2/8] target/ppc: Convert to disas_set_info hook, Richard Henderson, 2017/09/19
- [Qemu-devel] [PATCH v2 5/8] i386: Support Capstone in disas_set_info, Richard Henderson, 2017/09/19
- [Qemu-devel] [PATCH v2 1/8] target/i386: Convert to disas_set_info hook, Richard Henderson, 2017/09/19
- [Qemu-devel] [PATCH v2 7/8] ppc: Support Capstone in disas_set_info, Richard Henderson, 2017/09/19
- [Qemu-devel] [PATCH v2 6/8] arm: Support Capstone in disas_set_info, Richard Henderson, 2017/09/19
- Re: [Qemu-devel] [PATCH v2 6/8] arm: Support Capstone in disas_set_info,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 3/8] disas: Remove unused flags arguments, Richard Henderson, 2017/09/19
- [Qemu-devel] [PATCH v2 8/8] disas: Remove monitor_disas_is_physical, Richard Henderson, 2017/09/19
- [Qemu-devel] [PATCH v2 4/8] disas: Support the Capstone disassembler library, Richard Henderson, 2017/09/19
- Re: [Qemu-devel] [PATCH v2 0/8] Support the Capstone disassembler, no-reply, 2017/09/19