mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-03-23 23:35:14 +00:00
Stop including qemu-common.h in memory.h
Including qemu-common.h from other header files is generally a bad idea, because it means it's very easy to end up with a circular dependency. For instance, if we wanted to include memory.h from qom/cpu.h we'd end up with this loop: memory.h -> qemu-common.h -> cpu.h -> cpu-qom.h -> qom/cpu.h -> memory.h Remove the include from memory.h. This requires us to fix up a few other files which were inadvertently getting declarations indirectly through memory.h. The biggest change is splitting the fprintf_function typedef out into its own header so other headers can get at it without having to include qemu-common.h. Backports commit fba0a593b2809ecdda68650952cf3d3332ac1990 from qemu
This commit is contained in:
parent
b93c24ba31
commit
2f3f2ae092
|
@ -11,6 +11,8 @@ struct uc_struct;
|
|||
|
||||
#include "qemu/bswap.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu/fprintf-fn.h"
|
||||
#include "qemu/typedefs.h"
|
||||
|
||||
typedef enum MMUAccessType {
|
||||
MMU_DATA_LOAD = 0,
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#define DIRTY_MEMORY_NUM 1 /* num of dirty bits */
|
||||
|
||||
#include "unicorn/platform.h"
|
||||
#include "qemu-common.h"
|
||||
#include "exec/cpu-common.h"
|
||||
#include "exec/hwaddr.h"
|
||||
#include "exec/memattrs.h"
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#define ARM_MISC_H
|
||||
|
||||
#include "exec/memory.h"
|
||||
#include "cpu.h"
|
||||
|
||||
void tosa_machine_init(struct uc_struct *uc);
|
||||
void machvirt_machine_init(struct uc_struct *uc); // ARM64
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "qemu/compiler.h"
|
||||
#include "config-host.h"
|
||||
#include "qemu/typedefs.h"
|
||||
#include "qemu/fprintf-fn.h"
|
||||
#include "exec/cpu-common.h"
|
||||
|
||||
#if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) || defined(__ia64__)
|
||||
|
@ -76,9 +77,6 @@
|
|||
# error Unknown pointer size
|
||||
#endif
|
||||
|
||||
typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
|
||||
GCC_FMT_ATTR(2, 3);
|
||||
|
||||
#ifdef _WIN32
|
||||
#define fsync _commit
|
||||
#if !defined(lseek)
|
||||
|
|
17
qemu/include/qemu/fprintf-fn.h
Normal file
17
qemu/include/qemu/fprintf-fn.h
Normal file
|
@ -0,0 +1,17 @@
|
|||
/*
|
||||
* 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 1
|
||||
|
||||
#include "qemu/compiler.h"
|
||||
#include <stdio.h>
|
||||
|
||||
typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
|
||||
GCC_FMT_ATTR(2, 3);
|
||||
|
||||
#endif
|
Loading…
Reference in a new issue