[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/11] i386: Support Capstone in disas_set_info
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 07/11] i386: Support Capstone in disas_set_info |
Date: |
Wed, 25 Oct 2017 14:30:52 +0200 |
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
disas.c | 4 ++++
target/i386/cpu.c | 7 +++++++
2 files changed, 11 insertions(+)
diff --git a/disas.c b/disas.c
index e392a2926e..63dc573e9f 100644
--- a/disas.c
+++ b/disas.c
@@ -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;
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 13b2f8fbc5..cf890b763b 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: */
@@ -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[] = {
--
2.13.6
- [Qemu-devel] [PULL 00/11] Disassembler patches, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 04/11] target/arm: Don't set INSN_ARM_BE32 for CONFIG_USER_ONLY, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 03/11] target/arm: Move BE32 disassembler fixup, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 01/11] target/i386: Convert to disas_set_info hook, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 02/11] target/ppc: Convert to disas_set_info hook, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 06/11] disas: Support the Capstone disassembler library, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 09/11] ppc: Support Capstone in disas_set_info, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 07/11] i386: Support Capstone in disas_set_info,
Richard Henderson <=
- [Qemu-devel] [PULL 05/11] disas: Remove unused flags arguments, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 11/11] disas: Add capstone as submodule, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 08/11] arm: Support Capstone in disas_set_info, Richard Henderson, 2017/10/25
- [Qemu-devel] [PULL 10/11] disas: Remove monitor_disas_is_physical, Richard Henderson, 2017/10/25
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, no-reply, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Peter Maydell, 2017/10/26