yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-25 06:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Change cpu_exec_init() arg to cpu, not env

Browse source 
The callers (most of them in target-foo/cpu.c) to this function all
have the cpu pointer handy. Just pass it to avoid an ENV_GET_CPU() from
core code (in exec.c).

Backports commit 4bad9e392e788a218967167a38ce2ae7a32a6231 from qemu
This commit is contained in:
Peter Crosthwaite 2018-02-14 14:13:43 -05:00 committed by Lioncash
parent 50b6fa93a8
commit 9e23308b66
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
7 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qemu/exec.c
View file

@ -402,10 +402,10 @@ void tcg_cpu_address_space_init(CPUState *cpu, AddressSpace *as)
}
#endif
void cpu_exec_init(CPUArchState *env, void *opaque)
void cpu_exec_init(CPUState *cpu, void *opaque)
{
struct uc_struct *uc = opaque;
CPUState *cpu = ENV_GET_CPU(env);
CPUArchState *env = cpu->env_ptr;
cpu->uc = uc;
env->uc = uc;
@ -627,7 +627,6 @@ void cpu_single_step(CPUState *cpu, int enabled)
{
#if defined(TARGET_HAS_ICE)
if (cpu->singlestep_enabled != enabled) {
CPUArchState *env;
cpu->singlestep_enabled = enabled;
/* must flush all the translated code to avoid inconsistencies */
/* XXX: only flush what is necessary */

2
qemu/include/exec/exec-all.h
View file

@ -83,7 +83,7 @@ void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);
TranslationBlock *tb_gen_code(CPUState *cpu,
target_ulong pc, target_ulong cs_base, int flags,
int cflags);
void cpu_exec_init(CPUArchState *env, void *opaque);
void cpu_exec_init(CPUState *env, void *opaque);
void QEMU_NORETURN cpu_loop_exit(CPUState *cpu);
#if !defined(CONFIG_USER_ONLY)

2
qemu/target-arm/cpu.c
View file

@ -334,7 +334,7 @@ static void arm_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque)
uint32_t Aff1, Aff0;
cs->env_ptr = &cpu->env;
cpu_exec_init(&cpu->env, opaque);
cpu_exec_init(cs, opaque);
cpu->cp_regs = g_hash_table_new_full(g_int_hash, g_int_equal,
g_free, g_free);

2
qemu/target-i386/cpu.c
View file

@ -2409,7 +2409,7 @@ static void x86_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque)
CPUX86State *env = &cpu->env;
cs->env_ptr = env;
cpu_exec_init(env, opaque);
cpu_exec_init(cs, opaque);
object_property_add(obj, "family", "int",
x86_cpuid_version_get_family,

2
qemu/target-m68k/cpu.c
View file

@ -166,7 +166,7 @@ static void m68k_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque)
CPUM68KState *env = &cpu->env;
cs->env_ptr = env;
cpu_exec_init(env, opaque);
cpu_exec_init(cs, opaque);
if (tcg_enabled(uc)) {
m68k_tcg_init(uc);

2
qemu/target-mips/cpu.c
View file

@ -110,7 +110,7 @@ static void mips_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque)
CPUMIPSState *env = &cpu->env;
cs->env_ptr = env;
cpu_exec_init(env, opaque);
cpu_exec_init(cs, opaque);
if (tcg_enabled(uc)) {
mips_tcg_init(uc);

2
qemu/target-sparc/cpu.c
View file

@ -849,7 +849,7 @@ static void sparc_cpu_initfn(struct uc_struct *uc, Object *obj, void *opaque)
CPUSPARCState *env = &cpu->env;
cs->env_ptr = env;
cpu_exec_init(env, opaque);
cpu_exec_init(cs, opaque);
if (tcg_enabled(uc)) {
gen_intermediate_code_init(env);