mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-03-08 10:09:43 +00:00
target-sparc: make cpu-qom.h not target specific
Make SPARCCPU an opaque type within cpu-qom.h, and move all definitions of private methods, as well as all type definitions that require knowledge of the layout to cpu.h. This helps making files independent of NEED_CPU_H if they only need to pass around CPU pointers. Backports commit d61d1b20610e4655d7846e4cb43d22188e935f5f from qemu
This commit is contained in:
parent
01bd1c1a73
commit
9c0e31ed3a
|
@ -51,37 +51,6 @@ typedef struct SPARCCPUClass {
|
|||
void (*parent_reset)(CPUState *cpu);
|
||||
} SPARCCPUClass;
|
||||
|
||||
/**
|
||||
* SPARCCPU:
|
||||
* @env: #CPUSPARCState
|
||||
*
|
||||
* A SPARC CPU.
|
||||
*/
|
||||
typedef struct SPARCCPU {
|
||||
/*< private >*/
|
||||
CPUState parent_obj;
|
||||
/*< public >*/
|
||||
|
||||
CPUSPARCState env;
|
||||
} SPARCCPU;
|
||||
|
||||
static inline SPARCCPU *sparc_env_get_cpu(CPUSPARCState *env)
|
||||
{
|
||||
return container_of(env, SPARCCPU, env);
|
||||
}
|
||||
|
||||
#define ENV_GET_CPU(e) CPU(sparc_env_get_cpu(e))
|
||||
|
||||
#define ENV_OFFSET offsetof(SPARCCPU, env)
|
||||
|
||||
void sparc_cpu_do_interrupt(CPUState *cpu);
|
||||
void sparc_cpu_dump_state(CPUState *cpu, FILE *f,
|
||||
fprintf_function cpu_fprintf, int flags);
|
||||
hwaddr sparc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
|
||||
int sparc_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
|
||||
int sparc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
|
||||
void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cpu,
|
||||
vaddr addr, int is_write,
|
||||
int is_user, uintptr_t retaddr);
|
||||
typedef struct SPARCCPU SPARCCPU;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
#include "config.h"
|
||||
#include "qemu-common.h"
|
||||
#include "cpu-qom.h"
|
||||
#include "qemu/bswap.h"
|
||||
|
||||
#define ALIGNED_ONLY
|
||||
|
@ -508,7 +509,36 @@ struct CPUSPARCState {
|
|||
struct uc_struct *uc;
|
||||
};
|
||||
|
||||
#include "cpu-qom.h"
|
||||
/**
|
||||
* SPARCCPU:
|
||||
* @env: #CPUSPARCState
|
||||
*
|
||||
* A SPARC CPU.
|
||||
*/
|
||||
typedef struct SPARCCPU {
|
||||
/*< private >*/
|
||||
CPUState parent_obj;
|
||||
/*< public >*/
|
||||
|
||||
CPUSPARCState env;
|
||||
} SPARCCPU;
|
||||
|
||||
static inline SPARCCPU *sparc_env_get_cpu(CPUSPARCState *env)
|
||||
{
|
||||
return container_of(env, SPARCCPU, env);
|
||||
}
|
||||
|
||||
#define ENV_GET_CPU(e) CPU(sparc_env_get_cpu(e))
|
||||
|
||||
#define ENV_OFFSET offsetof(SPARCCPU, env)
|
||||
|
||||
void sparc_cpu_do_interrupt(CPUState *cpu);
|
||||
void sparc_cpu_dump_state(CPUState *cpu, FILE *f,
|
||||
fprintf_function cpu_fprintf, int flags);
|
||||
hwaddr sparc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
|
||||
void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cpu,
|
||||
vaddr addr, int is_write,
|
||||
int is_user, uintptr_t retaddr);
|
||||
|
||||
#ifndef NO_CPU_IO_DEFS
|
||||
/* cpu_init.c */
|
||||
|
|
Loading…
Reference in a new issue