Re: [Qemu-devel] [PATCH v2 5/8] i386: Support Capstone in disas_set_info

["Alex Bennée" <alex.bennee@linaro.org>]

Richard Henderson <richard.henderson@linaro.org> writes:

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  disas.c           | 4 ++++
>  target/i386/cpu.c | 7 +++++++
>  2 files changed, 11 insertions(+)
>
> diff --git a/disas.c b/disas.c
> index 4dbb492219..42fae735ee 100644
> --- a/disas.c
> +++ b/disas.c
> @@ -439,9 +439,13 @@ void disas(FILE *out, void *code, unsigned long size)
>  #elif defined(__i386__)
>      s.info.mach = bfd_mach_i386_i386;
>      print_insn = print_insn_i386;
> +    s.info.cap_arch = CS_ARCH_X86;
> +    s.info.cap_mode = CS_MODE_32;
>  #elif defined(__x86_64__)
>      s.info.mach = bfd_mach_x86_64;
>      print_insn = print_insn_i386;
> +    s.info.cap_arch = CS_ARCH_X86;
> +    s.info.cap_mode = CS_MODE_64;
>  #elif defined(_ARCH_PPC)
>      s.info.disassembler_options = (char *)"any";
>      print_insn = print_insn_ppc;
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index b869a69c53..c3980b3864 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -51,6 +51,8 @@
>  #include "hw/i386/apic_internal.h"
>  #endif
>
> +#include "disas/capstone.h"
> +
>
>  /* Cache topology CPUID constants: */
>
> @@ -4108,6 +4110,11 @@ static void x86_disas_set_info(CPUState *cs, disassemble_info *info)
>                    : env->hflags & HF_CS32_MASK ? bfd_mach_i386_i386
>                    : bfd_mach_i386_i8086);
>      info->print_insn = print_insn_i386;
> +
> +    info->cap_arch = CS_ARCH_X86;
> +    info->cap_mode = (env->hflags & HF_CS64_MASK ? CS_MODE_64
> +                      : env->hflags & HF_CS32_MASK ? CS_MODE_32
> +                      : CS_MODE_16);
>  }
>
>  static Property x86_cpu_properties[] = {


--
Alex Bennée