yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-09 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpus: pass CPUState to run_on_cpu helpers

Browse source 
CPUState is a fairly common pointer to pass to these helpers. This means
if you need other arguments for the async_run_on_cpu case you end up
having to do a g_malloc to stuff additional data into the routine. For
the current users this isn't a massive deal but for MTTCG this gets
cumbersome when the only other parameter is often an address.

This adds the typedef run_on_cpu_func for helper functions which has an
explicit CPUState * passed as the first parameter. All the users of
run_on_cpu and async_run_on_cpu have had their helpers updated to use
CPUState where available.

Backports commit e0eeb4a21a3ca4b296220ce4449d8acef9de9049 from qemu
This commit is contained in:
Alex Bennée 2018-02-26 04:53:23 -05:00 committed by Lioncash
parent 0ed8880525
commit 33589eb75f
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/cpus.c
View file

@ -58,9 +58,9 @@ bool cpu_is_stopped(CPUState *cpu)
return cpu->stopped; return cpu->stopped;
} }
void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data) void run_on_cpu(CPUState *cpu, run_on_cpu_func func, void *data)
{ {
func(data); func(cpu, data);
} }
int resume_all_vcpus(struct uc_struct *uc) int resume_all_vcpus(struct uc_struct *uc)

6
qemu/include/qom/cpu.h
View file

@ -189,6 +189,8 @@ struct kvm_run;
#define TB_JMP_CACHE_BITS 12 #define TB_JMP_CACHE_BITS 12
#define TB_JMP_CACHE_SIZE (1 << TB_JMP_CACHE_BITS) #define TB_JMP_CACHE_SIZE (1 << TB_JMP_CACHE_BITS)
typedef void (*run_on_cpu_func)(CPUState *cpu, void *data);
// Unicorn: Moved CPUAddressSpace here from exec.c // Unicorn: Moved CPUAddressSpace here from exec.c
/** /**
* CPUAddressSpace: all the information a CPU needs about an AddressSpace * CPUAddressSpace: all the information a CPU needs about an AddressSpace
@ -545,7 +547,7 @@ bool cpu_is_stopped(CPUState *cpu);
* *
* Schedules the function @func for execution on the vCPU @cpu. * Schedules the function @func for execution on the vCPU @cpu.
*/ */
void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data); void run_on_cpu(CPUState *cpu, run_on_cpu_func func, void *data);
/** /**
* async_run_on_cpu: * async_run_on_cpu:
@ -555,7 +557,7 @@ void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data);
* *
* Schedules the function @func for execution on the vCPU @cpu asynchronously. * Schedules the function @func for execution on the vCPU @cpu asynchronously.
*/ */
void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data); void async_run_on_cpu(CPUState *cpu, run_on_cpu_func func, void *data);
/** /**
* qemu_get_cpu: * qemu_get_cpu:

1
qemu/target-i386/helper.c
View file

@ -932,7 +932,6 @@ out:
} }
typedef struct MCEInjectionParams { typedef struct MCEInjectionParams {
X86CPU *cpu;
int bank; int bank;
uint64_t status; uint64_t status;
uint64_t mcg_status; uint64_t mcg_status;