diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-10-04 16:27:35 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-10-04 16:27:35 -0700 |
| commit | 9618c5badaa8eed25259cf095ff880efb939fbe7 (patch) | |
| tree | de429ff2c502d2f6cc19c9dad4037b6ce267c88d /target | |
| parent | e7ab6584784dbbd701f0ffe7b29918f44dcd98fd (diff) | |
| parent | daf0db06308b55c518312abc39a4bf74413ac007 (diff) | |
| download | qemu-9618c5badaa8eed25259cf095ff880efb939fbe7.zip qemu-9618c5badaa8eed25259cf095ff880efb939fbe7.tar.gz qemu-9618c5badaa8eed25259cf095ff880efb939fbe7.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging
Pull request trivial-patches 2021104
# gpg: Signature made Mon 04 Oct 2021 01:30:22 AM PDT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
* remotes/vivier/tags/trivial-branch-for-6.2-pull-request:
hw/remote/proxy: Categorize Wireless devices as 'Network' ones
target/sh4: Use lookup_symbol in sh4_tr_disas_log
qemu-options: Add missing "sockets=2, maxcpus=2" to CLI "-smp 2"
qemu-options: Tweak [, maxcpus=cpus] to [, maxcpus=maxcpus]
qemu-options: -chardev reconnect=seconds duplicated in help, tidy up
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/sh4/translate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/sh4/translate.c b/target/sh4/translate.c index cf5fe92..d363050 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -2344,7 +2344,7 @@ static void sh4_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) static void sh4_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) { - qemu_log("IN:\n"); /* , lookup_symbol(dcbase->pc_first)); */ + qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); log_target_disas(cs, dcbase->pc_first, dcbase->tb->size); } |