ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 6e2d864edf, 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>
This commit is contained in:
Markus Armbruster 2019-04-17 21:18:05 +02:00
parent 3979fca4b6
commit ede9a8a656
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/disas/dis-asm.h
View File

@ -9,8 +9,6 @@
#ifndef DISAS_BFD_H #ifndef DISAS_BFD_H
#define DISAS_BFD_H #define DISAS_BFD_H
#include "qemu/fprintf-fn.h"
typedef void *PTR; typedef void *PTR;
typedef uint64_t bfd_vma; typedef uint64_t bfd_vma;
typedef int64_t bfd_signed_vma; typedef int64_t bfd_signed_vma;
@ -243,6 +241,9 @@ typedef struct symbol_cache_entry
} udata; } udata;
} asymbol; } asymbol;
typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
GCC_FMT_ATTR(2, 3);
enum dis_insn_type { enum dis_insn_type {
dis_noninsn, /* Not a valid instruction */ dis_noninsn, /* Not a valid instruction */
dis_nonbranch, /* Not a branch instruction */ dis_nonbranch, /* Not a branch instruction */

14
include/qemu/fprintf-fn.h
View File

@ -1,14 +0,0 @@
/*
* Typedef for fprintf-alike function pointers.
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#ifndef QEMU_FPRINTF_FN_H
#define QEMU_FPRINTF_FN_H
typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
GCC_FMT_ATTR(2, 3);
#endif