mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2024-12-23 14:05:34 +00:00
target-m68k: make cpu-qom.h not target specific
Make M68KCPU 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 a836b8fa00fa1032ccd234a71b33943627d211ea from qemu
This commit is contained in:
parent
2f4ae94b5c
commit
27ebc27beb
|
@ -46,38 +46,6 @@ typedef struct M68kCPUClass {
|
|||
void (*parent_reset)(CPUState *cpu);
|
||||
} M68kCPUClass;
|
||||
|
||||
/**
|
||||
* M68kCPU:
|
||||
* @env: #CPUM68KState
|
||||
*
|
||||
* A Motorola 68k CPU.
|
||||
*/
|
||||
typedef struct M68kCPU {
|
||||
/*< private >*/
|
||||
CPUState parent_obj;
|
||||
/*< public >*/
|
||||
|
||||
CPUM68KState env;
|
||||
} M68kCPU;
|
||||
|
||||
static inline M68kCPU *m68k_env_get_cpu(CPUM68KState *env)
|
||||
{
|
||||
return container_of(env, M68kCPU, env);
|
||||
}
|
||||
|
||||
#define ENV_GET_CPU(e) CPU(m68k_env_get_cpu(e))
|
||||
|
||||
#define ENV_OFFSET offsetof(M68kCPU, env)
|
||||
|
||||
void m68k_cpu_do_interrupt(CPUState *cpu);
|
||||
bool m68k_cpu_exec_interrupt(CPUState *cpu, int int_req);
|
||||
void m68k_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,
|
||||
int flags);
|
||||
hwaddr m68k_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
|
||||
int m68k_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
|
||||
int m68k_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
|
||||
|
||||
void m68k_cpu_exec_enter(CPUState *cs);
|
||||
void m68k_cpu_exec_exit(CPUState *cs);
|
||||
typedef struct M68kCPU M68kCPU;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include "config.h"
|
||||
#include "qemu-common.h"
|
||||
#include "cpu-qom.h"
|
||||
#include "exec/cpu-defs.h"
|
||||
|
||||
#include "fpu/softfloat.h"
|
||||
|
@ -113,7 +114,39 @@ typedef struct CPUM68KState {
|
|||
struct uc_struct *uc;
|
||||
} CPUM68KState;
|
||||
|
||||
#include "cpu-qom.h"
|
||||
/**
|
||||
* M68kCPU:
|
||||
* @env: #CPUM68KState
|
||||
*
|
||||
* A Motorola 68k CPU.
|
||||
*/
|
||||
typedef struct M68kCPU {
|
||||
/*< private >*/
|
||||
CPUState parent_obj;
|
||||
/*< public >*/
|
||||
|
||||
CPUM68KState env;
|
||||
} M68kCPU;
|
||||
|
||||
static inline M68kCPU *m68k_env_get_cpu(CPUM68KState *env)
|
||||
{
|
||||
return container_of(env, M68kCPU, env);
|
||||
}
|
||||
|
||||
#define ENV_GET_CPU(e) CPU(m68k_env_get_cpu(e))
|
||||
|
||||
#define ENV_OFFSET offsetof(M68kCPU, env)
|
||||
|
||||
void m68k_cpu_do_interrupt(CPUState *cpu);
|
||||
bool m68k_cpu_exec_interrupt(CPUState *cpu, int int_req);
|
||||
void m68k_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,
|
||||
int flags);
|
||||
hwaddr m68k_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
|
||||
int m68k_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
|
||||
int m68k_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
|
||||
|
||||
void m68k_cpu_exec_enter(CPUState *cs);
|
||||
void m68k_cpu_exec_exit(CPUState *cs);
|
||||
|
||||
void m68k_tcg_init(struct uc_struct *uc);
|
||||
M68kCPU *cpu_m68k_init(struct uc_struct *uc, const char *cpu_model);
|
||||
|
|
Loading…
Reference in a new issue