[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] arm: Support Capstone in disas_set_info
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 08/11] arm: Support Capstone in disas_set_info |
Date: |
Wed, 25 Oct 2017 14:30:53 +0200 |
Tested-by: Alex Bennée <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
disas.c | 3 +++
target/arm/cpu.c | 21 ++++++++++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/disas.c b/disas.c
index 63dc573e9f..8d9bd4901c 100644
--- a/disas.c
+++ b/disas.c
@@ -450,6 +450,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__)
@@ -457,6 +458,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 a92d86faa0..a0ed11c9a5 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)
{
@@ -487,10 +488,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;
}
sctlr_b = arm_sctlr_b(env);
--
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, 2017/10/25
- [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 <=
- [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
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Peter Maydell, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Daniel P. Berrange, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Peter Maydell, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Richard Henderson, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Daniel P. Berrange, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Philippe Mathieu-Daudé, 2017/10/26
- Re: [Qemu-devel] [PULL 00/11] Disassembler patches, Daniel P. Berrange, 2017/10/26