Commit b666d2a4 authored by Richard Henderson's avatar Richard Henderson
Browse files

i386: Support Capstone in disas_set_info 



Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 8ca80760

disas.c

+4 −0
Original line number Diff line number Diff line
@@ -438,9 +438,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;

target/i386/cpu.c

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#include "hw/i386/apic_internal.h"

#endif



#include "disas/capstone.h"





/* Cache topology CPUID constants: */
@@ -4106,6 +4108,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[] = {