diff options
| author | Peter Maydell | 2017-10-27 09:04:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-27 09:04:51 +0200 |
| commit | 6e6430a821a150bea3fb10cb42d4f90f99f0f43d (patch) | |
| tree | 7b984e2c439eb4e317a3a09e4d1ea696c80dbd76 /target/alpha/translate.c | |
| parent | tcg: Avoid setting tcg_initialize if !CONFIG_TCG (diff) | |
| parent | disas: Add capstone as submodule (diff) | |
| download | qemu-6e6430a821a150bea3fb10cb42d4f90f99f0f43d.tar.gz qemu-6e6430a821a150bea3fb10cb42d4f90f99f0f43d.tar.xz qemu-6e6430a821a150bea3fb10cb42d4f90f99f0f43d.zip | |
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
Diffstat (limited to 'target/alpha/translate.c')
| -rw-r--r-- | target/alpha/translate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/alpha/translate.c b/target/alpha/translate.c index cfd63d5c1f..629f35ec8e 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -3038,7 +3038,7 @@ static void alpha_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) static void alpha_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu) { qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); - log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size, 1); + log_target_disas(cpu, dcbase->pc_first, dcbase->tb->size); } static const TranslatorOps alpha_tr_ops = { |