From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 27 Oct 2017 07:04:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/rth/tags/pull-dis-20171026' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6e6430a821a150bea3fb10cb42d4f90f99f0f43d;p=qemu.git

Merge remote-tracking branch 'remotes/rth/tags/pull-dis-20171026' into staging

Capstone disassembler

# gpg: Signature made Thu 26 Oct 2017 10:57:27 BST
# gpg:                using RSA key 0x64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-dis-20171026:
  disas: Add capstone as submodule
  disas: Remove monitor_disas_is_physical
  ppc: Support Capstone in disas_set_info
  arm: Support Capstone in disas_set_info
  i386: Support Capstone in disas_set_info
  disas: Support the Capstone disassembler library
  disas: Remove unused flags arguments
  target/arm: Don't set INSN_ARM_BE32 for CONFIG_USER_ONLY
  target/arm: Move BE32 disassembler fixup
  target/ppc: Convert to disas_set_info hook
  target/i386: Convert to disas_set_info hook

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	target/i386/cpu.c
#	target/ppc/translate_init.c
---

6e6430a821a150bea3fb10cb42d4f90f99f0f43d
diff --cc target/i386/cpu.c
index 2f556c0ea3,cf890b763b..6f21a5e518
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@@ -4212,9 -4234,7 +4230,10 @@@ static void x86_cpu_common_class_init(O
  #endif
      cc->cpu_exec_enter = x86_cpu_exec_enter;
      cc->cpu_exec_exit = x86_cpu_exec_exit;
 +#ifdef CONFIG_TCG
 +    cc->tcg_initialize = tcg_x86_init;
 +#endif
+     cc->disas_set_info = x86_disas_set_info;
  
      dc->user_creatable = true;
  }
diff --cc target/ppc/translate_init.c
index 61a9552c1c,41f46193a1..b9c49c22f2
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@@ -10577,11 -10607,9 +10603,12 @@@ static void ppc_cpu_class_init(ObjectCl
  #endif
  #ifndef CONFIG_USER_ONLY
      cc->virtio_is_big_endian = ppc_cpu_is_big_endian;
 +#endif
 +#ifdef CONFIG_TCG
 +    cc->tcg_initialize = ppc_translate_init;
  #endif
- 
+     cc->disas_set_info = ppc_disas_set_info;
 -
++ 
      dc->fw_name = "PowerPC,UNKNOWN";
  }