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

diff --cc target/alpha/translate.c
Simple merge

diff --cc target/arm/cpu.c
Simple merge

diff --cc target/arm/translate-a64.c
Simple merge

diff --cc target/arm/translate.c
Simple merge

diff --cc target/cris/translate.c
Simple merge

diff --cc target/hppa/translate.c
Simple merge

diff --cc target/i386/cpu.c
index 2f556c0ea38adc5dc30f5551666b499a08b2810d,cf890b763b1fbd122caa1250a24a56386cf594b6..6f21a5e5181d9b0d40d2fd76dcf23a12645e8f23
--- 1/target/i386/cpu.c
--- 2/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/i386/translate.c
Simple merge

diff --cc target/lm32/translate.c
Simple merge

diff --cc target/m68k/translate.c
Simple merge

diff --cc target/microblaze/translate.c
Simple merge

diff --cc target/mips/translate.c
Simple merge

diff --cc target/nios2/translate.c
Simple merge

diff --cc target/openrisc/translate.c
Simple merge

diff --cc target/ppc/translate.c
Simple merge

diff --cc target/ppc/translate_init.c
index 61a9552c1cf971e32ea5ce1c762171abd7e187e1,41f46193a1caa94f80208a781561b3d794073d6f..b9c49c22f29f116ab8f4637a0906ce83e812e8af
--- 1/target/ppc/translate_init.c
--- 2/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";
  }
  

diff --cc target/s390x/translate.c
Simple merge

diff --cc target/sh4/translate.c
Simple merge

diff --cc target/sparc/translate.c
Simple merge

diff --cc target/tricore/translate.c
Simple merge

diff --cc target/unicore32/translate.c
Simple merge

diff --cc target/xtensa/translate.c
Simple merge