diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-13 10:05:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-13 10:05:18 +0000 |
| commit | 6b8d0ac0315f7ecfa41ebdc1467410a4d3342326 (patch) | |
| tree | f32fadf6af296888bb3bb7ec0be7bcfb6e5d64ba /include/disas | |
| parent | 53fb28d10da4eb41b77139f3458be08fb6f658e4 (diff) | |
| parent | 9f81aeb5dadab588920b157a4610e890995ef4b9 (diff) | |
| download | qemu-6b8d0ac0315f7ecfa41ebdc1467410a4d3342326.tar.gz | |
Merge remote-tracking branch 'remotes/rth/tags/pull-cap-20171109' into staging
Capstone fixes for 2.11
# gpg: Signature made Thu 09 Nov 2017 07:49:25 GMT
# 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-cap-20171109:
Makefile: Capstone: Add support for cross compile ranlib
disas: Dump insn bytes along with capstone disassembly
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/disas')
| -rw-r--r-- | include/disas/bfd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/disas/bfd.h b/include/disas/bfd.h index 1f88c9e9d5..46c7ec3376 100644 --- a/include/disas/bfd.h +++ b/include/disas/bfd.h @@ -374,6 +374,8 @@ typedef struct disassemble_info { /* Options for Capstone disassembly. */ int cap_arch; int cap_mode; + int cap_insn_unit; + int cap_insn_split; } disassemble_info; |