aboutsummaryrefslogtreecommitdiff
path: root/include/disas
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-04-17 21:18:05 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-04-18 22:18:59 +0200
commitede9a8a656c992deecce45f8175985dd81cc6be9 (patch)
tree83f13e3180d7aca21bed07e1632a162c0b6a00f2 /include/disas
parent3979fca4b69fc31c372687cd0bb6950592f248bd (diff)
downloadqemu-ede9a8a656c992deecce45f8175985dd81cc6be9.zip
qemu-ede9a8a656c992deecce45f8175985dd81cc6be9.tar.gz
qemu-ede9a8a656c992deecce45f8175985dd81cc6be9.tar.bz2
include: Move fprintf_function to disas/
The previous commits have eliminated fprintf_function outside disassemblers, simplifying code and cleaning up the ugly type-punning fprintf_function seems to attract. Move fprintf_function to include/disas/dis-asm.h to reduce the temptation to abuse it. I considered renaming it to fprintf_ftype (reverting that part of commit 6e2d864edf5, v0.14.0) to get us closer to binutils, but I figure the fork is too distant to make this worthwhile. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <20190417191805.28198-18-armbru@redhat.com>
Diffstat (limited to 'include/disas')
-rw-r--r--include/disas/dis-asm.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h
index 41b61c8..9240ec3 100644
--- a/include/disas/dis-asm.h
+++ b/include/disas/dis-asm.h
@@ -9,8 +9,6 @@
#ifndef DISAS_BFD_H
#define DISAS_BFD_H
-#include "qemu/fprintf-fn.h"
-
typedef void *PTR;
typedef uint64_t bfd_vma;
typedef int64_t bfd_signed_vma;
@@ -243,6 +241,9 @@ typedef struct symbol_cache_entry
} udata;
} asymbol;
+typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
+ GCC_FMT_ATTR(2, 3);
+
enum dis_insn_type {
dis_noninsn, /* Not a valid instruction */
dis_nonbranch, /* Not a branch instruction */