yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-01 13:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Move ENV_OFFSET to exec/gen-icount.h

Browse source 
Now that we have ArchCPU, we can define this generically,
in the one place that needs it.

Backports commit 677c4d69ac21961e76a386f9bfc892a44923acc0 from qemu
This commit is contained in:
Richard Henderson 2019-06-12 12:14:38 -04:00 committed by Lioncash
parent a11dd94ce7
commit ac176ccb38
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
8 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/include/exec/gen-icount.h
View file

@ -5,6 +5,8 @@
/* Helpers for instruction counting code generation. */ /* Helpers for instruction counting code generation. */
#define ENV_OFFSET offsetof(ArchCPU, env)
//static TCGOp *icount_start_insn; //static TCGOp *icount_start_insn;
static inline void gen_tb_start(TCGContext *tcg_ctx, TranslationBlock *tb) static inline void gen_tb_start(TCGContext *tcg_ctx, TranslationBlock *tb)

2
qemu/target/arm/cpu.h
View file

@ -887,8 +887,6 @@ struct ARMCPU {
uint32_t sve_max_vq; uint32_t sve_max_vq;
}; };
#define ENV_OFFSET offsetof(ARMCPU, env)
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
extern const struct VMStateDescription vmstate_arm_cpu; extern const struct VMStateDescription vmstate_arm_cpu;
#endif #endif

2
qemu/target/i386/cpu.h
View file

@ -1398,8 +1398,6 @@ struct X86CPU {
bool cpu_globals_initialized; bool cpu_globals_initialized;
}; };
#define ENV_OFFSET offsetof(X86CPU, env)
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
extern struct VMStateDescription vmstate_x86_cpu; extern struct VMStateDescription vmstate_x86_cpu;
#endif #endif

2
qemu/target/m68k/cpu.h
View file

@ -167,8 +167,6 @@ struct M68kCPU {
CPUM68KState env; CPUM68KState env;
}; };
#define ENV_OFFSET offsetof(M68kCPU, env)
void m68k_cpu_do_interrupt(CPUState *cpu); void m68k_cpu_do_interrupt(CPUState *cpu);
bool m68k_cpu_exec_interrupt(CPUState *cpu, int int_req); bool m68k_cpu_exec_interrupt(CPUState *cpu, int int_req);
void m68k_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, void m68k_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,

2
qemu/target/mips/cpu.h
View file

@ -1069,8 +1069,6 @@ struct MIPSCPU {
CPUMIPSState env; CPUMIPSState env;
}; };
#define ENV_OFFSET offsetof(MIPSCPU, env)
void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf); void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf);
#define cpu_signal_handler cpu_mips_signal_handler #define cpu_signal_handler cpu_mips_signal_handler

2
qemu/target/riscv/cpu.h
View file

@ -236,8 +236,6 @@ extern const char * const riscv_fpr_regnames[];
extern const char * const riscv_excp_names[]; extern const char * const riscv_excp_names[];
extern const char * const riscv_intr_names[]; extern const char * const riscv_intr_names[];
#define ENV_OFFSET offsetof(RISCVCPU, env)
void riscv_cpu_do_interrupt(CPUState *cpu); void riscv_cpu_do_interrupt(CPUState *cpu);
int riscv_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); int riscv_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
int riscv_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); int riscv_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);

2
qemu/target/sparc/cpu.h
View file

@ -528,8 +528,6 @@ struct SPARCCPU {
CPUSPARCState env; CPUSPARCState env;
}; };
#define ENV_OFFSET offsetof(SPARCCPU, env)
void sparc_cpu_do_interrupt(CPUState *cpu); void sparc_cpu_do_interrupt(CPUState *cpu);
void sparc_cpu_dump_state(CPUState *cpu, FILE *f, void sparc_cpu_dump_state(CPUState *cpu, FILE *f,
fprintf_function cpu_fprintf, int flags); fprintf_function cpu_fprintf, int flags);

3
qemu/tcg/tcg-op.c
View file

@ -30,6 +30,9 @@
#include "tcg-op.h" #include "tcg-op.h"
#include "tcg-mo.h" #include "tcg-mo.h"
/* Unicorn: Necessary for check_exit_request */
#include "exec/gen-icount.h"
/* Reduce the number of ifdefs below. This assumes that all uses of /* Reduce the number of ifdefs below. This assumes that all uses of
TCGV_HIGH and TCGV_LOW are properly protected by a conditional that TCGV_HIGH and TCGV_LOW are properly protected by a conditional that
the compiler can eliminate. */ the compiler can eliminate. */