Re: [Qemu-devel] [PATCH 10/10] target/mips: Support Capstone in disas_set_info

2017-09-14 Thread Philippe Mathieu-Daudé 

On 09/14/2017 03:35 PM, Richard Henderson wrote:

Cc: Aurelien Jarno 
Cc: Yongbok Kim 
Signed-off-by: Richard Henderson 
---
  target/mips/cpu.h|  2 ++
  target/mips/cpu.c|  8 
  target/mips/translate_init.c | 36 
  3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index 74f6a5b098..dca713825d 100644
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -1118,4 +1118,6 @@ static inline void QEMU_NORETURN 
do_raise_exception(CPUMIPSState *env,
  do_raise_exception_err(env, exception, 0, pc);
  }
  
+void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info);

+
  #endif /* MIPS_CPU_H */
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 1bb66b7a5a..898f1b3759 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -111,14 +111,6 @@ static void mips_cpu_reset(CPUState *s)
  #endif
  }
  
-static void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info) {

-#ifdef TARGET_WORDS_BIGENDIAN
-info->print_insn = print_insn_big_mips;
-#else
-info->print_insn = print_insn_little_mips;
-#endif
-}
-


this clashes with the pending mips-cpu-qomify series, however the 
conflict is benign and easy fixable, I expect your series to enter first.



  static void mips_cpu_realizefn(DeviceState *dev, Error **errp)
  {
  CPUState *cs = CPU(dev);
diff --git a/target/mips/translate_init.c b/target/mips/translate_init.c
index 255d25bacd..1d43b3c36d 100644
--- a/target/mips/translate_init.c
+++ b/target/mips/translate_init.c
@@ -947,3 +947,39 @@ static void msa_reset(CPUMIPSState *env)
  /* set proper signanling bit meaning ("1" means "quiet") */
  set_snan_bit_is_one(0, &env->active_tc.msa_fp_status);
  }
+
+#include "disas/capstone.h"
+
+void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info)
+{
+MIPSCPU *cpu = MIPS_CPU(s);
+CPUMIPSState *env = &cpu->env;
+int insn_flags = env->cpu_model->insn_flags;
+int cap_mode;


int cap_mode = 0; ?


+
+#ifdef TARGET_WORDS_BIGENDIAN
+info->print_insn = print_insn_big_mips;
+#else
+info->print_insn = print_insn_little_mips;
+#endif
+
+cap_mode = 0;
+if (insn_flags & ISA_MIPS3) {
+cap_mode |= CS_MODE_MIPS3;
+}
+if (insn_flags & ISA_MIPS32) {
+cap_mode |= CS_MODE_MIPS32;
+}
+if (insn_flags & ISA_MIPS64) {
+cap_mode |= CS_MODE_MIPS64;
+}
+if (insn_flags & ISA_MIPS32R6) {
+cap_mode |= CS_MODE_MIPS32R6;
+}


quite an improvement for the MIPS target!


+#ifdef TARGET_MIPS64
+cap_mode |= CS_MODE_MIPSGP64;
+#endif
+
+info->cap_arch = CS_ARCH_MIPS;
+info->cap_mode = cap_mode;
+}

[Qemu-devel] [PATCH 10/10] target/mips: Support Capstone in disas_set_info

2017-09-14 Thread Richard Henderson 
Cc: Aurelien Jarno 
Cc: Yongbok Kim 
Signed-off-by: Richard Henderson 
---
 target/mips/cpu.h|  2 ++
 target/mips/cpu.c|  8 
 target/mips/translate_init.c | 36 
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index 74f6a5b098..dca713825d 100644
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -1118,4 +1118,6 @@ static inline void QEMU_NORETURN 
do_raise_exception(CPUMIPSState *env,
 do_raise_exception_err(env, exception, 0, pc);
 }
 
+void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info);
+
 #endif /* MIPS_CPU_H */
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 1bb66b7a5a..898f1b3759 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -111,14 +111,6 @@ static void mips_cpu_reset(CPUState *s)
 #endif
 }
 
-static void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info) {
-#ifdef TARGET_WORDS_BIGENDIAN
-info->print_insn = print_insn_big_mips;
-#else
-info->print_insn = print_insn_little_mips;
-#endif
-}
-
 static void mips_cpu_realizefn(DeviceState *dev, Error **errp)
 {
 CPUState *cs = CPU(dev);
diff --git a/target/mips/translate_init.c b/target/mips/translate_init.c
index 255d25bacd..1d43b3c36d 100644
--- a/target/mips/translate_init.c
+++ b/target/mips/translate_init.c
@@ -947,3 +947,39 @@ static void msa_reset(CPUMIPSState *env)
 /* set proper signanling bit meaning ("1" means "quiet") */
 set_snan_bit_is_one(0, &env->active_tc.msa_fp_status);
 }
+
+#include "disas/capstone.h"
+
+void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info)
+{
+MIPSCPU *cpu = MIPS_CPU(s);
+CPUMIPSState *env = &cpu->env;
+int insn_flags = env->cpu_model->insn_flags;
+int cap_mode;
+
+#ifdef TARGET_WORDS_BIGENDIAN
+info->print_insn = print_insn_big_mips;
+#else
+info->print_insn = print_insn_little_mips;
+#endif
+
+cap_mode = 0;
+if (insn_flags & ISA_MIPS3) {
+cap_mode |= CS_MODE_MIPS3;
+}
+if (insn_flags & ISA_MIPS32) {
+cap_mode |= CS_MODE_MIPS32;
+}
+if (insn_flags & ISA_MIPS64) {
+cap_mode |= CS_MODE_MIPS64;
+}
+if (insn_flags & ISA_MIPS32R6) {
+cap_mode |= CS_MODE_MIPS32R6;
+}
+#ifdef TARGET_MIPS64
+cap_mode |= CS_MODE_MIPSGP64;
+#endif
+
+info->cap_arch = CS_ARCH_MIPS;
+info->cap_mode = cap_mode;
+}
-- 
2.13.5